resolve conflicts #35
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* added modal manager component (binary-com#6768) * farrah/81373/lazy loading in p2p (binary-com#6907) * perf: configured webpack for lazy loading * added css lazy loading * fix: fixed missing css * refactor: myAdsFloatingRateSwitchModal (binary-com#7173) * refactor: emailLinkVerifiedModal (binary-com#7118) * refactor: myAdsDeleteModal (binary-com#7024) * refactor: adExceedsDailyLimitModal (binary-com#7027) * farrah/78909/refactor FilterModal (binary-com#6906) * refactor filter modal * perf: added lazy loading * fix: added publicPath * farrah/78919/refactor OrderDetailsCancelModal (binary-com#7018) * refactor: order details cancel modal * fix: tests * Adrienne / BuySellModal and CancelAddPaymentMethodModal component with saved form state component (binary-com#7077) * saved draft * Refactored out cleanupFn argument in hideModal * fix: added modal form and saving state * fixed issues with mobile stacking modal * refactored out comments * refactor: remove cancel add payment method modal from my profile * removed add payment method modal in my profile * removed icons.js * removed icons.js * refactor: fix import path for modal form * refactor: fix import path for modal form * refactor: fix import path for modal form * chore: reverted change on cancel add payment method modal in my profile folder * chore: refactored code * chore: revert * Fix merge conflicts * Adrienne / Refactored Create Ad Add Payment Method Modal and Add Payment Method Error Modal (binary-com#7210) * chore: fixed issues with dropdown detecting as clicking outside modal * chore: updated branch with drafted branch * chore: added sycned branch changes * farrah/78918/refactor EmailVerificationModal (binary-com#7056) * refactor: emailVerificationModal * Refactored out EmailLinkVerifiedModal since that related modal card is merged to p2p-modal-manager * Refactored out EmailLinkVerifiedModal observables Co-authored-by: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com> * farrah/78920/refactor OrderDetailsConfirmModal (binary-com#7038) * refactor: orderDetailsConfirmModal * refactor: onClick handler * chore: fix issues with build after merge conflicts Co-authored-by: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com> * farrah/78927/refactor EditAdCancelModal (binary-com#7122) * refactor: editAdCancelModal * Refactored out CreateAdAddPaymentMethodModal since its already merged to p2p-modal-manager Co-authored-by: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com> * farrah/78925/refactor CreateAdErrorModal (binary-com#7052) * refactor: createAdErrorModal * chore: fixed merge conflict issues Co-authored-by: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com> * Adrienne / Rating modal and Recommended modal (binary-com#7132) * saved draft * refactor: added rating modal * added recommended modal * refactored code * refactored code * refactor: fixed issues with test * fix: added mock function for useModalManagerContext in app content test * refactored out comment for should_show_rating_modal * refactor: refactored out props for rating modal * chore: removed modal props on cleanup * chore: fixed issues with test * chore: refactor based on reviews * chore: refactor * Adrienne / Refactored Delete Payment Method Error modal and Cancel Edit Payment method modal (binary-com#7222) * saved draft * refactor: added delete payment method error modal * chore: fixed an issue where payment methods are not listed for sell ads * chore: fixed issue where back button does not trigger cancel edit pm modal * farrah/78916/refactor InvalidVerificationLinkModal (binary-com#7017) * refactor: invalid verification link modal * refactor: error message * chore: fixed merge conflicts Co-authored-by: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com> * Adrienne / Error modal (binary-com#7283) * saved draft * refactor: added error modal * chore: reverted old changes modals folder * Adrienne / Currency Selector modal (binary-com#7279) * saved draft * refactor: added currency selector modal * chore: revert old changes modals folder * Adrienne / Block User Modal (binary-com#7276) * saved draft * refactor: added block user modal * chore: fix issues with test build * chore: removed comments * chore: updated comment * chore: fixed issues with running build * chore: fixed issues with running test * refactor: loading modal (binary-com#7006) Co-authored-by: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com> * Adrienne / Rate Change Modal (binary-com#7266) * saved draft * refactor: added rate change modal * chore: changed isRateChanged function * chore: refactored hideModal with options * chore: reverted comments * chore: refactored naming options for hidemodal * Adrienne / Quick Add Modal and integrating new payment method dropdown component for buy ads in the modal (binary-com#7308) * saved draft * refactor: added quick add modal and new dropdown component * chore: refactored out unusesd files * chore: reverted merge conflict issues * chore: removed old merge conflicts * chore: fixed merge conflicts and added 2 new modals * chore: reverted refactor and used error modal instead * farrah/78906/refactor MarketRateChangeErrorModal (binary-com#7357) * refactor: market rate change error modal * refactor: code * refactor: unnecessary code * refactor: fixed issues with buy ad payment methods list Co-authored-by: adrienne-rio <adrienne@deriv.com> * fix: conflicts * fix: conflicts * Adrienne / Wrong popup message counterparty block user modal (binary-com#7459) * saved draft * fix: fixed an issue where incorrect block user modal message is shown in block user list * chore: removed old commits * Adrienne / Fix issue verification link modal showing twice (binary-com#7545) * saved draft * fix: verification modal now shows once * Adrienne / Add payment method not dismissed create ad (binary-com#7505) * saved draft * fix: create ad add payment method modal now closes when user adds a pm * chore: removed old commits * chore: added multiple arguments for iscurrentmodal * Adrienne / Market rate change popup not displayed (binary-com#7478) * saved draft * fix: fixed an issue where rate change modal is not shown when user changes to different currency * chore: removed old commits * Adrienne / Fixed issue with block user error modal (binary-com#7539) * saved draft * fix: reset error status * chore: removed old commits * fix: fixed an issue where the error modal is displayed twice * Adrienne / Fix bug in buy sell header and refactored code (binary-com#7624) * saved draft * refactor: refactored buy sell modal header * chore: removed comments * chore: applied code review refactors --------- Co-authored-by: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com> Co-authored-by: adrienne-rio <adrienne@deriv.com>
…ing (binary-com#7431) * fix: delete some console errors * fix: move spanButton to components package * fix: export TButtonProps * fix: put div putside p and use SpanButton instead of Button * fix: remove React.FC from SpanButton
* fix: exit traders hub * fix: remove is_currency_switcher_disabled_for_mf from the currency switcher dropdown
…for low risk (binary-com#7519) * fix: exit traders hub * fix: When login back to the account with has EU only the data for MF is showing * fix: exit from non-eu from traders hub, multipliers is still the active account
* chore: change stylings add more padding below to how content in different screen size 📱 * fix: scroll issue on smaller screens * feat: testing sikit * fix: change onboarding sizing to fit mobile * fix: remove max-height on footer * fix: added more height to the body * fix: readjust body height (again😀)
* fix: translation files * fix: extract translations * chore: alphabetical order * chore: sync translation
Co-authored-by: Nijil Nirmal <62882794+nijil-deriv@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
* fix: account switcher for mf * fix: undefined loginid * fix: add real account modal height * chore: removed unused props * chore: remove unused v2
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
…fix (binary-com#7700) Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>
Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>
…-com#7669) * fix: 🐛 fixes the truncateed cookie banner for non-en langs * fix: 🐛 fixes the text out of button bug in cookie banner --------- Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>
Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>
…clients having multiple currency (binary-com#7728) * fix: ad exchange rate for total assets in traders hub * refactor: change types for setExchangeRate --------- Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>
* fix: evgeniy/ 88007/ enable paste in idv information * refactor: prevent event while empty data pasting * refactor: using default validation error message * refactor: reusing prevent func * refactor: typo name fix, function passing shortage * refactor: useToggleValidation fix --------- Co-authored-by: “yauheni-kryzhyk-deriv” <“yauheni@deriv.me”> Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
* fix: firefox staging fix * fix: remove lodash
* chore: remove eslint unallowed attribute suppressor * refactor: replace unallowed hash attribute with data-hash * refactor: replace unallowed header_content attribute * refactor: replace unallowed attribute collapsible with data-collapsible * refactor: replace all occurances of unallowed attribute collapsible with data-collapsible * refactor: remove unallowed attributes min_value, max_value and steps from range-slider * refactor: remove unallowed error attribute from date-picker-native component * refactor: remove unallowed attribute gtm-search-term * refactor: remove unallowed count attribute from p2p * refactor: replace unallowed attribute collapsiblewith data-collapsible
…list (binary-com#7674) * chore: changed no users message * chore: empty commit
* chore: clean cashier from ts errors * fix: missing types in mockStore * feat: enhance type declaration * feat: enhance type declaration * fix: test failure * feat: use tstores instead of trootstores in mockstore * feat: update trootstore to tcorestores * fix: store initiating error * fix: resolve review comments * fix: component errors * fix: sync with lastest master * fix: remove unused imports * fix: resolve ts errors * fix: resolve ts errors * fix: resolve ts errors * fix: update declaraion files * chore: trigger the test again * fix: eslint error * Update packages/cashier/src/pages/on-ramp/on-ramp.tsx * Update packages/cashier/src/pages/payment-agent/payment-agent-list/payment-agent-list.tsx * Update packages/cashier/src/stores/account-transfer-store.ts * refactor: remove unused imports * chore: trigger the test again * chore: trigger the test again * fix: add internal type file * build: update the branch
…nterpreted as HTML [CODE-SCANNING] (binary-com#7599) * fix: security-issues: DOM text reinterpreted as HTML * test: trigger build * fix: regenerate package-lock
…lluting assignment (binary-com#7650) * fix: security-issues: Prototype-polluting assignment * fix: review comments * Merge branch 'master' of github.com:binary-com/deriv-app into niloofar/87290/prototype-polluting-issue
* chore: disable proof of ownership if no requests from bo * chore: replace needs_verification with is_pending_proof_of_ownership * chore: add is_pending_proof_of_ownership to mockStore * fix: fix translation issue
Co-authored-by: Matin shafiei <matin@deriv.com>
…inary-com#8159) Co-authored-by: “yauheni-kryzhyk-deriv” <“yauheni@deriv.me”>
* chore: cherry picked Co-authored-by: Carol Sachdeva <58209918+carol-deriv@users.noreply.github.com> * chore: fixed issues with server time * chore: replaced notifications with new hook and removed props from app * chore: fixed history routing issue * chore: removed p2p-cashier * chore: fixed tests, added TODOs * chore: removed d.ts files
* fix: the broken tik bar * fix: stores issue
* fix: error in investor password * fix: investor password
…in other lang (binary-com#8151) * fix: issues in local languiages for jurisdictiom * fix: code smell * chore: trigger build
…-com#8118) * fix: 🐛 fixed Risk assessment warning dual popup issue * feat: 🐛 translation bug * feat: fix for mobile * fix: 🐛 incorporated design as per figma
binary-com#7707) * perf: removed individual POC calls made against contracts, added global POC subscription * fix: poc transactions are appearing from previous sessions * fix: resloved comments and nitpicks
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
… chrome (binary-com#8124) * feat: add new_password for autocomplete * refactor: change comments line * feat: change new-password to none
* fix: input dark mode color * fix: disabled colours for dropdown and select-native * fix: date picker + autocomplete dark disabled styles * fix: update label color * fix: further color changes * fix: disabled calendr text
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
* fix: fix notification count display for orders tab p2p * chore: retrieve the count attribute in the tabs component
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
likhith-deriv
pushed a commit
that referenced
this pull request
Nov 4, 2023
* feat: add key files from prev tech tebt branch * feat: add digits file from prev branch * feat: add contract types file from prev branch * feat: add trade params mobile from prev branch * fix: remove duplicates * Maryia/dtra-401/TS migration: multiplier components (#34) * chore: migrate cancel-deal to ts * chore: migrate expiration & expiration modal * chore: migrated multiplier * chore: migrate stop-loss * chore: migrate take-profit * chore: migrate widgets * build: trigger build with empty commit * Kate / DTRA-398 / TS migration: Widget components in Trader package (#33) * refactor: ts of contract replay widget * refactor: ts of mobile widgets * refactor: ts of chart widgets * refactor: ts of top widgets * refactor: ts of top widgets * refactor: types for widgets * refactor: apply suggestions * refactor: add position prop * fix: extention of the imported file * chore: replace some localizes (#36) * Kate / DTRA-400 / [Refactoring]: delete duplicated unused files from Markers folder in Trader package and migrate to TS marker.jsx (#37) * refactor: marker folder * fix: change file extension in test * Kate / DTRA-404 / [Refactoring]: Divide trade-categories.tsx file and cover changes with tests (#35) * refactor: add rise fall description * refactor: separate stay end high contract description * refactor: separate description of digits contracts * refactor: separate asian reset runhighlow touch contracts * refactor: separate callputspread lb tickhighlow and vanilla contracts * refactor: separate multipliers contract * refactor: add unit tests for contract descriptions * refactor: add more tests * refactor: add tests for touch ans vanilla contracts * refactor: tests for trade categories * refactor: contract description structure * refactor: apply suggestions * refactor: add missing test case * Maryia/DTRA-403/feat: migrate Routes files in Trader package to TS (#38) * feat: migrate routes files to ts * fix: routes extension * refactor: for consistency * refactor: import order * refactor: renamed prop types * refactor: type for consistency * refactor: remove index as key * fix: ts migrate settingsmodal and remove unused file (#39) * fix: ts migrate settingsmodal and remove unused file * fix: failing tests * Kate/ fix: code smells (#40) * fix: code smells * chore: empty commit * fix: function arguments * refactor: tests * fix: codesmells * refactor: code smells * chore: change optional chaining * refactor: tests * refactor: tests for widgets component * fix: tests * fix: conflicts * fix: more conflicts * fix: tests * refactor: add more test cases * fix: types in tests * fix: test extention * fix: return turbos back to types * fix: revert unplanned files * fix: code smells (#42) * fix: test extention * fix: bug with inserting objecting into the backticks * fix: file extention after ts migration * chore: sort imports * chore: revert file * chore: revert wallet changes * chore: remove extra file * chore: apply nit * fix: language switching issue with the chart --------- Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com> Co-authored-by: henry-deriv <118344354+henry-deriv@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
Please include a summary of the change and which issue is fixed below:
When you need to add unit test
When you need to add integration test
Test coverage checklist (for reviewer)
Type of change