forked from deriv-com/deriv-app
-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Amina/feature/90115/update jurisdiction #2
Merged
shaheer-deriv
merged 10 commits into
shaheer-deriv:feature/90115/update_jurisdiction
from
amina-deriv:amina/feature/90115/update_jurisdiction
Mar 31, 2023
Merged
Amina/feature/90115/update jurisdiction #2
shaheer-deriv
merged 10 commits into
shaheer-deriv:feature/90115/update_jurisdiction
from
amina-deriv:amina/feature/90115/update_jurisdiction
Mar 31, 2023
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
…n in constant file" This reverts commit 92c2f78.
…iction_hard_coded_variables chore: move hard coded part and make it more dynamic
shaheer-deriv
merged commit Mar 31, 2023
94645d0
into
shaheer-deriv:feature/90115/update_jurisdiction
shaheer-deriv
pushed a commit
that referenced
this pull request
May 22, 2023
* refactor: migration done * refactor: init pr * Rostislav / 85420 / Migrate cashier `utils` to TS (#2) * refactor: init pr * refactor: refactored utils/validator to ts + moved it to shared * refactor: added more typescript shenanigans to validator * refactor: a minor change * refactor: import refactored * refactor: some more progress with the validator to avoid the build failing hopefully * refactor: validator ts issues fixed * refactor: more ts fixes to get this to work * refactor: removed validator from cashier * refactor: added tests for validator/errors in shared * refactor: applied suggested changes * refactor: some more any -> unknown refactoring * refactor: fixed cringe mistake * refactor: fixed a small mistake * Update packages/cashier/src/utils/server_time.ts Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> --------- Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * Rostislav / 85418 / Migrate disable-withdrawal-modal Component (#4) * refactor: ts migration * refactor: rmved the file * Rostislav / 85421 / Migrate cashier constants to TS (#3) * refactor: init pr * refactor: constants.js migrated * refactor: tsx'd transaction-status.js * refactor: tsx'd static-url.jsx * refactor: test deploy again * refactor: tests fixed * refactor: import fixed * refactor: removed the usage of PlatformContext and its is_appstore from StaticUrl * refactor: added eslint-disable-next-line * refactor: removed "return undefined" and typed return value * refactor: refactored types out into type file * refactor: added more constants * refactor: removed ! from recent-transaction.tsx * refactor: removed ts-ignore * refactor: more importing types instead of defining whats defined * refactor: fixed tests * refactor: capitalized status codes * refactor: rollbacked status codes in tests some more (lowercase -> CAPS) * refactor: removed unused import * refactor: Types -> ../types * refactor: added "as const" in constants.ts * refactor: new typeguards + improved readability * Update packages/cashier/src/constants/transaction-status.tsx Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * refactor: fixed typeguards * refactor: type fixes * refactor: mockRootStore type changed to TStores (@hamid-deriv's suggestion) * refactor: added default return for transaction status --------- Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * Rostislav / WALL-257 / TS migration of Payment Agent Transfer UI component and store (#7) * refactor: init pr * refactor: migrated the store * refactor: migrated components * refactor: fixed mockStore * refactor: minor fix * refactor: more minor fixes * refactor: a few more minor fixes * refactor: one more import fix * refactor: tests fix * refactor: pa transfer request amount type string -> number * Update packages/cashier/src/types/props.types.ts Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * refactor: applied @farzin-deriv's suggestion * refactor: applied more suggestions --------- Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * Rostislav / WALL-256 / TS migration of payment agent UI component and store (#6) * refactor: init pr * refactor: pa deposit details * refactor: mad webstorm suggestion (lets have it like this for now) * refactor: pa card helpers * refactor: pa card helpers (+ this one) * refactor: pa detail + spec * refactor: pa detail index * refactor: pa + spec * refactor: pa card deposit details spec * refactor: pa card listed withdraw form (to revisit) * refactor: pa card listed withdraw form (index) * refactor: pa card description * refactor: added types * refactor: types export * refactor: pa search box * refactor: pa withdraw form * refactor: pa card (to revisit) * refactor: pa container spec * refactor: pa container (to revisit) * refactor: pa container index * refactor: pa container index +1 * refactor: pa receipt index * refactor: pa index * refactor: pa withdraw confirm index * refactor: pa receipt (revisit after pa store) * refactor: pa receipt spec +1 * refactor: pa listed withdraw form * refactor: pa withdraw confirm + spec (to revisit after pa store) * refactor: pa listed withdraw form spec * refactor: pa disclaimer * refactor: pa receipt (revisit after pa store) * refactor: side note * refactor: stores types updated * refactor: store refactored + types added + few more changes * refactor: logic changed + store tests fixed * refactor: tests fixed it seems * fix: mockStore fixed * refactor: param type simplified for getNormalizedPaymentMethod * refactor: removed unused scss + minor changes * refactor: payment-agent.spec.tsx final * refactor: simplified payment-agent-card.tsx a bit * refactor: pa container spec removed TRootStore * refactor: a few changes to tests + a few ts errors resolved * refactor: init pr * refactor: init pr * refactor: trigger deploy * refactor: trigger deploy * refactor: old logic for banks and payment agents restored in PA store + type alias removed * Update packages/cashier/src/pages/payment-agent/payment-agent-withdrawal-locked/payment-agent-withdrawal-locked.tsx Co-authored-by: George Usynin <103181646+heorhi-deriv@users.noreply.github.com> * Update packages/cashier/src/pages/payment-agent/payment-agent-withdrawal-locked/payment-agent-withdrawal-locked.tsx Co-authored-by: George Usynin <103181646+heorhi-deriv@users.noreply.github.com> * refactor: changed `undefined` fallback to '' in pa listed withdraw form * refactor: renamed the types to start with 'T' * refactor: tests should be fixed now * refactor: one more tests fix * refactor: ReactNode -> React.ReactNode * refactor: a minor change * refactor: tests re-run check * refactor: a minor change * Update packages/stores/types.ts Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * Update packages/stores/src/mockStore.ts Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * refactor: more suggestions applied * refactor: suggestions * refactor: React.ReactNode | string => React.ReactNode * refactor: PaymentAgentCard default values set for boolean params * refactor: formatting post merge-conflict problem fixed * refactor: verification_code removed from props and is being set from client store * refactor: prev commit changes fix in tests (oops) * refactor: one more test fix * refactor: tests fix * refactor: cashier store ts fix * refactor: type problems in PaymentAgentCard fixed with the help of @heorhi-deriv * Update packages/cashier/src/pages/payment-agent/payment-agent-withdraw-confirm/payment-agent-withdraw-confirm.tsx Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * fix: tests fix --------- Co-authored-by: George Usynin <103181646+heorhi-deriv@users.noreply.github.com> Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * Rostislav / WALL-261 / Migrate remaining cashier js to ts (#8) * refactor: init pr * refactor: refactored app to ts * refactor: cashier pages index.js -> .ts * refactor: remove a bunch of import aliases * refactor: revert accidental committed changes * refactor: some changes to the request types * refactor: sonarcloud fixes + removing TRootStore * refactor: continue removing TRootStore from everywhere * refactor: remove redundant static typing for mockStore call results + continue removing TRootStore * refactor: remove TRootStore completely * refactor: const mockRootStore -> const mock_root_store (convention for consts) * refactor: more spec refactoring * refactor: remove TRootStore from non-specs as well * fix: tests fix * refactor: removed imports for beforeEach * refactor: remove redundant cast * fix: fixing tests * fix: fixing tests * fix: fixing tests * fix: fix tests * refactor: a bunch of errors resolved * fix: test fix * fix: cast amount to number * fix: a few more forgotten number casts * fix: fixing tests * fix: fixing code smells * fix: fixing code smells * fix: fixing code smells * refactor: remove import of a removed type * refactor: rolled back on bad refactor + +{smth} -> Number({smth}) * refactor: ref and ReactPortal problems resolved * refactor: pa withdraw form spec type errors resolved * refactor: more refactoring in cashier tests * fix: tests fix * Update packages/shared/src/utils/validator/errors.ts Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * Update packages/components/src/components/input/input.tsx Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * refactor: revert back to TRootStore for a bunch of stores * refactor: TCoreStores changed + withdraw store change revert * refactor: Array<T> -> T[] * refactor: PA store param type: TStores -> TRootStore * refactor: crypto-fiat-converter.spec.tsx type errors resolved * refactor: crypto transactions ts changes * Update packages/cashier/src/components/crypto-transactions-history/__tests__/crypto-transactions-renderer.spec.tsx Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * Update packages/cashier/src/components/crypto-transactions-history/__tests__/crypto-transactions-renderer.spec.tsx Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * Update packages/cashier/src/components/crypto-transactions-history/__tests__/crypto-transactions-renderer.spec.tsx Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * refactor: error.tsx and error.spec.tsx type errors resolved * refactor: recent-transaction.tsx status null return value accounted for * refactor: crypto-transactions-renderer.spec.tsx removed unused import * refactor: error.tsx props type adjusted * refactor: payment-agent-store.ts added await on async call * refactor: Array<T> => T[] in more cashier files + account-transfer-store.ts type error resolution * refactor: TWebsocketCall functions types made async * Update packages/stores/types.ts Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> * fix: pa transfer store tests oddity fixed * fix: @farzin-deriv's suggestions * fix: another suggestion applied * fix: another suggestion applied * refactor: TStores-related refactoring * refactor: TStores-related refactoring * refactor: ClientStore.account_limits.daily_transfers types changed * fix: mockStore account_limits type inconsistency * refactor: fixing more ts errors * refactor: TClientStore account_limits type now used from api types * refactor: some of the more risky changes * fix: tests fix * refactor: accidental auto change rollback * refactor: remove auto changes * refactor: remove auto changes * refactor: ErrorDialog-related type errors fixed * refactor: withdraw.tsx-related type errors fixed * refactor: withdrawal-locked.spec.tsx-related type errors resolved * refactor: more type errors resolved * refactor: package-lock.json set to master * refactor: remove icons.js from changes * refactor: remve type errors from pa store and pa transfer store * refactor: minor refactoring * refactor: minor refactoring * refactor: removing more type errors * refactor: insignificant change reverted * refactor: { [key: string]: never } -> Record<string, never> * refactor: small type change in tests * refactor: got rid of a bunch of code smells * refactor: got rid of a bunch more code smells * refactor: got rid of a bunch more code smells * fix: tests fix * fix: qa fix * fix: tests fix --------- Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> Co-authored-by: George Usynin <103181646+heorhi-deriv@users.noreply.github.com> Co-authored-by: hirad-deriv <hirad@re-work.dev>
shaheer-deriv
pushed a commit
that referenced
this pull request
Jun 23, 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>
shaheer-deriv
pushed a commit
that referenced
this pull request
Jun 30, 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>
amina-deriv
pushed a commit
that referenced
this pull request
Sep 6, 2023
shaheer-deriv
pushed a commit
that referenced
this pull request
Sep 26, 2023
* fix: initial commit * fix: initial setup for useReportsStore * chore: remove connect from account-statistics (#2) * chore: remove connect from filter-component (#3) * fix: refactor useReportsStores * chore: remove connect from Indicative-cell (#4) * fix: reduce typescript errors * fix: sonarcloud * fix: resolve typescript errors * chore: remove connect from composite-calendar * fix: type fix * fix: remove connect files and mobx providers * fix: resolve comments * fix: resolve comment * fix: remove unused files * fix: fix types * fix: resolve comments * fix: resolve comments * fix: snoarcloud * fix: comment * fix: comment * fix: resolve comment * fix: add onclick to test * fix: reset with master * fix: resolve comment --------- Co-authored-by: Matin shafiei <matin@binary.com> Co-authored-by: “Matin-deriv” <matin@deriv.com>
shaheer-deriv
pushed a commit
that referenced
this pull request
Nov 3, 2023
* feat: wall-2240: applinkedwith wallet component draft * feat: wall-2240: updated icons to avoid duplication * feat: added tests to component * feat: types, extra unit case, rename * feat: fixed eslint * feat: fixed eslint #2 * feat: eslint fix
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