Skip to content

Commit

Permalink
Feature/wallets with traders hub (#8810)
Browse files Browse the repository at this point in the history
* feat: add 3 static steps for wallet upgrade

* fix: responsive

* fix: add dynamic steps

* fix: address comments

* fix: address comments and combine 3 steps to 1 component

* test: add test for wallet-steps component

* chore: add deriv ui in package

* fix: rename togglewalletsupgrade

* fix: use Wizard component

* fix: move steps to config

* fix: use Modal

* fix: remove css

* chore: add comments

* fix: use walletimage

* fix: rename config gile

* redeploy: Empty-Commit

* fix: cfd sub_account_type

* fix: hamid commentz

* fix: subtasks

* fix: eu content

* fix: responsive

* fix: test import

* fix: css responsive

* fix: align icon

* fix: retrigger

* fix: remove trading

* feat: wallet styles (#8358)

* feat: wallet styles

* feat: change name

* feat: remove duplicate icons

* feat: remove duplicate icons

* docs: add sample class to wallet mixin

* hamid/wallet-icon-and-small (#8391)

* feat: wallet-icon

* fix: wallet-icon and wallet-small

* feat: update styles

* feat: update styles

* feat: update styles

* feat: update styles

* feat: export wallet

* feat: update type

* chore: trigger-test

* Sergei / wall 147 / in progress and migrated banner (#8201)

* feat: create a scratch of desktop upgrade banner

* feat: create upgrade wallet banner

* feat: add review suggestions and rename WalletsBannerImage component

* feat: add images and scratch of components

* feat: add some suggestions

* feat: add some images

* feat: almost complete upgrading banner

* feat: finished with ready banner

* feat: change title for ready banner

* refactor: change icon name

* feat: add size for tick

* feat: add tests

* feat: add some changes from PR review

* feat: add changes from review

* feat: add some constants

* refactor: add React.Fragment

* refactor: change images name

* feat: add suggestions after review

* feat: add switch to wallets-banner component

* feat: change short dash to long dash

* feat: add logout when click ready banner logout button

* feat: fix tests

* feat: add 1 more test for logout

* george / WALL-520 / create badge component (#8384)

* feat: ✨ add badge component

* perf: ⚡ rename label prop to weight prop

* perf: ⚡ add Discriminated unions types, fix colors, replace cheildren with label prop

* refactor: ⚡ refactor code

* perf: ⚡ add export from components package

* refactor: ⚡ refactor badge component, add tests

* refactor: ⚡ refactor css

* fix: 🐛 fix tests

* Farzin/wall 548/Add `GradientBackground` component (#8436)

* feat(components): ✨ add `GradientBackground`

* style(components): 💄 add support for mobile

* fix(components): 📝 resolve PR comments

* feat(components): ✨ add `Watermark`

---------

Co-authored-by: Farzin Mirzaie <farzin@deriv.com>

* chore: update feature branch with master (#8525)

* chore: remove unused icons from wallet folder inside components package (#8507)

* chore: remove unused icons from wallet folder inside components package

* chore: build icons

* Aum/WALL-562/create-wallet-icon-component (#8501)

* feat: created wallet-icon component

* feat: integrated wallet-icon with gradient-background-wallet-icon

* fix: changed the color positioning for icon gradient

* chore: replaced currency prop with icon

* chore: removed wallet-small and wallet-icon made by @hamid-deriv

* chore: removed dark prop for wallet-icon

* refactor: made gradient-background-wallet-icon dynamic and refactored wallet-icon

* fix: made changes from comments

* chore: renamed gradient-background component to two-point

* chore: removed unused code

* chore: create component for consent wallet popup (#8178)

* chore: create component for consent wallet popup

* fix: added info text based on clients region and risk status

* fix: added test case

* fix: make changes based on comments and reviews

* fix: added mobile stylings

* fix: small tweaks

* fix: change svg added small changes to the stylings

* fix: commit suggestions

* fix: commit resolved messages

* fix: commit changes based comments and did code improvements

* fix: made changes to information list file

* fix: added title border and checkbox function fix

* fix: added bold text for low risk cr accounts in modal

* fix: replace text for p2p

* fix: modal not displaying properly on small screens

* fix: issue with small screen final

* Sergei / wall 272 / wallet desktop header (#8334)

* feat: create scratch of the header

* feat: add WalletsImage component

* feat: add limiting types

* feat: trying to add size changing for SVG (not completed)

* feat: add some icons

* feat: optimise svgs

* feat: add buttons

* feat: collapsed wallet header

* feat: commit to check in test link

* feat: add wallet bg with css

* feat: add check for dark mode

* feat: change color for svg for light/dark themes

* feat: add hover on buttons

* feat: add some check for demo wallet

* feat: delete uploaded icons because these icons already exists

* feat: delete currency icons because its already exist

* feat: add some svgs

* feat: add demo color and mixin

* feat: create wallet-currency-card component

* feat: divide component to some small components

* feat: add status badge

* feat: repair background image for appstore

* feat: add bg svg

* feat: move background image

* feat: add disabled buttons

* feat: delete unnecessary prop

* feat: delete comments

* feat: delete some comments

* feat: add some test cases

* fix: fix one test

* feat: change some types and add util function

* refactor: delete comment

* refactor: delete comment

* feat: delete unnecessary icons

* feat: add some suggestions

* refactor: delete comments

* feat: add check for fiat

* feat: delete default values for component props

* feat: complete tests

* refactor: change var name

* feat: add 3 more tests

* feat: add actions and button types

* fix: fix scss var color

* feat: move wallet buttons creation function to utils

* refactor: delete curly braces

* refactor: change import order

* refactor: delete line which breaks eslint test

* feat: use Badge component

* feat: add suggestions

* feat: change types and shortcode for some wallets

* feat: make account_type prop as optional

* feat: empty just to start deployment

* feat: change bg color to gray

* feat: change getWalletCurrencyIcon and add some icons

* feat: empty to restart vercel

* feat: update getWalletCurrencyIcon function

* feat: format balance money

* fix: repair test

* fix: move wallet-balance to the right side of the screen

* refactor: change opacity

* feat: Rostislav / WALL-361 / Cashier Fiat Transfer amount input field (#8442)

---------

Co-authored-by: George Usynin <103181646+heorhi-deriv@users.noreply.github.com>
Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com>

* chore: stitch banner with popup (#8476)

* chore: create component for consent wallet popup

* fix: added info text based on clients region and risk status

* fix: added test case

* fix: make changes based on comments and reviews

* fix: added mobile stylings

* fix: small tweaks

* fix: change svg added small changes to the stylings

* fix: commit suggestions

* fix: commit resolved messages

* fix: commit changes based comments and did code improvements

* fix: made changes to information list file

* fix: added title border and checkbox function fix

* fix: added bold text for low risk cr accounts in modal

* fix: replace text for p2p

* fix: modal not displaying properly on small screens

* fix: issue with small screen final

* chore: stitch banner with popup

* fix: refactor some code

* fix: refactor code

* fix: test cases

* chore: stitching 80% done

* fix: fixing all the test cases

* fix: commit suggestions

* fix: fix test cases and other stuff

* fix: remove unused stuff

* fix: edit stylings making mobile view look better

* fix: added form line height to wallet intro component

* fix: refactor somemore

* fix: commit suggestions

* empty commit

* empty commit

* retrigger commit

* chore: retrigger commit

* fix: commit suggestions

* fix: circleci error

* fix: wallet banner test case

* fix: tests

* fix: issue with the disabled buttons and checkbox

* fix: updated real-wallets-upgrade

* fix: circleci error

* fix: remove button outline from banner

* fix: merge conflicts

* fix: resolve circle ci issues

* fix: added changes to show the banner

* fix: circle ci issues

* fix: remove additional button props

---------

Co-authored-by: Thisyahlen Nair <thisyahlen@regentmarkets.com>

* Aum/wall 278/create wallet card component (#8580)

* feat: created wallet-card and integrated wallet-icon for small size

* refactor: changed height of gradient-background

* feat: added states for wallet-card small

* feat: added card shine effect to wallet-card for medium and large

* feat: wallet-card states completed

* fix: rendering values in correct places

* refactor: added single prop for handling wallet-card states

* fix: applied correct padding and font-size for mobile

* feat: included 'added' state for wallet-card

* chore: added constants config for wallet-card

* chore: applied changes from comments

* fix: wallet-card state becomes default for add/added states

* refactor: hamid-aum-forked-wallet-card

* refactor: enhance-wallet-card

* feat: enhance-wallet-card

* docs: add comment

* revert: revert trader-hub home page

* refactor: refactor wallet-icon

* fix: resolve comments

* fix: fixed some styling

* refactor: removed parent hack from scss and fixed all the states

* chore: removed mock response file

---------

Co-authored-by: Hamid Yaftian <hamid@deriv.com>
Co-authored-by: Hamid <hamid@regentmarkets.com>

* fix: issues during conflict resolution

* fix: fix serve error (#8749)

* fix: fix serve error

* fix: fix serve error

* feat: add app-icon and update wallet-icon (#8730)

* feat: add app-icon and update wallet-icon

* chore: clean code

* fix: fix eslint error

* chore: update pr

* feat: update component name

* feat: update component name

* fix: update component name

* chore: retrigger the test

* Update packages/appstore/src/assets/svgs/currency/index.tsx

* Update packages/reports/src/Containers/statement.tsx

---------

Co-authored-by: Nijil Nirmal <62882794+nijil-deriv@users.noreply.github.com>

* hamid/wall-432/transfer-account-selector-refactor (#8758)

* refactor: refactor transfer-account-selector with new components

* feat: add is_value prop

* fix: enhance app-icon style

* fix: enhance app-icon style

* fix: enhance modal prop

* fix: apply pr commits

* feat: use badge component

* fix: apply pr commits

* feat: add portal_id prop

* george / WALL-306 / add wallet cashier modal new (#8750)

* feat: ✨ add wallet cashier modal

* fix: align files with feature branch

* Aum/wall 5/the upgrade modal which wallets will be created and linked (#8751)

* feat: created wallets linking step for wallet upgrade

* feat: create responsive wallet-link component

* feat: renamed wallet-link to wallet-link-wrapper and completed static UI

* feat: created wrapper for the 2nd step in wallet-upgrade

* feat: added dependency for hooks to appstore and added useBalance and useWalletMigration hooks

* chore: minor UI fixes

* fix: fixed scrolling of accounts in mobile view

* feat: appended the 2nd step to 1st step

* feat: rendering all data for each step during linking

* chore: added some mock data

* refactor: replaced placeholder card with wallet-card component

* fix: removed z-index and fixed shine (trapezoid) element

* chore: add types for wallet-card

* feat: added types to all the tsx files

* fix: fixed some type errors

* fix: fixed the active border issue in wallet-card

* chore: changed the state of wallet-card in wallet-linking to default

* fix: fixed wallet title in mobile mode

* fix: changed color for text and fixed clipping of linking step content

* fix: fixed scrolling when only one wallet with few accounts is shown

* chore: made changes from review suggestions

* chore: removing unused classnames

* chore: changed order of imports for wallet-link-wrapper

* chore: changed height for wallet-linking-step

* chore: resolved comments

* chore: add USDC crypto mock data

* chore: added rebranded icons to components package

* fix: fixed the link line units using px

* chore: added margin top and bottom to link-wrapper

* fix: changed linking step height

* fix: fixed the bracket for safari browser

* Sergei/wall 273/ (NEW) Complete wallets (#8786)

* feat: add some changes

* feat: add useContentFlag hook

* feat: add all files

* feat: implement updated WalletIcon component

* feat: add deleted test

* feat: create success toast message for wallets (#8763)

* Sergei / wall-578 / (Updated) Pop up for wallet migration failed (#8765)

* feat: create PR from latest feature branch

* feat: delete hooks from appstore (not related to this PR)

* feat: add hooks to appstore

* hamid/wall-934/fix-type-error (#8903)

* fix: type errors of balance in wallet

* chore: change currency-switcher-account

* chore: change _ to - in testid

* chore: retrigger the test

---------

Co-authored-by: Sergei Baranovski <sergei@deriv.com>

* thisyahlen/fix: sorting of wallets list (#8926)

* fix: sorting and refactor

* fix: logout issue

* fix: open only 1 wallet at a time

* chore: add test for useWalletlist

* fix: to fix type for shortcode

* fix: test type

* fix: comments and suggestions

* fix: comments

* fix: test

* fix: show wallets to only high risk clients

* redeploy: codecov

* george / WALL-431 / Demo: Input & selector stitching (#8794)

* feat: ✨ account transfer component (demo)

* fix: transfer hint message

* fix: 🎨 apply comments

* refactor: 🎨 remove reducer, simplify transfer logic, improve readability (#34)

* fix: update padding of app-icon component (#33)

* style: improve styles for account list

* style: apply comments

* fix: apply comments, refactor account modal in desktop

* fix: 🎨 apply comments

* feat: add scrolling behaviour to account list in mobile view

* fix: apply comments, fix test

* refactor: 🔥 remove mobile dialog, refactor scrolling, remove redundant logic

* fix: apply comments, refactor tests

* test: 🚀 add tests for transfer related components

* style: fix style for merged icon

* fix: mock loginid

* fix: typo, demo icon, transition on closing, blinking icons

* perf: disable automatic opening of wallet modal

---------

Co-authored-by: Hamid <hamid@regentmarkets.com>

* Rostislav / WALL-454 / Fiat transaction list (post feature branch update) (#8753)

* refactor: add DeepRequired for use

* refactor: prototypes

* refactor: better prototypes

* refactor: almost done w/o responsive and themes

* refactor: tmp number formatting (better use hooks) + minor changes

* refactor: added a degree of responsiveness

* refactor: line heights and font sizes

* refactor: code improvement

* refactor: remove duplication in testing component

* refactor: adding FiatTransactionList with hardcoded list for now

* refactor: deriv/components deps

* refactor: added hook for grouped transactions

* refactor: add lodash.groupby and moment to hooks deps

* refactor: useGroupedFiatTransactions

* refactor: visuals pretty much done w the grouping logic

* refactor: add spec for hook

* refactor: move FiatTransactionList to modal

* refactor: filling the gaps for transactions

* refactor: API call for transactions added

* refactor: add logic for transfer transactions

* refactor: minor change

* refactor: switched to using WalletIcon

* refactor: added is-crypto check for transfer transaction (other) account currency

* refactor: transaction list style change fix for later

* refactor: transactions_ -> mock_transactions

* refactor: types and logic

* refactor: better transactions.map(...)

* refactor: improved code

* refactor: post-feat-branch-merge fixes

* refactor: remove unnecessary change

* refactor: hardcode app transactions

* refactor: remove seemingly redundant useCallbacks

* refactor: TODO

* refactor: fiat-transaction-list-item.tsx suggestions

* refactor: some of the styles suggestions applied

* refactor: scss variable

* Update packages/appstore/src/components/fiat-transaction-list/fiat-transaction-list.tsx

Co-authored-by: Hamid <hamid@regentmarkets.com>

* Update packages/appstore/src/components/fiat-transaction-list/fiat-transaction-list.tsx

Co-authored-by: Hamid <hamid@regentmarkets.com>

* refactor: not styling direct html tags now

* refactor: move style import from index.ts to fiat-transaction-list.tsx

* refactor: app acc mock name change

* refactor: isMobile() -> is_mobile

* refactor: separated fetching and grouping

* Merge remote-tracking branch 'upstream/feature/wallets_with_traders_hub' into rostislav/WALL-641/transaction-list-item-new

* refactor: account balance type fix

* fix: tests fix

* refactor: switched back to using mock transaction list

* refactor: update mock data

* refactor: fixes related to appearance

* refactor: minor fix

* refactor: minor changes

* refactor: icons

* refactor: changed wallet-icon.tsx + other small changes

* refactor: a fix for malta wallets

* refactor: a few more appearance changes

* refactor: qa appearance fixes

* refactor: deriv apps fix

* refactor: real page fix

* refactor: one more transaction

* refactor: + initial deposit for real

* refactor: a few more changes to styles

* refactor: a few more changes to styles

* refactor: z-index shenanigans

* refactor: app icon dark theme

* refactor: package.json

* refactor: (tmp) remove failing test

* refactor: return failing test

* fix: tests

* refactor: svg optimized

* refactor: svg fixes

---------

Co-authored-by: Hamid <hamid@regentmarkets.com>

* synchronize amount inputs, add transfer button (WALL-554) with test link (#8962)

* feat: ✨ account transfer component (demo)

* fix: transfer hint message

* fix: 🎨 apply comments

* refactor: 🎨 remove reducer, simplify transfer logic, improve readability (#34)

* fix: update padding of app-icon component (#33)

* style: improve styles for account list

* style: apply comments

* fix: apply comments, refactor account modal in desktop

* fix: 🎨 apply comments

* feat: ✨ synchronize amount inputs, add transfer button

* perf: refactor code

* refactor: remove listener, add onScroll to mobile_dialog, remove ref from mobile_dialog

* fix: apply comments

* fix: reset amount_to if selected transfer_from is a wallet

* feat: ✨ account transfer component (demo)

* fix: transfer hint message

* fix: 🎨 apply comments

* refactor: 🎨 remove reducer, simplify transfer logic, improve readability (#34)

* fix: update padding of app-icon component (#33)

* style: improve styles for account list

* style: apply comments

* fix: apply comments, refactor account modal in desktop

* fix: 🎨 apply comments

* feat: add scrolling behaviour to account list in mobile view

* fix: apply comments, fix test

* refactor: 🔥 remove mobile dialog, refactor scrolling, remove redundant logic

* fix: name visibility after closing the modal

* perf: improve transition behaviour

* test: fix tests

* refactor: 🔥 remove mobile dialog, refactor scrolling, remove redundant logic

* fix: add missing code

* refactor: apply comments

* fix: apply comments, refactor tests

* test: 🚀 add tests for transfer related components

* refactor: roll back Tab component

* style: fix style for merged icon

* fix: mock loginid

* fix: mock account loginid

* fix: typo, demo icon

* fix: typo, demo icon, transition on closing, blinking icons

---------

Co-authored-by: Hamid <hamid@regentmarkets.com>

* feat: added wallets notifications to wallets (#8837)

* feat: added wallets notifications to wallets

* fix: remove commentted code

* fix: show notifications for platforms only

* fix: change label on CTA

* fix: added hooks package

* fix: update branch

* chore: remove unused code

* Hamid/wallet card colors mixin (#9008)

* feat: update wallet cards color mixin

* feat: update wallet colors mixin and wallet modal header

* feat: change wallet color in wallet card and icon

* chore: retrigger ci tests

* feat: update components based on the new gradient color prop

* fix: revert index.tsx

* fix: update test cases

* fix: update test cases

* fix: fix pr comments

* fix: fix transfer icon bg

* feat: replace gradient_for with gradient_*_class props

* fix: failed build

* fix: fix pr comments

* hamid/wall-582/demo-reset-balance-tab (#8899)

* feat: add demo reset tab component

* feat: add redirect to transfer tab setter

* fix: add redirect to transfer tab setter

* test: add test to demo-reset-balance component

* test: add test to demo-reset-balance component

* fix: apply pr commits

* fix: apply pr commits

* feat: apply pr commits

* fix: add missing package

* fix: use balance store for getting demo wallet balance

* chore: retrigger ci tests

* chore: retrigger ci tests

* fix: change text after transfer success

* fix: apply pr commits

* fix: apply pr commits

* fix: change icon of the success step

* feat: update design based on the new changes

* Thisyahlen/WALL-1020/ List of wallets according to authorize and balance (#9010)

* chore: add balance from response, switching and refactor

* fix: test and verification only for eu users

* fix: tests

* fix: modal first, then switch account

* fix: refactor logic to hooks

* fix: refactor to use wallet_account instead of data

* redeploy: vercel

* fix: refactor test

* fix: tests and address comments

* fix: use debounce instead of settimeout

* fix: refactor tests and hooks

* fix: use landing_company_name instead of shortcode

* fix: test title

* fix: scroll to active wallet upon click

* fix: resolve test and comments

* fix: test

* fix: tests again

* feat: implement withdraw verification reques (#9125)

* feat: implement withdraw verification reques

* feat: update component name

* feat: update typo

* feat: change icons with new icons design provided

* chore: retrigger ci tests

* chore: retrigger ci tests

---------

Co-authored-by: mahdiyeh-deriv <82078941+mahdiyeh-deriv@users.noreply.github.com>

* yashim/feat: add mock server integration phase1 (#9003)

* feat: add mock server integration

* refactor: use session instead of client

* fix: persistent mock server enable state

* chore: draft

* feat: add mock server control panel UI

* feat: add clear all functionality

* feat: completed login mock

* fix: tests

* fix: code

* feat: add feature toggle

* feat: end of day commit

* fix: review comments + tests

* chore: used deriv-api

* fix: typescript error

* chore: update package lock

---------

Co-authored-by: Dev Sans <yashimwong@gmail.com>

* Rostislav / Wall-455 / Transaction list filter (Demo&Real) (#9007)

* refactor: init pr

* feat: adding filter dropdown component

* feat: restructuring FiatTransactionList -> TransactionList + added the filter

* refactor: localize

* refactor: appearance fixes

* refactor: further appearance fixes

* refactor: grouping transactions now in utils

* refactor: minor change

* refactor: new hook

* refactor: useWalletsList.ts changes by @sergei-deriv

* refactor: continuation of the prev commit

* refactor: typescript shenanigans

* refactor: use wallet list

* refactor: moving stuff to hooks

* refactor: removed unused stuff for transaction-list.tsx

* refactor: improving logic

* refactor: test file

* refactor: no more circular deps

* refactor: improved hook

* refactor: test

* test: add tests (#10)

* test: fix tests

* fix: apply comments

* fix: apply comments, refactor code

* test: fix test

* test: reactor code

* trigger build

* trigger build

* refactor: fixing appearance

* update feature_branch with master (#9220)

* fix: close account message doesn't show up (#9210)

Co-authored-by: niloofar sadeghi <niloofar.sadeghi@re-work.dev>

* Jim/WEBREL-667/fix-bug-revealed-during-ts-migration (#9216)

* revert: revert code changes

* fix: fix bug revealed during ts migration

* chore: add test cases for line changed

---------

Co-authored-by: Niloofar Sadeghi <93518187+niloofar-deriv@users.noreply.github.com>
Co-authored-by: niloofar sadeghi <niloofar.sadeghi@re-work.dev>
Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>

* refactor: mock data change

* refactor: finish resolving

* refactor: remove package-lock.json changes

* refactor: fix tests

* refactor: resolve some ts problems

* refactor: resolve some ts problems

* refactor: one more small fix with the help of @heorhi-deriv

* refactor: remove unused @ts-expect-error

* refactor: remove fiat-transaction-list.tsx

---------

Co-authored-by: George Usynin <103181646+heorhi-deriv@users.noreply.github.com>
Co-authored-by: george-usynin-binary <heorhi@binary.com>
Co-authored-by: mahdiyeh-deriv <82078941+mahdiyeh-deriv@users.noreply.github.com>
Co-authored-by: Niloofar Sadeghi <93518187+niloofar-deriv@users.noreply.github.com>
Co-authored-by: niloofar sadeghi <niloofar.sadeghi@re-work.dev>
Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>

* Sergei / wall 680 / Desktop wallet dark theme (#9006)

* style: change text color and add bg color for demo wallet in dark mode

* feat: add logo for dark theme

* feat: add @deriv/hooks to package.json in appstore

* chore: empty commit to restart vercel

* refactor: wrap TradersHub component by observer

* chore: empty commit to restart vercel

* feat: change color of button border

* update feature_branch with master (#9220)

* fix: close account message doesn't show up (#9210)

Co-authored-by: niloofar sadeghi <niloofar.sadeghi@re-work.dev>

* Jim/WEBREL-667/fix-bug-revealed-during-ts-migration (#9216)

* revert: revert code changes

* fix: fix bug revealed during ts migration

* chore: add test cases for line changed

---------

Co-authored-by: Niloofar Sadeghi <93518187+niloofar-deriv@users.noreply.github.com>
Co-authored-by: niloofar sadeghi <niloofar.sadeghi@re-work.dev>
Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>

* feat: fix test for useWalletsList

* fix: try to fix useWalletsList test

* feat: add type to default_mock_useFetch_response

* feat: just add @ts-expect-error

* chore: change number to boolean

---------

Co-authored-by: mahdiyeh-deriv <82078941+mahdiyeh-deriv@users.noreply.github.com>
Co-authored-by: Niloofar Sadeghi <93518187+niloofar-deriv@users.noreply.github.com>
Co-authored-by: niloofar sadeghi <niloofar.sadeghi@re-work.dev>
Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>

* george / wall-14 / fiat deposit (#9060)

* feat: add fiat deposit iframe

* test: fix test

* Quick fix for `useWalletList` hook (#9256)

* fix: useWalletsList.ts

* refactor: changes requested by @heorhi-deriv

* refactor: changes requested by @sergei-deriv

* refactor: remove unnecessary falsy check

* feat: added add-wallets section (#9018)

* feat: added add-wallets section

* chore: added carousel and hooks

* chore: 90% finish implementation

* fix: commit suggestions

* feat: done but without test cases

* fix: added test cases but wil improve on it

* chore: small changes but big impact 😎

* fix: added loading screen to the component

* fix: commit suggestions

* fix: resolve somemore comments

* fix: small changes

* fix: circleci

* fix: this is the last one i swear

* fix: resolved comments

* fix: commit suggestions

* fix: commit suggestions

* fix: oh man oh man oh man

* fix: rename UST to USDT

* fix: update test cases to reflect on the changes

* fix: usd description

* fix: commit suggestions

* fix: added cursor pointer to wallet cards

* fix: small changes

* fix: i know its failing thats why im pushing this commit to fix it

* fix: i know its failing thats why im pushing this commit to fix it

* fix: test cases and vercel

* fix: retrigger vercel

* fix: make changes for the icon and the position of the arrow btn

* fix: test cases

* fix: commit suggestions

* fix: remove unnecessary files from commit

* fix: firefox issues and wallet card btn

* fix: commit suggestions

* fix: commit suggestions pt.2

* chore: fix test

* fix: circle ci issue

* fix: circle ci errors

* fix: circle ci pt.2

* fix: circle ci pt.3

* fix: removed duplicate entries

* chore: update package-lock using npm run bootstrap:dev

* Farzin/Putting wallet behind feature flag [WIP] (#9236)

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

---------

Co-authored-by: Farzin Mirzaie <farzin@deriv.com>

* Sergei / wall-348 / Responsive Wallets: The complete flow (#9015)

* feat: add wallet cards to carousel

* feat: add check for is_mobile

* feat: add transition for pagination

* feat: add recalculate feature for carousel when the user changes screen size

* feat: finish with UI part

* feat: create common type for desktop and responsive wallets

* feat: add sorting function

* refactor: delete wallet word from wallet name

* feat: add react-slick library

* feat: intermediate result of carousel

* feat: intermediate result

* feat: delete TWalletType

* feat: add useWalletAccount test stub

* feat: move styles to AccountWithWallets

* refactor: delete comments

* feat: delete comments again

* feat: add generic type to useRef

* refactor: move TWalletAccount to common.types.ts

* feat: delete React.memo, doesn't need now

* chore: empty commit to restart vercel

* feat: change balance type from string to number and repair tests

* chore: restore tests

* feat: add swipe to slide and make container wider

* feat: create separate button component and refactor WalletHeader

* chore: empty commit to restart vercel

* refactor: delete styles for dots

* feat: add tests for wallet-cards-carousel

* feat: change wallet-transfer-block tests

* feat: add tests for wallet-button component

* feat: delete comments from style

* feat: delete slick-theme.scss file

* feat: move slick.scss file to traders-hub folder

* refactor: delete commented lines

* feat: make wallet_account optional

* refactor: rename hook

* feat: add wallets accounts to list of valid logins

* feat: allow only one open desktop wallet

* feat: repair test

* feat: implement some suggestions

* feat: rename the hook

* refactor: rename useWalletAccounts test file

* feat: intermediate result. Have to think about useCallback

* feat: move convertWallets to utils

* refactor: implemet some suggestions

* feat: add TODO

* feat: fix wallet-card component to show proper demo badge

* chore: empty commit to restart vercel

* feat: change library

* feat: repair test

* refactor: delete comment

* feat: change color to prominent for Text components

* feat: change jurisdiction to UpperCase

* feat: delete test select and add hooks to package.json

* feat: add fake accounts because qa29 is unavailable

* chore: empty commit to restart vercel

* fix: fix console error

* feat: imtermediate result

* feat: change tabs order

* feat: add plus icon for CFDs

* feat: add select as for desktop

* feat: add compare accounts for fiat and crypto

* feat: add comment

* feat: add right colors for responsive mode

* feat: repair test

* style: add some colors

* feat: add active_wallet_loginid to client-store

* style: add styles for CFD tab

* feat: delete filter available_platforms for WalletOptionsAndMultipliersListing

* feat: repair test

* chore: empty commit to restart vercel

* feat: add placeholder

* feat: add one todo

* chore: empty commit to restart vercel

* feat: add is_switching and is_landing_company_loaded flags for placeholder

* feat: delete check for is_landing_company_loaded

* feat: implement suggestions

* feat: add some properties to iseWalletList result

* feat: refactor useWalletsList

* feat: check for demo icon in useWalletList

* feat: refactor progress-bar-onboarding

* feat: add carousel and refactor all wallets

* feat: comment currency_display_code

* feat: change useWalletList hook again

* feat: repair wallet-cards-carousel tests

* feat: repair tests for wallet-header

* feat: add tests for badge in wallet-header

* feat: delete unuses type

* style: create var for wallets box-shadow

* feat: add useActiveWallet hook

* feat: refactor code

* refactor: some refactor of code

* feat: delete using of useActiveWallet from 2 components

* feat: add useActiveWallet for CFDsListing and OptionsAndMultipliersListing

* feat: repair wallet-content test

* feat: repair wallet-header test

* feat: rewrite one test case for wallets component

* refactor: delete unused import

* style: add prominent color for Options & multipliers

* chore: empty commit to restart vercel

* feat: fix buttons issue

* feat: fix logout issue for responsive

* chore: delete comments

* feat: return original onArrowClickHandler

* feat: add needed properties in useWalletTransactions

* feat: change currency to wallet_currency

* feat: add wallet_currency to useWalletsList

* fix: comment AddMoreWallets because it breaks PR when switch to Demo wallet

* fix: add check for currencies in useAvailableWallets

* feat: add ability to wallet buttons to open modal in responsive mode

* refactor: change names for WalletContent props

* feat: add open wallet modal for transfer button in CFD section of crypto wallet

* feat: add select needed wallet card after redirect from cashier

* Kill changes in package-lock

* feat: add ts-expect-error to fix CircleCI error

* fix: fix CircleCI test

* feat: add open wallet modal for OptionsAndMultipliers components

* fix: fix wallet-transfer-block test after modification

* chore: comment scroll to choosed card

* feat: delete autoselect wallet in responsive mode because cashier will be deleted

* feat: fix some issues

* feat: fix carousel issue

* fix: fix tests for CircleCI

* feat: delete is_added from useWalletsList

* Farzin/Putting wallet behind feature flag [WIP] (#9362)

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

* refactor(appstore): 🔥 clean-up

---------

Co-authored-by: Farzin Mirzaie <farzin@deriv.com>

* fix: import issue in style (#9436)

* thisyahlen/fix: wallet migration using mock server (#9161)

* fix: mock config push

* chore: mock server works boii

* fix: comments and refactor

* fix: remove unused import

* fix: change refetch interval to 500ms

* fix: refactor

* fix: refactor v2

* fix: change back to migrated

* fix: change to state

* fix: test

* fix: resolve comments

* fix: removed async keyword (#9504)

* fix: updated deriv/api-types in p2p (#9535)

* fix: updated deriv/api-types in p2p

* fix: added types for notification

* fix: test cases

* fix: circle ci issues pt.2

* bugfix: logout issue (#9466)

* bugfix: logout issue

* chore: fix code smell

* refactor: move token check into the if scope

* fix: ternary option for token

* chore: reload build

---------

Co-authored-by: Mahdiyeh Amirkhani <mahdiyehamirkhani@Mahdiyeh-Amirkhanis-Mac-J79XQHKXVJ.local>

* george / wall-1177 / Demo transfer  insufficient funds error (#9211)

* feat: add demo transfer error handlers, add useTransferBetweenAccounts hook

* fix: types errors

* fix: commit

* feat: add transfer hooks

* test: add tests

* fix: commit

* feat: 🎨 refactor code, add useActiveCFDAccounts hook

* chore: remove comment

* refactor: 🔥 cleanup

* fix: useAvaliableWallets hook

* fix: typescript errors

* test: add tests, apply comments

* test: add test, add test accounts

* test: fix tests

* fix: fix ts errors

* fix: apply comments

* perf: small improvement

* perf: small improvement

* fix: resolve conflicts

* refactor: improve logic, fix test

* chore: remove unused import

* feat: add reset balance button handler

* fix: currency register

* style: fix styles in dark mode

* test: fix test

* perf: minor improvements

* refactor: ⚡ transfer account data transfarmation layer

* fix: minor fix

* test: fix tests

* fix: input error color

* refactor: split accounts: trading_accounts and wallets

* test: fix test

* refactor: improve naming

* fix: minor fix

* feat: add useExistingCFDAccounts hook

* test: fix tests

* perf: replace useRequest with usefetch in useExistingCFDAccounts hook

* test: fix test

* style: fix selected tile style

* refactor: apply comments

* Aum/FEQ-503/proper-wallet-listing-logic-with-feature-flag (#9550)

* feat: binding feature flag with API response to show or hide the wallets

* fix: fixed wallet-card shine issue

* fix: removed extra check for wallets list length in useHasWallet

* refactor: moved logic for useHasWallet to useWalletsList

* Aum/wall 1332/implementing the colors updating the components (#9492)

* feat: added wallet-card colors for wallet-migration modal

* fix: fixing the colors for the bitcoin gradient

* implement migration banner visibility logic (#9552)

* refactor: implement migration banner visibility logic

* test: fix tests

* refactor: move has_wallet check to useWalletsList hook

* test: remove unused test

* test: fix test type

* refactor: remove button for test purposes

* fix: missing icon

* fix: type, sonarcloud issue (#9642)

* fix: blinking wallet banner, double scroll (#9653)

* fix: blinking wallet banner, double scroll

* fix: blinking wallet banner with no wallets account

* refactor: remove has_wallet, add is_migrated check

* refactor: improve conditions

* feat: add containScroll and clearTimeout (#9662)

* fix: remove duplicated types

* Merge branch 'master' into feature/wallets_with_traders_hub

* Aizad-sergei/Fix:  :feature/wallets with traders hub (#9755)

* chore: initial commit

* fix: fixed tests

* chore: init commit

* refactor: move WalletsImage component to separate file

* refactor: move wallet_migration type, add TSDoc for it, change ?? to && for authorize checking

* refactor: implement suggestions for packages/appstore/src/components/containers

* refactor: add button styles to title

* refactor: changed EUDisclaimer component

* refactor: implement suggestions for packages/appstore/src/components/modals

* refactor: reverted changes back

* refactor: delete useCallback

* refactor: wallet-add-card.spec.tsx

* refactor: addmorewallets.tsx,addmorewallets.scss,addmorewallets.spec.tsx,walletaddcard.tsx

* refactor: implement suggestions for packages/appstore/src/components

* refactor: some more implemented suggestions

* feat: optimize svgs for wallets

* refactor: minified rest of svgs

* refactor: add some more suggestions

* refactor: complete with suggestions

* feat: add check for stringified object

* refactor: real-wallets-upgrade folder

* chore: resolve comments from the big man himself: yashim

* refactor: implement Maryia suggestions and use svgo for all icons

* refactor: use svgo just for icons related to wallets

* refactor: rename all variables to snake_case

* refactor: optimize listing-container component

---------

Co-authored-by: Mahdiyeh Amirkhani <mahdiyehamirkhani@Mahdiyeh-Amirkhanis-Mac-J79XQHKXVJ.local>
Co-authored-by: aizad-deriv <aizad@deriv.com>
Co-authored-by: Sergei Baranovski <sergei@deriv.com>
Co-authored-by: Aizad Ridzo <103104395+aizad-deriv@users.noreply.github.com>

* fix: fix test

* chore: update embla-carousel-react version to 8.0.0-rc12 in appstore package

* fix: unused '@ts-expect-error' directive

* chore: resolve comments

* fix: conflicts

* chore: initial commit (#9853)

* chore: initial commit

* refactor: refactor sonar cloud code smells

* refactor: ♻️ remove unused and replace deprecated properties

* refactor: extracted out function

* refactor: change isMobile to is_mobile from store

* refactor: revert useCurrencyConfig usage from api

* fix: add imports for routes

---------

Co-authored-by: Mahdiyeh Amirkhani <mahdiyehamirkhani@Mahdiyeh-Amirkhanis-Mac-J79XQHKXVJ.local>
Co-authored-by: arshad-rao-deriv <muhammad.arshad@deriv.com>

* fix: remove wrong import

* feat: modify progressBarTracker and renamed this component in CardsSliderSwiper (#9954)

* Fix Review Comments Wallets Feature branch (#9998)

* refactor: ♻️ extracted logic to a function in useWalletTransactions

* refactor: remove code smells

* refactor: ♻️ updated wrapper function name used in test

* Fix feature/wallets with traders hub (#10041)

* refactor: ♻️ extracted logic to a function in useWalletTransactions

* refactor: remove code smells

* refactor: ♻️ updated wrapper function name used in test

* refactor: refactoed code, replaced localize with Localize component

* refactor: formatted code

* refactor: refactored code, used early return

* george / resolve comments for FB1 (feature/wallets_with_traders_hub) (#10040)

* fix: ♻️ resolve comments

* refactor: ♻️ improve modal to show close cross button only

* refactor: ♻️ refactor wallet upgrade props

* fix: 🐛 fix app loading issue related to can_get_more_cfd_mt5_accounts usage (replace with hook)

* fix: modal component (#10148)

* Rostislav / Wallets feature branch refactors (#10178)

* refactor

* refactor

* refactor: code refactoring PR comments (#10180)

* Arshad/feature/wallets with traders hub fixes (#10226)

* refactor: code refactoring PR comments

* refactor: refactored code review comments

* fix: revert icon and content that got overwritten while merge in withdrawal-verification-email.tsx

* feat: add conditions to show wallet migration notifications (#10280)

* fix: top up modal height issue (#10279)

* lubega/feq 750/fix: withdraw page spacing issue (#10302)

* fix: 🐛 Account selector alignment fix

* fix: 🐛 Withdraw page spacing issue

* fix: 🐛 Withdraw page spacing issue

* fix: 🐛 Withdraw page spacing issue

* nijil/aum/FEQ-739/fix alignment issues for feature branch 1 (#10252)

* fix: fixed height of pa deposit payment methods dropdown

* fix: fixing tabs component for alignment issues

* fix: password meter and hint alignment (#10285)

* fix: fix test for min-max-stake (#10316)

* fix: bump version of @deriv/deriv-api to 1.0.13 in reports package

* Sergei / FEQ 741 / add prevent logout logic as for fb2 (#10282)

* feat: add logic as for fb2

* fix: fix test for useWalletMigration

* fix: reset MT5AccountTypeModal file to the one in master

* fix: reset MT5AccountTypeModal file to the one in master

* fix: add import for useState hook

* Remove unnecessary modal min height param (#10355)

* fix: Remove unnecessary modal min height param

* fix: removed unnecessary prop

* aum/WALL-1983/fix-description-font-size-in-empty-state (#10334)

* fix: fixed font-size for empty-states description

* refactor: changed the font-sizes

* george / WALL-1985 / fix style issues (PA withdarwal, fiat withdrawals) (#10350)

* style: 💄 fix style issues

* test: 🧪 add test for balance-text

* chore: ♻️ fix naming convention for data testid

* Merge branch 'feature/wallets_with_traders_hub' of https://github.com/binary-com/deriv-app into pa-aligment

* refactor: ♻️ align with master

* test: 🧪 refactor test

* style: 💄 add spacing

* Aizad/WALL-1987/Seeing loading issue during DIEL account creation (#10391)

* fix: remove console errors on onboarding page

* fix: allow onboarding for diel

* fix: resolve comments

* Rostislav / WALL-1986 / Alignment issues in Transfer limit message (#10376)

* fix: align

* fix: appearance, but different

* fix: appearance, but yet again different

* refactor: a bunch more blank lines in css for readibility

* Sergei / wall 1998 / inputs alignment (#10431)

* style: change margin

* style: add style for mobile

* style: change bottom property to top

* feat: add is_authorize check (#10466)

* Rostislav / WALL-1986 (2) / Alignment issues in Transfer limit message (#10462)

* fix: appearance align with production

* refactor: better css

* refactor: better css

* Nijil/Comment out usage of useWalletList and useWalletMigration (#10480)

* chore: comment code using useWalletList and useWalletMigration to reduce number of authorize calls

* chore: add is_wallet_enabled check from useFeatureFlags hook for WalletModal in ModalManager

* chore: consistent TODO comments across all commented out code

* chore: Update package-lock

* fix: failing test cases

Co-authored-by: Sergei Baranovski <sergei-deriv@users.noreply.github.com>

---------

Co-authored-by: Sergei Baranovski <sergei-deriv@users.noreply.github.com>

* Rostislav / WALL-2011 / Fiat<->Fiat transfer percentage selector removed (#10511)

* fix: mt5<->fiat no more percentage selector

* fix: logic

* Revert "Rostislav / WALL-2011 / Fiat<->Fiat transfer percentage selector removed (#10511)" (#10527)

This reverts commit d61b94a.

* george / WALL-2020 / transfer modal height (#10532)

* style: 💄 fix buttons group margin

* style: 💄 align style with staging

---------

Co-authored-by: Thisyahlen Nair <thisyahlen@regentmarkets.com>
Co-authored-by: Hamid <hamid@regentmarkets.com>
Co-authored-by: Sergei Baranovski <120570511+sergei-deriv@users.noreply.github.com>
Co-authored-by: George Usynin <103181646+heorhi-deriv@users.noreply.github.com>
Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com>
Co-authored-by: Farzin Mirzaie <farzin@deriv.com>
Co-authored-by: mahdiyeh-deriv <82078941+mahdiyeh-deriv@users.noreply.github.com>
Co-authored-by: aum-deriv <125039206+aum-deriv@users.noreply.github.com>
Co-authored-by: Aizad Ridzo <103104395+aizad-deriv@users.noreply.github.com>
Co-authored-by: Rostik Kayko <119863957+rostislav-deriv@users.noreply.github.com>
Co-authored-by: Hamid Yaftian <hamid@deriv.com>
Co-authored-by: Sergei Baranovski <sergei@deriv.com>
Co-authored-by: thisyahlen <104053934+thisyahlen-deriv@users.noreply.github.com>
Co-authored-by: yashim-deriv <yashim@deriv.com>
Co-authored-by: Dev Sans <yashimwong@gmail.com>
Co-authored-by: Mahdiyeh Amirkhani <mahdiyehamirkhani@Mahdiyeh-Amirkhanis-Mac-J79XQHKXVJ.local>
Co-authored-by: george-usynin-binary <heorhi@binary.com>
Co-authored-by: Niloofar Sadeghi <93518187+niloofar-deriv@users.noreply.github.com>
Co-authored-by: niloofar sadeghi <niloofar.sadeghi@re-work.dev>
Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>
Co-authored-by: aizad-deriv <aizad@deriv.com>
Co-authored-by: arshad-rao-deriv <muhammad.arshad@deriv.com>
Co-authored-by: Arshad Rao <135801848+arshad-rao-deriv@users.noreply.github.com>
Co-authored-by: lubega-deriv <142860499+lubega-deriv@users.noreply.github.com>
Co-authored-by: Sergei Baranovski <sergei-deriv@users.noreply.github.com>
  • Loading branch information
26 people committed Oct 6, 2023
1 parent 34d6a25 commit 3433eee
Show file tree
Hide file tree
Showing 496 changed files with 15,252 additions and 1,042 deletions.
58 changes: 57 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import React from 'react';
import { Router } from 'react-router-dom';
import { createBrowserHistory } from 'history';
import { render, screen } from '@testing-library/react';

import { PlatformContext } from '@deriv/shared';
import { StoreProvider, mockStore } from '@deriv/stores';
import { mockStore, StoreProvider } from '@deriv/stores';
import { render, screen } from '@testing-library/react';

import BinaryRoutes from '../binary-routes';

jest.mock('../route-with-sub-routes', () => jest.fn(() => <div>RouteWithSubRoutes</div>));
Expand Down
5 changes: 4 additions & 1 deletion packages/account/src/Components/Routes/binary-routes.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import React from 'react';
import { Switch } from 'react-router-dom';
import { Localize } from '@deriv/translations';

import { observer, useStore } from '@deriv/stores';
import { Localize } from '@deriv/translations';

import getRoutesConfig from '../../Constants/routes-config';
import { TBinaryRoutes, TRoute } from '../../Types';

import RouteWithSubRoutes from './route-with-sub-routes';

const BinaryRoutes = observer((props: TBinaryRoutes) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ import {
} from 'formik';
import { StatesList } from '@deriv/api-types';
import {
Modal,
Autocomplete,
AutoHeightWrapper,
DesktopWrapper,
Div100vhContainer,
FormSubmitButton,
Loading,
MobileWrapper,
ThemedScrollbars,
Modal,
SelectNative,
Text,
ThemedScrollbars,
} from '@deriv/components';
import { useStatesList } from '@deriv/hooks';
import { getLocation } from '@deriv/shared';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import React from 'react';
import { screen, render } from '@testing-library/react';

import { mockStore, StoreProvider } from '@deriv/stores';
import { render, screen } from '@testing-library/react';

import FormBodySection, { TFormBodySection } from '../form-body-section';
import { StoreProvider, mockStore } from '@deriv/stores';

const MockFormBodySection = (props: TFormBodySection) => {
const mock_store = mockStore({});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React from 'react';
import classNames from 'classnames';

import { Text } from '@deriv/components';
import { isMobile } from '@deriv/shared';
import { Localize } from '@deriv/translations';
import classNames from 'classnames';
import React from 'react';

export type TFormBodySection = {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import React from 'react';
import { Formik } from 'formik';

import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';

import PersonalDetailsForm from '../personal-details-form';

jest.mock('react-router-dom', () => ({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import React from 'react';
import { Form, Formik } from 'formik';

import { render, screen } from '@testing-library/react';

import { ConfirmationCheckbox } from '../confirmation-checkbox';
import { Formik, Form } from 'formik';

describe('ConfirmationCheckbox', () => {
const props: React.ComponentProps<typeof ConfirmationCheckbox> = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React from 'react';
import { useFormikContext } from 'formik';

import { Checkbox, Text } from '@deriv/components';
import { isMobile } from '@deriv/shared';
import { useFormikContext } from 'formik';

/**
* Props for the confirmation checkbox component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import { GetSettings, ResidenceList } from '@deriv/api-types';
import { Button } from '@deriv/components';
import { filterObjProperties, toMoment, removeEmptyPropertiesFromObject } from '@deriv/shared';
import {
validate,
validateName,
isDocumentTypeValid,
isAdditionalDocumentValid,
isDocumentNumberValid,
isDocumentTypeValid,
shouldHideHelperImage,
validate,
validateName,
} from '../../../../Helpers/utils';
import FormSubHeader from '../../../form-sub-header';
import IDVForm from '../../../forms/idv-form';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe('LanguageSettings', () => {
const lang_1 = screen.getByText('Test Lang 1');
const lang_2 = screen.getByText('Test Lang 2');

expect(flags_icons.length).toBe(2);
expect(flags_icons).toHaveLength(2);
expect(lang_1).toBeInTheDocument();
expect(/(active)/i.test(lang_1.className)).toBeTruthy();
expect(lang_2).toBeInTheDocument();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import IdvDocumentSubmit from 'Components/poi/idv-document-submit';
import IdvUploadComplete from 'Components/poi/idv-status/idv-submit-complete';
import Unsupported from 'Components/poi/status/unsupported';
import UploadComplete from 'Components/poi/status/upload-complete';

import OnfidoUpload from './onfido-sdk-view-container';
import { identity_status_codes, submission_status_code, service_code } from './proof-of-identity-utils';
import { identity_status_codes, service_code, submission_status_code } from './proof-of-identity-utils';

const POISubmission = observer(
({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import React from 'react';

import { fireEvent, render, screen } from '@testing-library/react';

import ProofOfOwnershipForm from '../proof-of-ownership-form.jsx';

import { grouped_payment_method_data } from './test-data';

describe('proof-of-ownership-form.jsx', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "1.0.0",
"main": "src/index.ts",
"dependencies": {
"@deriv/deriv-api": "^1.0.11",
"@deriv/deriv-api": "^1.0.13",
"@deriv/utils": "^1.0.0",
"@deriv/shared": "^1.0.0",
"react": "^17.0.2",
Expand Down
1 change: 1 addition & 0 deletions packages/api/src/hooks/useResidenceList.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useMemo } from 'react';

import useQuery from '../useQuery';

/** A custom hook that gets the residence list. */
Expand Down
2 changes: 2 additions & 0 deletions packages/api/src/hooks/useTransactions.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { useMemo } from 'react';

import useInfiniteQuery from '../useInfiniteQuery';

import useAuthorize from './useAuthorize';

/** A custom hook to get the summary of account transactions */
Expand Down
4 changes: 2 additions & 2 deletions packages/api/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import useQuery from './useQuery';
import useMutation from './useMutation';
import useInfiniteQuery from './useInfiniteQuery';
import useMutation from './useMutation';
import useQuery from './useQuery';

export { default as APIProvider } from './APIProvider';
export { default as useInvalidateQuery } from './useInvalidateQuery';
Expand Down
4 changes: 3 additions & 1 deletion packages/api/src/useAPI.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useCallback, useContext } from 'react';
import APIContext from './APIContext';

import type {
TSocketEndpointNames,
TSocketPaginateableEndpointNames,
Expand All @@ -8,6 +8,8 @@ import type {
TSocketSubscribableEndpointNames,
} from '../types';

import APIContext from './APIContext';

const useAPI = () => {
const api = useContext(APIContext);

Expand Down
4 changes: 3 additions & 1 deletion packages/api/src/useInfiniteQuery.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { useInfiniteQuery as _useInfiniteQuery } from '@tanstack/react-query';
import useAPI from './useAPI';

import type {
TSocketAcceptableProps,
TSocketPaginatateableRequestCleaned,
TSocketPaginateableEndpointNames,
TSocketRequestInfiniteQueryOptions,
TSocketRequestPayload,
} from '../types';

import useAPI from './useAPI';
import { getQueryKeys } from './utils';

const useInfiniteQuery = <T extends TSocketPaginateableEndpointNames>(
Expand Down
6 changes: 4 additions & 2 deletions packages/api/src/usePaginatedFetch.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { useCallback, useState } from 'react';
import useQuery from './useQuery';

import type {
TSocketAcceptableProps,
TSocketPaginateableEndpointNames,
TSocketRequestPayload,
TSocketRequestQueryOptions,
TSocketPaginateableEndpointNames,
} from '../types';

import useQuery from './useQuery';

const usePaginatedFetch = <T extends TSocketPaginateableEndpointNames>(
name: T,
...props: TSocketAcceptableProps<T, true>
Expand Down
4 changes: 3 additions & 1 deletion packages/api/src/useQuery.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { useQuery as _useQuery } from '@tanstack/react-query';
import useAPI from './useAPI';

import type {
TSocketAcceptableProps,
TSocketEndpointNames,
TSocketRequestPayload,
TSocketRequestQueryOptions,
TSocketResponseData,
} from '../types';

import useAPI from './useAPI';
import { getQueryKeys } from './utils';

const useQuery = <T extends TSocketEndpointNames>(name: T, ...props: TSocketAcceptableProps<T, true>) => {
Expand Down
Loading

1 comment on commit 3433eee

@vercel
Copy link

@vercel vercel bot commented on 3433eee Oct 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

deriv-app – ./

deriv-app.vercel.app
binary.sx
deriv-app-git-master.binary.sx
deriv-app.binary.sx

Please sign in to comment.