Skip to content

Commit

Permalink
thisyahlen/ added tour guide component (#6573)
Browse files Browse the repository at this point in the history
* translations: πŸ“š sync translations with crowdin (#6366)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (#6373)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* fix bug (#6154)

* yauheni/ 70488/ edit note in self-exclusion message box (#6044)

* text|edit_note_self_exclusion_message_box

* test fix

* regexp in tests fix

* accident text deleted

* popup message text fix

* text fixes

* test text query fix

Co-authored-by: β€œyauheni-kryzhyk-deriv” <β€œyauheni@deriv.me”>

* Akmal / Ignore IDV verification if client is high risk && withdrawals are locked (#4644)

* Ignore IDV verification if client is high risk

* Fix formatting

* Fix cfd-poi issue due to client store unavailability

* Fix formatting

* Merge with master

* Fix formatting

* Merge with master

* Revert "Merge with master"

This reverts commit 4bead99.

* Fix merge issues

* Chain extra condition to cover wrong status returned from BE

* Fix: wrong component shown when manual upload is triggered

* fix:tax_number_validation (#6259)

* george / rm65047 / convert routes, cashier, error-component components to TS (#6361)

* perf(cashier routes): convert csahier routes to TS

* perf(cashier routes): convert error-component to TS

* refactor(error-dialog, types): refactor error-dialog types, move error type to shared types

* perf(cashier): convert cashier to TS

* perf(types): refactor types

* refactor(routes with sub routes): refactor default subroute

* refactor(types): add/refactor server error type

* test: refactor pathname

* refactor(route types): refactor route types

* fix: fix ts error in React.Suspense

* george / rm65033 / ts migration of withdraw UI components (#6343)

* perf(cashier withdraw): convert withdrawal-verification-email to TS

* perf: add data-testid for checklist action

* perf(cashier withdraw): convert withdrawal-locked to TS

* perf(types): add types for TClinetStore

* perf(cashier withdraw): convert withdraw to TS

* perf(cashier withdraw): convert crypto-withdraw-receipt to TS

* perf(cashier withdraw): convert crypto-withdraw-form to TS

* perf(cashier withdraw): convert withdrawal to TS

* refactor(cashier withdraw): refactor array syntax (ts)

* test(cashier withdraw): remove eslint disables for tests

* update deriv go redirection link (#6386)

* Farzin/68320/Update cashier withdrawal locked status if PA already withdraw all his allowable withdrawal amount (#6032)

* fix(cashier): ✨ handle `PACommisionWithdrawalLimit` state in `CashierLocked`

* test(cashier): βœ… add test case to `CashierLocked` for `PACommisionWithdrawalLimit`

* Trigger Build

* Jim/73479/appstore-workspace-ts-fix (#6208)

* chore: update appstore tsconfig

* chore: update appstore tsconfig

* chore: add react and types/react packages to appstore

* refactor: remove unnecessary includes

* refactor: change from reexports to import -> export

* Niloofar Sadeghi / Trader Typescript configuration issue (#6275)

* fix: trader typscript configuration issue

* fix: tsc errors on trader

* Niloofar Sadeghi / Add typescript configuration on reports (#6276)

* chores: add typescript configuration on reports

* fix: remove extra paths

* fix: revert removing packages

* george / rm65041 / migrate p2p-cashier component to TS (#6177)

* refactor(p2p-cashier): migrate p2p-cashier component to TS

* commit

* perf(types): add types for notification store

* perf(types): add types for ui store

* perf(types): convert p2p-cashier to TS

* refactor(types): change RootStore type to TRootStore

* test(p2p-cashier): test fix (change wrapper order fro p2p-cashier component)

* refactor(types): refactor current_focus type

* test(p2p-cashier): remove eslint disables

* Vinu/Ts onramp cashier (#5727)

* refactor: converted on-ramp module into typescript

* refactor: included type related to store in on-ramp

* ts fix in on-ramp-provider-card.spec.tsx

* added path in tsconfig

* added path in tsconfig

* added type for react-router-dom

* added ts related change required for migrating all components (#5760)

* changed the name of data-testid in on-ramp component

* ts-migration-crypto-fiat-converter (#5796)

* Trigger build

* Update package-lock

* ts-migration-cashier-notifications (#5765)

* implemented review comments and updated branch as per latest upstream branch

* bahar/funds_protection_component-ts-migration (#5756)

* funds_protection_component-ts-migration

* remove_extra_type_file

* fix_merge_issue

* hamid/migrate-transfer-confirm-to-ts (#5815)

* Migrate TransferConfirm to TS

* Rename component in test file

* Replace Confirm with TransferConfirm in PAs

* Enhance Tests

* ts-migration-page-404 (#5766)

* corrected imports in on-ramp pages

* coreected setSideNotes type in on-ramp file

* arranged the order of imports in on-ramp

* refactor: add menu-option type to types folder in cashier

* replaced type for FormEvent in on-ramp from Types

* added types from TRootstore

* added types of TClientStore, TUiStore and TCommonStore in on-ramp

Co-authored-by: Nijil Nirmal <nijil@deriv.com>
Co-authored-by: Bahar <bahar@firstsource.tech>
Co-authored-by: Hamid <hamid@re-work.dev>

* hamid/65036/migrate-account-transfer-to-ts (#6305)

* Migrate Account Transfer to TS

* Enhance type names

* Remove eslint ignore line

* Remove generic type from useState

* trigger tests

* Fix test errors

* Change data-testid name

* Niloofar Sadeghi / Account typscript configuration issue (#6273)

* fix: account typscript configuration issue

* text: remove include comment on account tsconfig

* Niloofar Sadeghi / Circleci issue (#6402)

* fix: circle ci issue

* fix: circle ci issue

* Niloofar Sadeghi / Add typescript to each workspace dependency (#6306)

* build: add typescript to all packages

* build: move typescript to devdependency

* add some TS configs to eslint file

* fix: conflicts

* Shayan/74388/fix ts config on cfd (#6351)

* checking circle/ci test

* removed test changes

* fix: updated tsconfig and fixed some errors

* fix: updated tsconfig and added globals.d.ts

* chore: removed experimentalsDecorators from local config

* translations: πŸ“š sync translations with crowdin (#6405)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* hamid/75726/missing-grey-box-side-note (#6410)

* Fix sidenote in mobile view of account-transfer

* Remove duplicate title

* Add sideNote title

* translations: πŸ“š sync translations with crowdin (#6413)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* Revert "george / rm65041 / migrate p2p-cashier component to TS (#6177)" (#6424)

This reverts commit 503e77e.

* P2p 2fa feature (#6422)

* carol/ P2P: 2FA (#6009)

* add: icons

* add: one more icon

* add email verification modal

* add invalid verification link modal

* add email verified

* add email blocked modal

* add email blocked modal

* use align prop instead

* carol/ P2P: Email verification for orders (#6299)

* fix: quotes

* add: email verification

* cleanup

* don't kill me

* add response checks

* add comment

* add: amount + currency

* fixed loading of order details and chat

* fixed design on responsive

* fixed verification modal in responsive

* show modal if error

* fix

* fixed truncated modal in ios

* fix time

* fix invalid verification modal

* fix

* fix

* fixed verification modal in desktop

* fix responsive +logged out user

* fix: design for seller

* the solution to all my problems

* fix: modal

* fix logout + modal

* hide extra modal

* i got 99 problems and 2fa is all of em

* fix

* fix

* fix: amount

* fix: amount

* fix: add modal

* fix: rating modal

Co-authored-by: Farrah Mae Ochoa <farrah@deriv.com>

Co-authored-by: Nijil Nirmal <nijil@deriv.com>
Co-authored-by: Farrah Mae Ochoa <farrah@deriv.com>

* translations: πŸ“š sync translations with crowdin (#6426)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* Added scroll to cfd personal details modal (#6235)

* Shayan/74387/Update TS Config and Fix TS Errors on Cashier (#6284)

* checking circle/ci test

* removed test changes

* fix: updated ts config and fixed two errors returnd by tsc

* fix: fixing errors returned by tsc (WIP)

* fix: fixed all ts errors

* chore: removed experimentalDecorators from tsconfig

* fix: removed unnecessary path from tsconfig

* fix:  type added to transfer_to_hint

* Fixed the font size for non authenticated svg accounts (#6077)

* Farzin/70813/Fix date picker month issue for non english languages (#6027)

* fix(components): πŸ› fix date picker month issue for non english languages by setting moment locale to `en`

* refactor(components): ♻️ refactor `calendar-months` component to rely on month number instead of month name

* fix(components): 🌐 add localization support for date picker month names

* refactor(components): πŸ”₯ remove redundant `month_headers`

* chore(components): βž– remove redundant `@deriv/translations` dependency

* Trigger Build

* fix(cashier): πŸ“ resolve PR comments

* remove  disabled country validation from citizenship (#6236)

* farabi/improved-numpad-for-visibility (#6241)

* farabi/improved-numpad-for-visibility

* changed value to global variable

Co-authored-by: Farabi <farabi@Farabi-Chowdhurys-MacBook-Pro-C02X37B9JG5H-Standard.local>

* farabi / added a new tooltip for contract type 'both' (#6189)

* added a new tooltip for contract type both

* branch update

Co-authored-by: Farabi <farabi@Farabis-MacBook-Pro.local>

* george / rm73888 / fix Transfer button enabling when amount field is empty (#6252)

* fix(account transfer): fix Transfer button enabling when amount field is empty

* fix(account transfer): fix Transfer button enabling between account with the same currency

* refactor(account transfer): refactor condition into function

* fix(account transfer): disable Transfer button when amount is not valid

* fix(account transfer): fix validation error visibility

* likhith/incorporating a nation id image for ZW (#6175)

* feat: incorporating a nation id image for ZW

* feat: replaced image for zw identity card

* fix: regex format of sample input

* fix: replaced image for zw

* george / rm74876 / missing payment agent's phone number and url address (#6337)

* fix(payment agent withdraw): fix pa's phone number and url address visibility in receipt

* style(payment agent withdraw): fix style for submit buttons

* test(payment agent withdraw): refactor tests

* test(payment agent store): fix tests

* Niloofar Sadeghi / Jest issue with typescript (#6442)

* fix: indicator ts-jest config

* fix: add ts-jest to the root of the project

* fix: resolve comments

* fix: review comments

* translations: πŸ“š sync translations with crowdin (#6470)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (#6471)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (#6472)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (#6475)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (#6476)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* use github action token (#6335)

* mobile_fix (#6481)

* translations: πŸ“š sync translations with crowdin (#6482)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (#6486)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* fix auto pr creation (#6487)

* translations: πŸ“š sync translations with crowdin (#6489)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (#6491)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (#6493)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* carol/Derivgo link (#6445)

* use platform from query params to set app id

* add: check

* thisyahlen/ test coverage for cfd-account-card component (#5903)

* first commit, managed to render the component

* added derivx test cases

* type fix

* added a few more test cases

* covered commission message to make it 80%

* moved the new props

* moved the new props

* finished up mt5 tests

* added dxtrade

* added derivx and more mt5 test cases

* added beforeeach

* description change

* changed file to typescript

* removed mfsa and used svg

Co-authored-by: Thisyahlen <thisyahlen@Thisyahlens-MacBook-Pro.local>

* Maryia/chore: add test coverage for cfd-dashboard (#6181)

* Maryia/chore: add test coverage for cfd-dashboard

* Added more tests

* removed unnecessary check

* added more tests

* added more tests + improvements

* finalized tests for CFD dashboard

* fix: PropTypes warning

* migrated test file to tsx

* avoiding direct dom node access

* removed redundant global before window

* moved props outside beforeEach as they are never redefined, neither do their properties

* improved tests and added props types

* Fix word break in payment agent contant details (#5953)

* thisyahlen/ test coverage for investor-password-manager (#5973)

* test coverage for investor-password-manager

* refractored the test and tested again for the new bvi changes

* refractored code for better readability

* changed descriptions and lowercase

* fix spelling errors

* removed repeated test case

* thisyahlen/cfd-server-error-dialog test coverage (#5767)

* test coverage for cfd-server-error-dialog container

* test coverage for cfd-server-error-dialog

* changed role and added an error message test case

* remove screen debug

* removed last test case

Co-authored-by: Thisyahlen <thisyahlen@Thisyahlens-MacBook-Pro.local>

* thisyahlen/test coverage on compare-accounts-content container (#5847)

* first commit

* added test case for derivx

* added residence for derivx test case

* added a few more test cases

* refractored the code

* removed test case and changed description

* refractored the test

* changed eu to true

Co-authored-by: Thisyahlen <thisyahlen@Thisyahlens-MacBook-Pro.local>
Co-authored-by: balakrishna-binary <56330681+balakrishna-binary@users.noreply.github.com>

* likhith/test cases for CFD password modal (#6202)

* feat: incorporated test cases

* feat: incorporated test cases to test password modal for Financial STP and DerivX

* fix: failing test case

* ref: incorporated review comments

* feat: incorporated error message check

* fix: incorporated review comments

* fix: incorporated review comments

* fix: retitled the test cases

* fix: incorporated review comments

* fix: reducing duplicated code

* fix: removed commented code

* fix: removed commented code

* ref: refactored the code

* hamid/hide-reset-balance (#6104)

* Hide reset button if balance is 10000

* Fix console error of propTypes

* Change the location of the condition

* Add const for account init balance

* Ignore eslint warning

* Change namve convention of the method

* translations: πŸ“š sync translations with crowdin (#6508)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* hamid/76567/fix-word-break-pa (#6511)

* Fix word break in payment agent contant details

* Fix word break in payment agent contant details

* carol/ P2P: Remove confirm modal (#6430)

* remove extra modal from 2FA flow

* hide reasons

* Suisin/created scam warning pop up message (#6358)

* created scam warning pop up message

* Update website logo

* Updated Scam Message Logo

* changed client_country to br

* rearrange imports

* Updated all issue according to github comments

* Update scss design

* Update scss and modal

* Update className and scss

* Update scss margins for title

* Update Modal into the correct component

* Update dark mode and change country code from my to br

* Update ui store to call function and set function

* change my to br

* Update UI Store and Update Scss modal

* Update ui store

* Remove unused width in modal

* Update my to br

* Update values for locaization for brandName and remove unuse scamMessageDisplay

* Update logic for local storage

* Update Toggle Modal Element

* Update logout to remove localStorage element for scamMessage

* Moving localStorage.removeItem to cleanUp function

* Update scss and remove is_dark_mode

* Update my to br

* Not to display on Signup Page

* Update new logic on not displaying message in new account

* rearrange functions

* Update Scss for mobile view

* Update packages/core/src/App/Containers/WarningScamMessageModal/warning-scam-message.jsx

Co-authored-by: Farzin Mirzaie <72082844+farzin-fs@users.noreply.github.com>

* Update Scss format

* Update divider into the modal

Co-authored-by: Farzin Mirzaie <72082844+farzin-fs@users.noreply.github.com>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* likhith/track js reading loginid of undefined (#6452)

* fix: added a fallback case if virtual account is not available

* fix: added fallback to missing objects containing loginid

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (#6548)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* hamid/74062/cfd-dashboard-demo-account (#6427)

* Add required packages and icon and update qrcode

* CFD dashboard for demo account

* Fix tests errors

* Fix PR comments

* Add Huawei Link

* Resolve PR comments

* Edit SCSS classes

* Resolve conflict

* Change dxtrade type from synthetic to all

* Resolve PR comments

* Change texts

* Apply QA commnets

* Update AccoutSwitcher

* Fix tests errors

* Remove unneeded code

* Enhance code

* Run svgo for new dxtrade icons

* Change QRCode url

* Change QRCode url

* Enhance Code

* Check enabled property for existing accounts

* Hide disabled account in the Account-Switcher

* Change icon and text of the succes modal

* Change Title of account information modal: currency

* Add mobile app hint

* Update Password Modal Text

* Add TODO

Co-authored-by: Yashim Wong <yashim@deriv.com>

* translations: πŸ“š sync translations with crowdin (#6569)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (#6570)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (#6571)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (#6572)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* added tour guide component

* Add padding to the balance of the MT5 acocunt card (#6577)

* translations: πŸ“š sync translations with crowdin (#6581)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* code refactor

* Akmal / Fix styles for cfd financial stp modal (#6432)

* Fix styles for cfd financial stp modal

* fix: πŸ› resolved an error related to pending status

* fix: πŸ› added a check for empty obj leading to props of undefined error

Co-authored-by: Likhith Kolayari <likhith@regentmarkets.com>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* fixed sendbird exception (#6544)

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* Jim/75250/bot skeleton ts config fix (#6363)

* refactor: update bot-skeleton-ts-config

* fix: fix bot-skeleton module not found in bot-web-ui

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* Jim/74989/card component ts migration (#6455)

* refactor: migrate card component to ts

* chore: add new line between type declarations

* chore: render only if truthy

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* Removed banner Fixed rates are enabled for {{local_currency}}. Ads with floating rates will be deactivated. Switch to fixed rates by {{end_date}} (#6300)

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* fix: display the status for manual upload (#6093)

* fix: display the status for manual upload

* ref: reverted changes

* fix: incorporated POI status change for manual update

* fix: added null check

* fix: after onfido submission fails multiple times, user must be sent to manual upload

* trigger build

* fix: incorporated review comment

* fix: incorporated review comments

* fix: incorporated review comments

* fix: included a check regd resubmission for Manual upload

* fix: added verified and expired status

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* code cleanup and css changes

* Revert "fix: display the status for manual upload (#6093)" (#6590)

This reverts commit 1f5392f.

* yauheni/76174/ total assets not reflected at account switcher when client have crypto account (#6474)

* yauheni/67283/ displaying accumulated number without exchange

* dxtrade_demo field name fix

* yauheni/76174/ total assets not reflected at account switcher when client have crypto account

* exchange_rate requests, total balance refactor

Co-authored-by: β€œyauheni-kryzhyk-deriv” <β€œyauheni@deriv.me”>
Co-authored-by: Matin shafiei <matin@deriv.com>
Co-authored-by: Yashim Wong <yashim@deriv.com>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* code cleanup and css changes

* sandeep/65842/unifiy-websocket -- using the same websocket instance from the core … (#6555)

* unified websocket -- using the same websocket instance from the core packages

* added reset transaction_subscription_id on close of instance

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* george / rm72476 / account switching issue when using p2p/cash-deposit with crypto account (#6247)

* fix(cashier onboarding): fix switching from crypto to fiat accounts using p2p or cash deposit

* test(cashier onboarding): fix tests

* refactor(cashier onboarding): refactor code (apply memorization)

* fix(account propmt dialog): fix dispaly proper currency in switch account modal window

* test(account propmt dialog): fix failed test

* perf(account propmt dialog): add check for non_crypto_currency variable

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* Update Text Translation by removing brandName (#6582)

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* Mahdiyeh/ logout client when enable or disable 2FA in different windows (#6062)

* logout client when enable or disable 2FA in different windows

* use json.parse to check the loginid

* remove Uncaught SyntaxError in Json.parse

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* yauheni / 70832 trackJS error: InternalServerError (#6237)

Co-authored-by: β€œyauheni-kryzhyk-deriv” <β€œyauheni@deriv.me”>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* feat: refactored import of assets in account package (#6253)

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* code refactor

* Adrienne / Changed border bottom color for order details page in responsive for dark mode (#6221)

* changed border bottom color for order details

* Changed border bottom color for buy-sell modal

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* code refactor

* hamid/65032/migrate-deposit-to-ts (#6307)

* Migrate Deposit to TS

* Remove package-lock.json

* Fix test errors

* Change data-testid name

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* hamid/74066/migrate-shared-components-to-ts (#6342)

* Migrate Error to TS

* Migrate ResendEmailButtonWrapper to TS

* Migrate SideNote to TS

* Migrate USDTSideNote to TS

* Fix typo

* Rename RootStore to TRootStore

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* Farzin/73307/TS migration of deposit related stores (#6262)

* update MobX libraries

* bot migration

* trader migration

* core migration

* cfd migration

* p2p migration

* cashier migration

* regenerate package-lock.json

* fix verification store issue on cashier

* temperately commented failed tests to find a solution

* fix console errors related to mobx

* regenerate package-lock.json

* fix general store issue on p2p

* bug: fix p2p stores bugs

* fix console errors

* fix: Open position blinking while there is active contract going on

* perf(cashier): add types for client, common, ui stores; refactor Types folder structure

* perf(cashier): add types in client, ui stores

* refactor(cashier): refactor root-store declaration into type

* refactor(cashier): refactor naming

* fix: blinking issue

* fix: nitpik

* feat(cashier): 🚧 migrate `ErrorStore` to TypeScript

* fix bot issue

* feat(cashier): 🚧 migrate `IframeStore` to TypeScript

* feat(cashier): 🚧 migrate `DepositStore` to TypeScript

* chores: change @deriv/deriv-charts versions

* fix(cashier): πŸ› fix `tsconfig`

* fix(cashier): πŸ“ resolve PR comments

* fix(cashier): πŸ“ resolve PR comments

* fix(cashier): πŸ“ resolve PR comments

* fix(cashier): πŸ“ resolve PR comments

* refactor(cashier): ⚰️ remove `container` as a prop in `setIframeUrl` method

* fix(cashier): πŸ“ resolve merge conflicts

* fix(cashier): πŸ“ resolve merge conflicts

Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech>
Co-authored-by: george-usynin-binary <heorhi@binary.com>
Co-authored-by: George Usynin <103181646+george-usynin-binary@users.noreply.github.com>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* Farzin/73507/Duplicate ads shown on "My ad" page in DP2P,  after you edit and close the sell ad. (#6222)

* fix(dp2p): πŸ› fix duplicated adverts issue in my ads tab

* Trigger Build

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* likhith/fixed rerouting to p2p from cashier dashboard (#6244)

* fix: refactored condition that resets the route

* fix: failing test cases

* merged master

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* yauheni/74104/ts migration for account DemoMessage component (#6346)

Co-authored-by: β€œyauheni-kryzhyk-deriv” <β€œyauheni@deriv.me”>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* yauheni/74383/ converting app.jsx in account to functional component (#6282)

* yauheni/74383/ converting app in account to functional component

* converted to tsx with rootstore

* added todo for future types implementation

Co-authored-by: β€œyauheni-kryzhyk-deriv” <β€œyauheni@deriv.me”>
Co-authored-by: Matin shafiei <matin@deriv.com>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* yauheni/74189/ts_migration_text_container-deleted_being_unused (#6378)

Co-authored-by: β€œyauheni-kryzhyk-deriv” <β€œyauheni@deriv.me”>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* feat: added configuration for account package migration (#6419)

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* Revert "yauheni/74383/ converting app.jsx in account to functional component (#6282)" (#6612)

This reverts commit e1fc3e8.

* Revert "feat: added configuration for account package migration (#6419)" (#6613)

This reverts commit d9974cb.

* translations: πŸ“š sync translations with crowdin (#6614)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* Update to single quote (#6618)

* translations: πŸ“š sync translations with crowdin (#6619)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* code refactor and dark theme

* Revert "sandeep/65842/unifiy-websocket -- using the same websocket instance from the core … (#6555)" (#6623)

This reverts commit e2b3d2e.

* translations: πŸ“š sync translations with crowdin (#6624)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* P2P / Feature - Blocked advertiser (#6006)

* create feature branch

* Ameerul /Task 65488 Reusable modal to block advertiser (#5589)

* changed the margin-top for mobile view for buy-sell

* merging upstream master

* merge with local

* added new component (modal) for blocking/unblocking users and added a new observable in advertiser-page-store to view modal

* ammended observable bool value to false and made props required for the modal

* changed the ternary for each localized text to accomadate translations

* added minor changes

* changed the localize tags in button

* fixed isRequired

* removed observable is_block_user_modal_open, pass as prop to BlockUserModal instead

* Update branch (#5680)

* fixed translation for amount field in account transfer form cashier (#5605)

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* farrah/updated deposit store test coverage (#5430)

* updated deposit store test coverage

* added a check for updateAccountStatus

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* likhith/Fix validation message for payment methods (#5187)

* Added appropriate error message

* Fixed error messages in Edit form

* Added validation for SWIFT

* Added a hook to validate methods

* Removed commented code

* Refactored the code by moving the custom hook to hooks folder

* Minor bug fixes

* refactor: Renamed a variable

* fix: added regex to allow more characters as valid

* fix: implemented button disabled

* fix: changed the edit payment method

* fix: added payment error message overlapping issue

Co-authored-by: Likhith Kolayari <likhith@deriv.com>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* Amina/poi_limited_test_case (#5642)

* poi_limited_test_case

* poi_limited_test_case

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* yauheni / IdvRejected test coverage (#5637)

Co-authored-by: β€œyauheni-kryzhyk-deriv” <β€œyauheni@deriv.me”>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* yauheni / IdvNoSubmisssions test coverage (#5636)

* yauheni / IdvNoSubmisssions test coverage

* imports fix

* naming typo fix

* Delete poi-idv-rejected.spec.js

Co-authored-by: β€œyauheni-kryzhyk-deriv” <β€œyauheni@deriv.me”>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* feat: add check if has restricted parent (#5635)

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* Adrienne / P2P responsive add PM full screen modal button footers are now fixed by design (#5561)

* Mobile add PM full screen modal button footers are now fixed by design specs

* Incorporated code review changes

Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* Bala/Add bootstrap dev script (#5659)

* chore: add bootstrap dev script

* Update package.json

Co-authored-by: Yashim Wong <75345074+yashim-deriv@users.noreply.github.com>

* chore: remove build from bootstrap

Co-authored-by: Yashim Wong <75345074+yashim-deriv@users.noreply.github.com>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (#5679)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* update branch

Co-authored-by: vinu-deriv <100689171+vinu-deriv@users.noreply.github.com>
Co-authored-by: Farrah Mae Ochoa <82315152+farrah-deriv@users.noreply.github.com>
Co-authored-by: Likhith Kolayari <98398322+likhith-deriv@users.noreply.github.com>
Co-authored-by: Likhith Kolayari <likhith@deriv.com>
Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com>
Co-authored-by: yauheni-kryzhyk-deriv <103182683+yauheni-kryzhyk-deriv@users.noreply.github.com>
Co-authored-by: β€œyauheni-kryzhyk-deriv” <β€œyauheni@deriv.me”>
Co-authored-by: maryiafrantsava-binary <103181650+maryiafrantsava-binary@users.noreply.github.com>
Co-authored-by: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com>
Co-authored-by: balakrishna-binary <56330681+balakrishna-binary@users.noreply.github.com>
Co-authored-by: Yashim Wong <75345074+yashim-deriv@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* Adrienne / Create blocked advertisers tab (#5590)

* Added new blocked advertisers tab for desktop and mobile

* Refactored code

* Added blocked advertisers svg icon

* Resolved failed build, added blocked-advertisers.svg icon

* Incorporated code review suggestions

* Incorporated code review suggestions

* Show loading screen when icon is still loading

* Removed loading

* Removed manual font size

* fix: block user folder and stuff (#5848)

* Block unblock function draft (#5857)

* Added block/unblock function to general-store

* Added new observable

* Refactored

* Adrienne / Blocked user count icon with tooltip (#5684)

* Created component for blocked user count

* Added blocked user count component

* Added blocked user icon

* Linked blocked_by_count returned by BE

* Incorporated code reviews

* Added block user count modal for mobile when user taps on the block user count

* Ensure blocked user icon count has correct fill in dark mode

* Adrienne / Blocked advertiser overlay (#5859)

* Added block user overlay component for desktop/responsive

* Refacted sass file to use BEM convention and removed default

* Refactored code review changes

* Refactored code review changes

* Refactored overlay component as a wrapper

* Show unblock user modal and added unblock user action

* changed icon name

* Added checks for response

* Incorporated code review changes

* Fixed typo

* Change overlay height for mobile to ensure it fills remaining space

* Removed tabs in advertiser's page as per design

* Fixed test issues

* Made advertiser page non-scrollable when overlay is shown

* Removed close icon from block user modal as discussed

* Removed block me button

* Removed setIsBlockedUserModalOpen from advertiser page store

* Renamed props in block user overlay to onClickUnblock

* Renamed overlay props

* Added TODO regarding design changes on tabs in advertiser page

* updated observables

* added boolean checks

* Ameerul /Task 65494 list of blocked users feature (#5858)

* added 2 new components for row and table, added new scss file, added new functions and observables in my_profile and advertiser-page store

* fixed loading issue, mobile full page modal view and the css issue for viewing the table

* refactored code in advertiser store and block user modal

* removed promise for getBlockedAdvertisersList function

* merged blocked advertiser tab with list of users

* added removed code

* empty commit

* refactored code

* refactored blockUnblockUser function

* separated the block user table to my-profile and refactored code

* added blockUnblockUser function to general store

* added new functions to general store

* merged with master, added new functions in general store to block user table and to my profile store

* changed page header for blocked advertisers list

* Adrienne / Added search functionality for list of blocked advertisers (#6005)

* Added search functionality

* Refactored code changes

* Refactored code changes

* Renamed BlockedAdvertisersList to BlockUserList

* Fixed issues with block advertiser list table height

* Fixed issue with search box not loading

* Fixed an issue where the profile header is not fully width

* Reduced margin bottom height for tabs and stats height due to flex

* Ameerul /Task #65487 Dropdown Block User Feature (#5682)

* added dropdown, menu dots icon, added function for users to block advertisers with block user modal

* refactored code, and renamed dropdown component to advertiser-page-dropdown-menu

* renamed variables and functions according to comments

* refactored block user function in advertiser-page-store and block-user-modal

* minor changes to the imports

* merged with master and added changes

* removed old blockUser and showModal functions from advertiser store

* removed is_blocked from dropdown

* refactored code with comments

* moved showBlockUserModal function to the store

* removed curly brackets in name

* fixed gap in modal

* fixed tooltip message and user cannot block themselves

* fixed dropdown darkmode design and hid menu dots icon when user is blocked

* changed dropdown hover colour

* added useOnClickOutisde Hook to hide dropdown when clicked outside

* Refactored blocked user overlay css and advertiser page css (#6097)

* Blocked user feature sanity check (#6434)

* added dropdown, menu dots icon, added function for users to block advertisers with block user modal

* refactored code, and renamed dropdown component to advertiser-page-dropdown-menu

* renamed variables and functions according to comments

* refactored block user function in advertiser-page-store and block-user-modal

* minor changes to the imports

* merged with master and added changes

* removed old blockUser and showModal functions from advertiser store

* removed is_blocked from dropdown

* refactored code with comments

* moved showBlockUserModal function to the store

* removed curly brackets in name

* fixed gap in modal

* fixed tooltip message and user cannot block themselves

* fixed dropdown darkmode design and hid menu dots icon when user is blocked

* changed dropdown hover colour

* added useOnClickOutisde Hook to hide dropdown when clicked outside

* fixed bug fixes for advertiser page and my profile name

* Adrienne / Blocked user feature search box bug (Merge after sanity check PR is merged!) (#6436)

* added dropdown, menu dots icon, added function for users to block advertisers with block user modal

* refactored code, and renamed dropdown component to advertiser-page-dropdown-menu

* renamed variables and functions according to comments

* refactored block user function in advertiser-page-store and block-user-modal

* minor changes to the imports

* merged with master and added changes

* removed old blockUser and showModal functions from advertiser store

* removed is_blocked from dropdown

* refactored code with comments

* moved showBlockUserModal function to the store

* removed curly brackets in name

* fixed gap in modal

* fixed tooltip message and user cannot block themselves

* fixed dropdown darkmode design and hid menu dots icon when user is blocked

* changed dropdown hover colour

* added useOnClickOutisde Hook to hide dropdown when clicked outside

* fixed bug fixes for advertiser page and my profile name

* Fixed an issue where the block user table does not display No blocked advertisers after unblocking the last user during search

Co-authored-by: ameerul <ameerul@deriv.com>

* Blocked user count not appearing in my profile (#6446)

* fixed bugs for blocked user count in my profile

* reverted changes from my profile and change my profile name

* Aligned avatar to flex start in advertiser page as per design requirements (#6553)

* Adrienne / Hide block user dropdown when user views their own advertiser page (#6529)

* Hide block user dropdown when user views their own advertiser page

* Removed dropdown when user views their own ad and also removes disabled dropdown prop functionality

* Adrienne / Fixed alignment issues with block user count in responsive and bug where Blocked Advertisers responsive tab is not fully visible (#6527)

* Fixed alignment issues with block user count in responsive and bug where Blocked Advertisers responsive tab is not fully visible

* Integrated code review

* Adrienne / Made block user count to be subscribed to updates (#6561)

* Moved blocked user count observable to general store's subscription to subscribe to block user count updates

* Destructure response

* Refactored code

* Ameerul /Bug 76978 Blocked advertiser list is not loading after barred one user and showing console error (#6565)

* added error handling if user is barred and wants to get blocked advertisers list

* updated ui for error message and added new component to handle errors in table

* changed mobile margin for error message

* added new icon for blocked advertisers barred

* removed commented code

* Adrienne / Removed hover styling for responsive in blocked advertisers list (#6567)

* test

* test

* test agane

* Added styling for unfocusing

* Added styling for unfocusing

* Removed hover styling for responsive

* Ameerul /Bug 77176 The Block modal keep on looping for Disable P2P user  (#6580)

* added error-modal in advertiser page to handle if advertiser is banned and user wants to block

* updated error modal has_close_icon and implemented comments

* added has_close_icon in props

* Ameerul /Bug 77339 When userA trying to block an advertiser is barred, once userA is unbarred on trying to block advertiser temporary barred error model is displayed (#6591)

* fixed issue when user is banneed and tries to block advertiser, and changed width for error modal

* fixed checking if user is barred and changed error modal styling

* Adrienne / Scrollable advertiser page when no ads in responsive (#6622)

* draft pr

* removed top margin in advertiser page ads table

Co-authored-by: Carol Sachdeva <carol@binary.com>
Co-authored-by: ameerul-deriv <103412909+ameerul-deriv@users.noreply.github.com>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
Co-authored-by: vinu-deriv <100689171+vinu-deriv@users.noreply.github.com>
Co-authored-by: Farrah Mae Ochoa <82315152+farrah-deriv@users.noreply.github.com>
Co-authored-by: Likhith Kolayari <98398322+likhith-deriv@users.noreply.github.com>
Co-authored-by: Likhith Kolayari <likhith@deriv.com>
Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com>
Co-authored-by: yauheni-kryzhyk-deriv <103182683+yauheni-kryzhyk-deriv@users.noreply.github.com>
Co-authored-by: β€œyauheni-kryzhyk-deriv” <β€œyauheni@deriv.me”>
Co-authored-by: maryiafrantsava-binary <103181650+maryiafrantsava-binary@users.noreply.github.com>
Co-authored-by: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com>
Co-authored-by: balakrishna-binary <56330681+balakrishna-binary@users.noreply.github.com>
Co-authored-by: Yashim Wong <75345074+yashim-deriv@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: Adrienne Rio <adrienne@deriv.com>
Co-authored-by: Ameerul Hady <ameerul@deriv.com>

* thisyahlen/fix for reset balance (#6630)

* fix for reset balance

* code refactor

* code refactor

* console rates fix

* change color format and added popover for footer theme

* disable animation

* Blocked advertiser hotfix (#6635)

* add: delay

* reduce delay

* set active tab to my stats on unmount in my profile

Co-authored-by: ameerul hady <ameerul@deriv.com>

* translations: πŸ“š sync translations with crowdin (#6637)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* empty commit

* Akmal / Rename Synthetic accounts into Derived (#6568)

* Rename Synthetic accounts into Derived

* Update test cases

* Fix failed test cases

* Fix: icons naming

* Fix: remove unused function

* Fix: icons.js

* Rename latest strings

* Content and style changes for derived accounts

* Content changes for MT5 dashboard

* Rename DMT5 to Deriv Mt5

* Fix test cases

* Revert "Fix test cases"

This reverts commit 74dd2fb.

* Revert "Rename DMT5 to Deriv Mt5"

This reverts commit f0b74d7.

* Revert "Content changes for MT5 dashboard"

This reverts commit 32e03e6.

* Redo content changes

* Revert the fix

* Rename derived label to derived svg

* Change label for real account

* Revert revert 'Rename DMT5 password to Deriv MT5 password'

* Fix test cases

* Fix test case

* Change password modal title

* Fix test case

* Revert Derived SVG change

* Change DMT5 to Deriv MT5 in jurisdiction

* Add condition

* removed Dmt5 from the transfer dropdown in cashier

* fixed cashier related test cases

* Update jurisdiction modal

* Fix the whatever

* Temporarily remove test case until Deriv X part is done

* Add jurisdiction to success modal

* Fix getFormattedJurisdictionCode

* Add enter password label with jurisdiction

* Remove old test case, the value is set dynamically

* Temp fix: change derived label to synthetic for deriv x only

* Revert "Vinu/removed Dmt5 for synthetic account from the transfer dropdown in cashier"

* Fix: dxtrade label temp fix

* Fix: remp fix for dxtrade label in success modal

* Revert label for deriv x

Co-authored-by: Yashim Wong <yashim@deriv.com>
Co-authored-by: vinu-deriv <vinu@deriv.com>

* translations: πŸ“š sync translations with crowdin (#6651)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* carol/ React simple star rating dependency (#6652)

* fix: dependency

* fix: dependency please

* conflict fix

* constants fix

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: Eduard Hrachou <107860964+eduard-deriv@users.noreply.github.com>
Co-authored-by: yauheni-kryzhyk-deriv <103182683+yauheni-kryzhyk-deriv@users.noreply.github.com>
Co-authored-by: β€œyauheni-kryzhyk-deriv” <β€œyauheni@deriv.me”>
Co-authored-by: Akmal Djumakhodjaev <akmal@binary.com>
Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com>
Co-authored-by: George Usynin <103181646+george-usynin-binary@users.noreply.github.com>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
Co-authored-by: Farzin Mirzaie <72082844+farzin-fs@users.noreply.github.com>
Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>
Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com>
Co-authored-by: vinu-deriv <100689171+vinu-deriv@users.noreply.github.com>
Co-authored-by: Nijil Nirmal <nijil@deriv.com>
Co-authored-by: Bahar <bahar@firstsource.tech>
Co-authored-by: Hamid <hamid@re-work.dev>
Co-authored-by: Shayan Khaleghparast <100833613+iman-fs@users.noreply.github.com>
Co-authored-by: Farrah Mae Ochoa <farrah@deriv.com>
Co-authored-by: hirad-rewok <91878582+hirad-rewok@users.noreply.github.com>
Co-authored-by: Farabi <102643568+farabi-deriv@users.noreply.github.com>
Co-authored-by: Farabi <farabi@Farabi-Chowdhurys-MacBook-Pro-C02X37B9JG5H-Standard.local>
Co-authored-by: Farabi <farabi@Farabis-MacBook-Pro.local>
Co-authored-by: Likhith Kolayari <98398322+likhith-deriv@users.noreply.github.com>
Co-authored-by: balakrishna-binary <56330681+balakrishna-binary@users.noreply.github.com>
Co-authored-by: Thisyahlen <thisyahlen@Thisyahlens-MacBook-Pro.local>
Co-authored-by: Maryia <103177211+maryia-binary@users.noreply.github.com>
Co-authored-by: Sui Sin <103026762+suisin-deriv@users.noreply.github.com>
Co-authored-by: Yashim Wong <yashim@deriv.com>
Co-authored-by: Likhith Kolayari <likhith@regentmarkets.com>
Co-authored-by: Farrah Mae Ochoa <82315152+farrah-deriv@users.noreply.github.com>
Co-authored-by: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com>
Co-authored-by: Matin shafiei <matin@deriv.com>
Co-authored-by: Sandeep Rajput <90243468+sandeep-deriv@users.noreply.github.com>
Co-authored-by: mahdiyeh-fs <82078941+mahdiyeh-fs@users.noreply.github.com>
Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech>
Co-authored-by: george-usynin-binary <heorhi@binary.com>
Co-authored-by: Nijil Nirmal <62882794+nijil-binary@users.noreply.github.com>
Co-authored-by: Carol Sachdeva <carol@binary.com>
Co-authored-by: ameerul-deriv <103412909+ameerul-deriv@users.noreply.github.com>
Co-authored-by: Likhith Kolayari <likhith@deriv.com>
Co-authored-by: maryiafrantsava-binary <103181650+maryiafrantsava-binary@users.noreply.github.com>
Co-authored-by: Yashim Wong <75345074+yashim-deriv@users.noreply.github.com>
Co-authored-by: Adrienne Rio <adrienne@deriv.com>
Co-authored-by: Ameerul Hady <ameerul@deriv.com>
Co-authored-by: vinu-deriv <vinu@deriv.com>
  • Loading branch information
1 parent a1bb80e commit e731d8b
Show file tree
Hide file tree
Showing 13 changed files with 2,628 additions and 2,205 deletions.
4,607 changes: 2,442 additions & 2,165 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/appstore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"object.fromentries": "^2.0.0",
"prop-types": "^15.7.2",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-router": "^5.2.0",
"react-joyride": "^2.5.3",
"react-router-dom": "^5.2.0"
},
"devDependencies": {
Expand Down
6 changes: 5 additions & 1 deletion packages/appstore/src/components/onboarding/onboarding.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ type TOnboardingProps = {
has_next_content: boolean;
}
>;
setIsTourOpen: (is_tour_open: boolean) => void;
};

const Onboarding = ({ contents }: TOnboardingProps) => {
const Onboarding = ({ contents, setIsTourOpen }: TOnboardingProps) => {
const number_of_steps = Object.keys(contents);

const [step, setStep] = React.useState<number>(1);
Expand All @@ -26,6 +27,9 @@ const Onboarding = ({ contents }: TOnboardingProps) => {

const nextStep = () => {
if (step < number_of_steps.length) setStep(step + 1);
if (step === number_of_steps.length) {
setIsTourOpen(true);
}
};

const onboarding_step = number_of_steps[step - 1];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
.toggle-account-type {
background-color: var(--general-section-1);
padding: 0.4rem;
width: fit-content;
border-radius: $BORDER_RADIUS;
&--parent {
padding: 3rem 5rem;
display: flex;
align-items: flex-end;
justify-content: flex-end;
}

&--button {
background-color: var(--general-section-1);
padding: 0.4rem;
border-radius: $BORDER_RADIUS;
width: fit-content;
}

@include mobile {
align-self: center;
Expand All @@ -12,6 +21,13 @@

&__button {
height: 3.2rem;
width: 20rem;
width: 28rem;
}

&__divider {
border-bottom: 1px solid var(--general-section-1);
padding: 0.6rem;
width: 108%;
margin-left: -1.2rem;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,23 @@ type TAccountTypeProps = {

const ToggleAccountType = ({ accountTypeChange, value }: TAccountTypeProps) => {
const toggle_options = [
{ text: 'Real', value: 'Real' },
{ text: 'Demo', value: 'Demo' },
{ text: 'Real Account', value: 'Real' },
{ text: 'Demo Account', value: 'Demo' },
];

return (
<div className='toggle-account-type'>
<ButtonToggle
buttons_arr={toggle_options}
className='toggle-account-type__button'
has_rounded_button
is_animated
name='account_type'
onChange={accountTypeChange}
value={value}
/>
<div className='toggle-account-type--parent'>
<div className='toggle-account-type--button'>
<ButtonToggle
buttons_arr={toggle_options}
className='toggle-account-type__button'
has_rounded_button
is_animated
name='account_type'
onChange={accountTypeChange}
value={value}
/>
</div>
</div>
);
};
Expand Down
92 changes: 92 additions & 0 deletions packages/appstore/src/constants/tour-steps-config.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
import { Step, Styles, Locale } from 'react-joyride';
import React from 'react';
import { Text, Button } from '@deriv/components';
import { localize } from '@deriv/translations';
import '../components/toggle-account-type/toggle-account-type.scss';

export const tour_step_config: Step[] = [
{
title: (
<Text as='p' weight='bold' color='brand-red-coral'>
{localize('Switch accounts')}
<div className='toggle-account-type__divider' />
</Text>
),
content: <Text as='p'>{localize('Switch between your demo and real accounts.')}</Text>,
target: '.toggle-account-type__button',
disableBeacon: true,
placement: 'bottom-end',
},
{
title: (
<Text as='p' weight='bold' color='brand-red-coral'>
{localize('Trading hub tour')}
<div className='toggle-account-type__divider' />
</Text>
),
content: (
<Text as='p'>
{localize(
`Need help moving around?\n\nWe have a short turorial that might help. Hit Repeat tour to begin.`
)}
</Text>
),

target: '.trading-hub-header__tradinghub--onboarding--logo',
disableBeacon: true,
},
];

export const tour_styles: Styles = {
options: {
width: 350,
},
tooltipTitle: {
color: 'var(--brand-red-coral)',
textAlign: 'left',
},
tooltipContent: {
textAlign: 'left',
fontSize: '1.6rem',
padding: '3rem 0 1.6rem 0',
wordBreak: 'break-word',
whiteSpace: 'pre-wrap',
},
buttonNext: {
padding: '0.9rem',
fontSize: '1.5rem',
fontWeight: 'bold',
},
};

export const tour_styles_dark_mode: Styles = {
options: {
width: 350,
backgroundColor: 'var(--brand-dark-grey)',
arrowColor: 'var(--brand-dark-grey)',
},
tooltipTitle: {
color: 'var(--brand-red-coral)',
textAlign: 'left',
},
tooltipContent: {
textAlign: 'left',
fontSize: '1.6rem',
padding: '3rem 0 1.6rem 0',
wordBreak: 'break-word',
whiteSpace: 'pre-wrap',
},
buttonNext: {
padding: '0.9rem',
fontSize: '1.5rem',
fontWeight: 'bold',
},
};

export const tour_step_locale: Locale = {
back: <Button has_effect text={localize('Repeat tour')} secondary medium />,
close: localize('Close'),
last: localize('OK'),
next: localize('Next'),
skip: localize('Skip'),
};
41 changes: 35 additions & 6 deletions packages/appstore/src/modules/trading-hub/index.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,42 @@
import * as React from 'react';
import Onboarding from 'Components/onboarding';
import { trading_hub_contents } from 'Constants/trading-hub-content';
import Joyride from 'react-joyride';
import ToggleAccountType from 'Components/toggle-account-type';
import { tour_step_config, tour_styles, tour_step_locale, tour_styles_dark_mode } from 'Constants/tour-steps-config';
import { observer } from 'mobx-react-lite';
import { useStores } from 'Stores';
import CFDAccounts from 'Components/CFDs';

const TradingHub = () => {
const TradingHub: React.FC = () => {
const { ui } = useStores();
const { is_dark_mode_on } = ui;
/*TODO: We need to show this component whenever user click on tour guide button*/
const [is_tour_open, setIsTourOpen] = React.useState(false);

return (
<div className='trading-hub'>
Trading Hub
<CFDAccounts account_type='real' />
</div>
<React.Fragment>
<div className='trading-hub'>
Trading Hub
<CFDAccounts account_type='real' />
</div>
<ToggleAccountType accountTypeChange value={''} />
<Joyride
run={is_tour_open}
continuous
disableScrolling
hideCloseButton
disableCloseOnEsc
steps={tour_step_config}
styles={is_dark_mode_on ? tour_styles_dark_mode : tour_styles}
locale={tour_step_locale}
floaterProps={{
disableAnimation: true,
}}
/>
<Onboarding contents={trading_hub_contents} setIsTourOpen={setIsTourOpen} />
</React.Fragment>
);
};

export default TradingHub;
export default observer(TradingHub);
2 changes: 1 addition & 1 deletion packages/appstore/src/types/params.types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export type TRoute = {
component?: () => React.ReactNode;
component?: React.ComponentType;
default?: boolean;
exact?: boolean;
getTitle?: () => string;
Expand Down
4 changes: 2 additions & 2 deletions packages/appstore/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"experimentalDecorators": true,
"outDir": "./dist",
"baseUrl": "./",
"paths": {
Expand All @@ -14,8 +15,7 @@
"Types": ["src/types"],
"Utils": ["src/utils"],
"@deriv/*": ["../*/src"]
},
"experimentalDecorators": true
}
},
"include": ["src"]
}
1 change: 0 additions & 1 deletion packages/components/src/components/icon/icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ import './common/ic-bank.svg';
import './common/ic-bell.svg';
import './common/ic-black-warning.svg';
import './common/ic-block.svg';
import './common/ic-blocked-advertisers-barred.svg';
import './common/ic-box.svg';
import './common/ic-button-back.svg';
import './common/ic-calendar-datefrom.svg';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,12 @@ const RedirectToOldInterface = () => {
const TradingHubOnboarding = ({ is_dark_mode }) => {
return (
<div className='trading-hub-header__tradinghub--onboarding'>
{is_dark_mode ? (
<Icon icon='IcAppstoreTradingHubOnboardingDark' size={20} />
) : (
<Icon icon='IcAppstoreTradingHubOnboarding' size={20} />
)}
<div className='trading-hub-header__tradinghub--onboarding--logo'>
<Icon
icon={is_dark_mode ? 'IcAppstoreTradingHubOnboardingDark' : 'IcAppstoreTradingHubOnboarding'}
size={20}
/>
</div>
</div>
);
};
Expand Down
13 changes: 8 additions & 5 deletions packages/core/src/App/Containers/Layout/trading-hub-footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import ServerTime from '../server-time.jsx';
import { isBot, routes } from '@deriv/shared';
import DarkModeToggleIcon from 'Assets/SvgComponents/footer/ic-footer-light-theme.svg';
import LightModeToggleIcon from 'Assets/SvgComponents/footer/ic-footer-dark-theme.svg';
import { Popover } from '@deriv/components';

const FooterIconSeparator = () => <div className='footer-icon-separator' />;

Expand Down Expand Up @@ -88,11 +89,13 @@ const TradingHubFooter = ({
<RegulatoryInformation landing_company={landing_company_shortcode} is_eu={is_eu} />
)}
<div className='footer__links--dark-mode'>
{is_dark_mode ? (
<LightModeToggleIcon onClick={changeTheme} />
) : (
<DarkModeToggleIcon onClick={changeTheme} />
)}
<Popover alignment='top' message='Change theme'>
{is_dark_mode ? (
<LightModeToggleIcon onClick={changeTheme} />
) : (
<DarkModeToggleIcon onClick={changeTheme} />
)}
</Popover>
</div>
<FooterIconSeparator />
<HelpCentre />
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/styles/constants.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $color-red-3: #a32430;
$color-red-4: #d33636;
$color-red-5: #eb3e48;
$color-red-6: #ec3f3f29;
$color-red-6: #ffe1e3;
$color-red-7: #ffe1e3;
$color-grey: #c2c2c2;
$color-grey-1: #999999;
$color-grey-2: #f2f3f4;
Expand Down

0 comments on commit e731d8b

Please sign in to comment.