chore: 🔀 sync master #1
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
likhith-deriv
pushed a commit
that referenced
this pull request
Jun 22, 2023
* feat: added derivez demo/real/static to tradershub/onboarding * fix: call success modal instead of logging out * fix: roundup patch #1 based on reviews * fix: move consts to Helpers/constants file * fix: roundup patch #2 based on reviews * Revert "fix: roundup patch #2 based on reviews" This reverts commit f0cf7f5. * fix: round up patch#2 based on review * fix: clean up * fix: outdated icons after merging * fix: fixed derivx testcase error * fix: update derivx icon * fix: fixed conflicts * fix: roundup patch #3 based on code reviews * fix: round up patch#3 based on code reviews * chore: unit test for derivez static * fix: asdf * feat: token implementation for derivez (todo: pandats error) * fix: qrcode, download links, and download options * fix: round-up-patch 1 * fix: round-up-patch 2 - Description Text below the Deriv EZ header on Onboarding page is different from Design - Text format is incorrect in DerivEZ Account creation success modal - Multiple discrepancies in Trade modal (fixed in round-up-patch 1) * fix: round-up-patch 3 - use <React.Fragment> instead ov <> - remove unintentional {' '} whitespaces * fix: code smells * fix: asdf * feat: disable derivez real flow * fix: added top up for DerivEz * fix: qr code for derivez and derivx * fix: hide qr box if isMobile * fix: derivez fund topup text * fix: derivx fund topup text * fix: onboarding demo title * fix: Deriv Ez -> Deriv EZ * fix: Go -> GO * fix: Description Text below the Deriv EZ header on Onboarding page * fix: revert changes on tradershub * fix: updated to latest description (derivez onboarding/tradershub) * fix: hide derivez and dxtrade in cfd_restricted countries (japan, norway) * fix: corrected the time in server maintenance notice on derivez trade modal * fix: Server maintenance notice time * fix: DerivEZ icon redirect to https://deriv.com/derivez/ * fix: derivez topupVirtual * revert: undo changes in cfd-dashboard.tsx (deprecated file) * remove unnecesary parameter * fix: fixed derivX top up and trade button in onboarding page * fix: disable button while getting account creating * fix: disable GET button while account is being created * fix: disable GET button while account is being created * fix: setIsAccountBeingCreated(false) after account creation to reenable get buttons * fix: remove redundant use of await * fix: server maintenance time TEXT (not time) for derivez * fix: reenable button when error is triggered too * fix: blur derivez icon on onboarding 5th page * fix: remove function call that trigger token error * Update cfd-store.js * fix: pull upstream * fix: hide derivez from oboarding page * fix: show derivez on onboarding and remove "Demo" from appname * fix: empty commit * fix: total asset included derivez balance * fix: updated mockstore * fix: separate dxtrade and derivez token loader into two reactions * fix: rerunning all of our tests * chore: empty commit * fix: capitalization on module import * chore: empty commit --------- Co-authored-by: hirad-deriv <hirad@re-work.dev> Co-authored-by: Ali(Ako) Hosseini <ali.hosseini@deriv.com>
shahzaib-deriv
pushed a commit
that referenced
this pull request
Jun 27, 2023
…#9112) * feat: added derivez demo/real/static to tradershub/onboarding * fix: call success modal instead of logging out * fix: roundup patch #1 based on reviews * fix: move consts to Helpers/constants file * fix: roundup patch #2 based on reviews * Revert "fix: roundup patch #2 based on reviews" This reverts commit f0cf7f5. * fix: round up patch#2 based on review * fix: clean up * fix: outdated icons after merging * fix: fixed derivx testcase error * fix: update derivx icon * fix: fixed conflicts * fix: roundup patch #3 based on code reviews * fix: round up patch#3 based on code reviews * chore: unit test for derivez static * fix: asdf * feat: token implementation for derivez (todo: pandats error) * fix: qrcode, download links, and download options * fix: round-up-patch 1 * fix: round-up-patch 2 - Description Text below the Deriv EZ header on Onboarding page is different from Design - Text format is incorrect in DerivEZ Account creation success modal - Multiple discrepancies in Trade modal (fixed in round-up-patch 1) * fix: round-up-patch 3 - use <React.Fragment> instead ov <> - remove unintentional {' '} whitespaces * fix: code smells * fix: asdf * feat: disable derivez real flow * fix: added top up for DerivEz * fix: qr code for derivez and derivx * fix: hide qr box if isMobile * fix: derivez fund topup text * fix: derivx fund topup text * fix: onboarding demo title * fix: Deriv Ez -> Deriv EZ * fix: Go -> GO * fix: Description Text below the Deriv EZ header on Onboarding page * fix: revert changes on tradershub * fix: updated to latest description (derivez onboarding/tradershub) * fix: hide derivez and dxtrade in cfd_restricted countries (japan, norway) * fix: corrected the time in server maintenance notice on derivez trade modal * fix: Server maintenance notice time * fix: DerivEZ icon redirect to https://deriv.com/derivez/ * fix: derivez topupVirtual * revert: undo changes in cfd-dashboard.tsx (deprecated file) * remove unnecesary parameter * fix: fixed derivX top up and trade button in onboarding page * fix: disable button while getting account creating * fix: disable GET button while account is being created * fix: disable GET button while account is being created * fix: setIsAccountBeingCreated(false) after account creation to reenable get buttons * fix: remove redundant use of await * fix: server maintenance time TEXT (not time) for derivez * fix: reenable button when error is triggered too * fix: blur derivez icon on onboarding 5th page * fix: remove function call that trigger token error * Update cfd-store.js * fix: pull upstream * fix: hide derivez from oboarding page * fix: show derivez on onboarding and remove "Demo" from appname * fix: empty commit * fix: total asset included derivez balance * fix: updated mockstore * fix: separate dxtrade and derivez token loader into two reactions * fix: rerunning all of our tests * chore: empty commit * fix: capitalization on module import * chore: empty commit * fix: hotfix * refactor: use switch-case instead of if-else for type_label * fix: use short_title instead of title for type_label * chore: empty commit * fix: circle ci failing * fix: font * Update index.tsx * fix: text * fix: asdf * chore: empty commit * chore: update branch * Update cfd-password-modal.tsx --------- Co-authored-by: hirad-deriv <hirad@re-work.dev> Co-authored-by: Ali(Ako) Hosseini <ali.hosseini@deriv.com>
shahzaib-deriv
pushed a commit
that referenced
this pull request
Mar 4, 2024
* feat: added formInputfield to accounts v2 * feat: Added formdropdownfield to accounts v2 * feat: added address field validations * feat: Added address fields in account v2 package * fix: Make the options parameter optional in useStatesList * refactor: Append tests, refactor constants * fix: fix regex character duplication * chore: update deriv-com/ui package version * chore: change deriv ui package version * fix: fix regex for postcode * feat: Added Proof of Address flow * fix: remove commented styles * fix: remove commented code * refactor: refactored regex and added onclick to icon * refactor: refactored code * refactor: export modules and useKycAuthStatus hook * Merge branch 'master' into Arshad/COJ-508/POAForm * refactor: remove different status components * refactor: added route contants * fix: fixed button and text import path and dropdown * feat: Add loader to POAForm * Merge branch 'master' into Arshad/COJ-508/POAForm * Merge branch 'master' into Arshad/COJ-508/POAForm * fix: fixed redirection button conditions * test: Added unit tests for POAForm * test: Updated unit tests for form fields * feat: removed InlineMessage component in account-v2 * fix: COJ-508: POA Unit Tests (#1) * fix: replaced empty func with jest.fn * fix: removed validation schema from test * fix: fixed failling unit tests * fix: fix unit tests
shahzaib-deriv
pushed a commit
that referenced
this pull request
Jun 12, 2024
* feat: switch to async flow in adding wallet #1 * feat: migrated deriv apps account to async flow * feat: eslint quick fixes * feat: fixed linked accounts and premature invalidation * feat: eslints * feat: eslints * feat: jest * feat: eslint * feat: fixed eslint * feat: eslint * feat: test * feat: syntax cleanup
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 provide a summary of the change.
Screenshots:
Please provide some screenshots of the change.