Farzin/85855/Refactor ToggleMenuDrawer component to use useStore hook
#7365
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* refactor: react version is upgraded to version 17 * fix: fixed typo * fix: changed declaration file location * fix: temporarily commented our two test cases that are failing * fix: fixed react-content-loader props * fix: fixed some bugs * fix: fixed z-index issue for popover in DBot page * fix: fixed popover position issue in DBot page * chore: an small change on how to turn string to array * fix: merge upstream develop into my branch and resolved conflicts * fix: resolved pr comments * fix: removed rc-drawer and refactored mobile drawer * fix: fixed test cases * fix: resolved pr comments * fix: resolved pr comment * fix: fixed typo * fix: resolved pr comments * fix: fixed slide-in component bug * fix: resolved pr comments * fix: resolved pr comments * fix: removed unnecessary lines * fix: resolved pr comments * Update packages/account/src/Components/personal-details/__tests__/personal-details.spec.js Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * Update packages/account/src/Components/personal-details/__tests__/personal-details.spec.js Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * Update packages/account/src/Components/personal-details/personal-details.jsx Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * fix: fixed mt5 modal not appear on screen when clicking on trade button * fix: fixed Bug #84787 Co-authored-by: Shayan Khaleghparast <100833613+iman-fs@users.noreply.github.com> Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com>
…iv-com#7364) This reverts commit b6f7e4c.
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
|
A production App ID was automatically generated for this PR. (log)
Click here to copy & paste above information. |
Codecov Report
@@ Coverage Diff @@
## develop #7365 +/- ##
==========================================
Coverage ? 20.36%
==========================================
Files ? 1477
Lines ? 34469
Branches ? 6296
==========================================
Hits ? 7019
Misses ? 26905
Partials ? 545 Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
added 2 commits
January 16, 2023 11:29
…t `onunmount` (deriv-com#7331) * fix(cashier): 🐛 call `resetWithrawForm` on `CryptoWithdrawForm` component `onunmount` * test(cashier): ✅ fix failing test Co-authored-by: Farzin Mirzaie <farzin@deriv.com>
…deriv-com#7325) * refactor: language tests * fix: typo Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech>
Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech>
…eriv-com#7324) * refactor: errors validator tests * fix: typo Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech>
…file (deriv-com#7288) * refactor: binary-link tests * refactor: improve testids namings Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech>
Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech>
Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech>
…pec.tsx file (deriv-com#7330) * refactor: toggle-button-group tests * fix: test issue Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech>
…c.tsx file (deriv-com#7355) * refactor: remove extra files from reports * refactor: marker-spot-label tests
…file (deriv-com#7286) * refactor: binary-link tests * test: added more tests Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech>
…spec.tsx file (deriv-com#7285) * refactor: contract-type-dialog tests * test: added more tests * fix: circle/ci issue Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech>
…c.tsx file (deriv-com#7282) * refactor: platform-dropdown tests * refactor: improve testids namings Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech>
…mponent_to_use_useStore
vinu-deriv
requested review from
yashim-deriv and
carolsachdeva
as code owners
…mponent_to_use_useStore
added 3 commits
January 19, 2023 14:36
|
🚨 Lighthouse report for the changes in this PR:
Lighthouse ran with https://deriv-app-git-fork-farzin-deriv-farzin-85855refactortogg-945525.binary.sx/ |
heorhi-deriv
approved these changes
Jan 20, 2023
…mponent_to_use_useStore
|
Kudos, SonarCloud Quality Gate passed!
|
|
⏳ Generating Lighthouse report... |
farzin-deriv
deleted the
farzin/85855/refactor_toggle_MenuDrawerComponent_to_use_useStore
branch
sandeep-deriv
added a commit
that referenced
this pull request
Feb 1, 2023
* Shayan/52349/react17 migration (#6908) * refactor: react version is upgraded to version 17 * fix: fixed typo * fix: changed declaration file location * fix: temporarily commented our two test cases that are failing * fix: fixed react-content-loader props * fix: fixed some bugs * fix: fixed z-index issue for popover in DBot page * fix: fixed popover position issue in DBot page * chore: an small change on how to turn string to array * fix: merge upstream develop into my branch and resolved conflicts * fix: resolved pr comments * fix: removed rc-drawer and refactored mobile drawer * fix: fixed test cases * fix: resolved pr comments * fix: resolved pr comment * fix: fixed typo * fix: resolved pr comments * fix: fixed slide-in component bug * fix: resolved pr comments * fix: resolved pr comments * fix: removed unnecessary lines * fix: resolved pr comments * Update packages/account/src/Components/personal-details/__tests__/personal-details.spec.js Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * Update packages/account/src/Components/personal-details/__tests__/personal-details.spec.js Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * Update packages/account/src/Components/personal-details/personal-details.jsx Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * fix: fixed mt5 modal not appear on screen when clicking on trade button * fix: fixed Bug #84787 Co-authored-by: Shayan Khaleghparast <100833613+iman-fs@users.noreply.github.com> Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * fix: add optional chaining in getMinDuration function (#7344) * fix: 🐛 resolved issue with trade. odal (#7291) * Revert "fix: 🐛 resolved issue with trade. odal (#7291)" (#7364) This reverts commit b6f7e4c. * Farzin/85054/Call `resetWithrawForm` on `CryptoWithdrawForm` component `onunmount` (#7331) * fix(cashier): 🐛 call `resetWithrawForm` on `CryptoWithdrawForm` component `onunmount` * test(cashier): ✅ fix failing test Co-authored-by: Farzin Mirzaie <farzin@deriv.com> * Niloofar Sadeghi / Task - Refactor tests in the language.spec.js file (#7325) * refactor: language tests * fix: typo Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * refactor: proposal tests (#7327) Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * Niloofar Sadeghi / Task - Refactor tests in the error.spec.js file (#7324) * refactor: errors validator tests * fix: typo Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * Niloofar Sadeghi / Task - Refactor tests in the binary-link.spec.tsx file (#7288) * refactor: binary-link tests * refactor: improve testids namings Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * refactor: money tests (#7353) * refactor: toggle-positions tests (#7287) Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * refactor: toggle-button tests (#7328) Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * Niloofar Sadeghi / Task - Refactor tests in the toggle-button-group.spec.tsx file (#7330) * refactor: toggle-button-group tests * fix: test issue Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * refactor: open-positions-table tests (#7374) * Niloofar Sadeghi / Task - Refactor tests in the marker-spot-label.spec.tsx file (#7355) * refactor: remove extra files from reports * refactor: marker-spot-label tests * Niloofar Sadeghi / Task - Refactor tests in the binary-link.spec.tsx file (#7286) * refactor: binary-link tests * test: added more tests Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * Niloofar Sadeghi / Task - Refactor tests in the contract-type-dialog.spec.tsx file (#7285) * refactor: contract-type-dialog tests * test: added more tests * fix: circle/ci issue Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * Niloofar Sadeghi / Task - Refactor tests in the platform-dropdown.spec.tsx file (#7282) * refactor: platform-dropdown tests * refactor: improve testids namings Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * Farzin/76563/Replace `DepositStore` with hooks (#7180) * refactor(cashier): 🔥 remove `is_deposit_locked` from `DepositStore` * refactor(cashier): 🔥 remove `submitFundsProtection` from `DepositStore` * fix(cashier): 💚 fix CI build * fix(cashier): 💚 fix CI build * test(hooks): ✅ add more test cases for `useDepositLocked` hook Co-authored-by: Farzin Mirzaie <farzin@deriv.com> * Adrienne / Github actions Lighthouse report workflow (#7317) * chore: added checks to job to run only on pull requests * chore: fixed issues with testing * chore: testing github actions running on local branch * chore: added workflow_dispatch event to test out manually * chore: added workflow_dispatch event to test out manually * chore: added workflow_dispatch event to test out manually * chore: fix typo * chore: fix issue where lighthouse config file is not found * chore: fix issue where lighthouse config file is not found * chore: test with hardcoded url * chore: test with updated permissions * chore: reverted changes due to lack of token permission * chore: reverted changes due to lack of token permission * chore: added progress comment * chore: added progress comment * chore: test * chore: reverted test * chore: reverted test * chore: commented config path for lighthouse assertions * chore: fixed syntax on like 38 where it expects a string instead of mapping * translations: 📚 sync translations with crowdin (#7361) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> Co-authored-by: Jim Daniels Wasswa <104334373+jim-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> * likhith/POI status fix (#6792) * feat: 🐛 POI status fix * fix: ♻️ incorporated review comments Co-authored-by: Matin shafiei <matin@deriv.com> Co-authored-by: vinu-deriv <vinu@deriv.com> * translations: 📚 sync translations with crowdin (#7383) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * Suisin/chore: Notifications for gathering users POI and POA (#7381) * chore: Notifications for gathering users POI and POA * chore: resolve subtasks bugs * chore: remove unused component * chore: remove unused component * chore: add and remove lines * Shayan/86260/fix collapsable panel placeholder alignment (#7389) * checking circle/ci test * removed test changes * fix: fixed react-content-loader in small screen * fix: fixed react-content-loader issue with dark-mode Co-authored-by: Shayan Khaleghparast <100833613+iman-fs@users.noreply.github.com> Co-authored-by: vinu-deriv <100689171+vinu-deriv@users.noreply.github.com> * fix: yml script (#7398) * fix: yml script * fix: added script to lighthouse * sandeep/fix: dbot-slowness issue v2 (#7345) * fix: multiplier is not working fine with the dbot slowness fix * fix: please log in issue caused due to performance optimization * Revert "Revert V20230106_0 (#7334)" This reverts commit 69825d3. * fix: multiplier contract purchase * fix: removed multiplier check and new ws creation * chore: clear timeout resolvers on bot close Co-authored-by: balakrishna-binary <bala.krishna@regentmarkets.com> Co-authored-by: Prince <prince@deriv.com> * Revert "sandeep/fix: dbot-slowness issue v2 (#7345)" (#7407) This reverts commit 0511e7f. * Hamza/85369/clear button for notifications (#7348) * chore: removed the unused variables v1.1 * feat: Mobile view Clear Functionality v1.2 * refactor: removed the commented code and added nit pick * chore: css changes from hex to variables and px to rem * fix: console error check 85369 * chore: textual change 85884 (#7409) * fix: Higher/Lower Trade type contracts Rise/Fall is shown (#7346) * Akmal / fix position drawer background (#7178) * fix: position drawer background * fix: sidebar width for empty list * likhith/fix: 🐛 resolved flickering issue in platform switcher (#7342) * fix: 🐛 resolved f;iclering issue in p[latform switcher * refactor: ♻️ refactored code * feat: reordered code block * carol/P2P: Fix recommendation bug (#6712) * fix recommendation * Shayan/52349/react17 migration (#6908) * refactor: react version is upgraded to version 17 * fix: fixed typo * fix: changed declaration file location * fix: temporarily commented our two test cases that are failing * fix: fixed react-content-loader props * fix: fixed some bugs * fix: fixed z-index issue for popover in DBot page * fix: fixed popover position issue in DBot page * chore: an small change on how to turn string to array * fix: merge upstream develop into my branch and resolved conflicts * fix: resolved pr comments * fix: removed rc-drawer and refactored mobile drawer * fix: fixed test cases * fix: resolved pr comments * fix: resolved pr comment * fix: fixed typo * fix: resolved pr comments * fix: fixed slide-in component bug * fix: resolved pr comments * fix: resolved pr comments * fix: removed unnecessary lines * fix: resolved pr comments * Update packages/account/src/Components/personal-details/__tests__/personal-details.spec.js Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * Update packages/account/src/Components/personal-details/__tests__/personal-details.spec.js Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * Update packages/account/src/Components/personal-details/personal-details.jsx Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * fix: fixed mt5 modal not appear on screen when clicking on trade button * fix: fixed Bug #84787 Co-authored-by: Shayan Khaleghparast <100833613+iman-fs@users.noreply.github.com> Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * fix: add optional chaining in getMinDuration function (#7344) * fix: 🐛 resolved issue with trade. odal (#7291) * Revert "fix: 🐛 resolved issue with trade. odal (#7291)" (#7364) This reverts commit b6f7e4c. * Farzin/85054/Call `resetWithrawForm` on `CryptoWithdrawForm` component `onunmount` (#7331) * fix(cashier): 🐛 call `resetWithrawForm` on `CryptoWithdrawForm` component `onunmount` * test(cashier): ✅ fix failing test Co-authored-by: Farzin Mirzaie <farzin@deriv.com> * fix: subtask Co-authored-by: Shayan Khaleghparast <100833613+shayan-deriv@users.noreply.github.com> Co-authored-by: Shayan Khaleghparast <100833613+iman-fs@users.noreply.github.com> Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> Co-authored-by: kate-deriv <121025168+kate-deriv@users.noreply.github.com> Co-authored-by: Likhith Kolayari <98398322+likhith-deriv@users.noreply.github.com> Co-authored-by: Farrah Mae Ochoa <farrah@deriv.com> Co-authored-by: Matin shafiei <matin@deriv.com> Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> Co-authored-by: Farzin Mirzaie <farzin@deriv.com> * fix: replaced old text with new one for modal title (#7337) * Kate/ 84149/ getting error after changing language from account setting page (#7336) * fix: remove extra call function from onclick in languagesettings component * fix: Trigger codecov * Ameerul /Task 84193 Deriv P2P - Encourage/Initiate Users to Create Ads when there are no ads on the Buy/Sell screen (#7257) * chore: added new component to show no ads * chore: fixed styling for mobile, added routing to create ad page * chore: changed message for desktop * chore: added missing fullstop * chore: removed (hit the button) text * chore: removed setTimeout * chore: added emoji and fixed route to correct create ad page * chore: added check if user is on different currency * chore: updated text * fix: fixed encourage message * chore: added missing at in message * fix: changed the emoji * chore: fixed user is barred * chore: wrapped NoAds with observer * chore: fixed message for no ads * chore: changed title * chore: changed css styling for currency dropdown (#7221) * Rostislav / 82947 / Task remove Changelly and Xanpool from Fiat Onramp (#7263) * refactor: remove changelly and xanpool related code; change changelly tests to banxa; remove icons * refactor: applied suggestions * test: fix tests * fix: tests mock fix * fix: more tests fixed * fix: a few extra changes * Sandeep/85441/dbot performance fix 2 clone (#7408) * fix: multiplier is not working fine with the dbot slowness fix * fix: please log in issue caused due to performance optimization * Revert "Revert V20230106_0 (#7334)" This reverts commit 69825d3. * fix: multiplier contract purchase * fix: removed multiplier check and new ws creation * chore: clear timeout resolvers on bot close Co-authored-by: balakrishna-binary <bala.krishna@regentmarkets.com> Co-authored-by: Prince <prince@deriv.com> * translations: 📚 sync translations with crowdin (#7411) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> Co-authored-by: Farrah Mae Ochoa <82315152+farrah-deriv@users.noreply.github.com> * Add permissions to GITHUB_TOKEN (#7422) * chore: github_token permissions (#7423) * Specify GITHUB_TOKEN permissions for lighthouse.yml (#7424) * fix: clear all button in notifications dialog (#7425) * Suisin/84164/wrong fe request format (#7227) * fix: sending wrong request to BE from websocket * fix: added conditional check on currency before making WS callon traders-hub * hamza/hotfix: dp2p notification comming incase of 2 accounts (#7433) * hotfix: dp2p notification comming incase of 2 accounts * fix: check for more notifications * chore: loginId from variable * fix: missing dropdown menu (#7420) * translations: 📚 sync translations with crowdin (#7439) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * Farzin/85855/Refactor `ToggleMenuDrawer` component to use `useStore` hook (#7365) * Shayan/52349/react17 migration (#6908) * refactor: react version is upgraded to version 17 * fix: fixed typo * fix: changed declaration file location * fix: temporarily commented our two test cases that are failing * fix: fixed react-content-loader props * fix: fixed some bugs * fix: fixed z-index issue for popover in DBot page * fix: fixed popover position issue in DBot page * chore: an small change on how to turn string to array * fix: merge upstream develop into my branch and resolved conflicts * fix: resolved pr comments * fix: removed rc-drawer and refactored mobile drawer * fix: fixed test cases * fix: resolved pr comments * fix: resolved pr comment * fix: fixed typo * fix: resolved pr comments * fix: fixed slide-in component bug * fix: resolved pr comments * fix: resolved pr comments * fix: removed unnecessary lines * fix: resolved pr comments * Update packages/account/src/Components/personal-details/__tests__/personal-details.spec.js Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * Update packages/account/src/Components/personal-details/__tests__/personal-details.spec.js Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * Update packages/account/src/Components/personal-details/personal-details.jsx Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * fix: fixed mt5 modal not appear on screen when clicking on trade button * fix: fixed Bug #84787 Co-authored-by: Shayan Khaleghparast <100833613+iman-fs@users.noreply.github.com> Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> * fix: add optional chaining in getMinDuration function (#7344) * fix: 🐛 resolved issue with trade. odal (#7291) * Revert "fix: 🐛 resolved issue with trade. odal (#7291)" (#7364) This reverts commit b6f7e4c. * feat(core): ✨ add `@deriv/hooks` and `@deriv/stores` to `@deriv/core` * refactor(core): 🔥 remove `ToggleMenuDrawer` prop drilling and use `useStore` hook * refactor(core): 🔥 remove dead props * refactor(core): 🔥 remove unnecessary ref in `ToggleMenuDrawer` * refactor(core): 🔥 remove `react-import-loader` from `@deriv/core` * refactor(core): 🔥 remove `platform_switcher` prop from `ToggleMenuDrawer` * Farzin/85054/Call `resetWithrawForm` on `CryptoWithdrawForm` component `onunmount` (#7331) * fix(cashier): 🐛 call `resetWithrawForm` on `CryptoWithdrawForm` component `onunmount` * test(cashier): ✅ fix failing test Co-authored-by: Farzin Mirzaie <farzin@deriv.com> * Niloofar Sadeghi / Task - Refactor tests in the language.spec.js file (#7325) * refactor: language tests * fix: typo Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * refactor: proposal tests (#7327) Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * Niloofar Sadeghi / Task - Refactor tests in the error.spec.js file (#7324) * refactor: errors validator tests * fix: typo Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * Niloofar Sadeghi / Task - Refactor tests in the binary-link.spec.tsx file (#7288) * refactor: binary-link tests * refactor: improve testids namings Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * refactor: money tests (#7353) * refactor: toggle-positions tests (#7287) Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * refactor: toggle-button tests (#7328) Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * Niloofar Sadeghi / Task - Refactor tests in the toggle-button-group.spec.tsx file (#7330) * refactor: toggle-button-group tests * fix: test issue Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * refactor: open-positions-table tests (#7374) * Niloofar Sadeghi / Task - Refactor tests in the marker-spot-label.spec.tsx file (#7355) * refactor: remove extra files from reports * refactor: marker-spot-label tests * Niloofar Sadeghi / Task - Refactor tests in the binary-link.spec.tsx file (#7286) * refactor: binary-link tests * test: added more tests Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * Niloofar Sadeghi / Task - Refactor tests in the contract-type-dialog.spec.tsx file (#7285) * refactor: contract-type-dialog tests * test: added more tests * fix: circle/ci issue Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * Niloofar Sadeghi / Task - Refactor tests in the platform-dropdown.spec.tsx file (#7282) * refactor: platform-dropdown tests * refactor: improve testids namings Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * fix(core): 📝 resolve conflicts * fix(core): 📝 resolve conflicts Co-authored-by: Shayan Khaleghparast <100833613+shayan-deriv@users.noreply.github.com> Co-authored-by: Shayan Khaleghparast <100833613+iman-fs@users.noreply.github.com> Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> Co-authored-by: kate-deriv <121025168+kate-deriv@users.noreply.github.com> Co-authored-by: Likhith Kolayari <98398322+likhith-deriv@users.noreply.github.com> Co-authored-by: Farrah Mae Ochoa <farrah@deriv.com> Co-authored-by: Matin shafiei <matin@deriv.com> Co-authored-by: Farzin Mirzaie <farzin@deriv.com> Co-authored-by: Niloofar Sadeghi <93518187+niloofar-deriv@users.noreply.github.com> Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> * Ameerul /Feature 82816 Block User Phase 2 (#7153) * chore: changed tab to block users, change button style, added dropdown * chore: refactored+restructured block-user-table files and fixed show verification component * chore: user can now route to advertiser page from block users tab * chore: removed comments, fixed icon * chore: added icon, refactored block-user-list, fixed handling barred user * chore: fixed block/unblock user if they are barred * chore: integrated backend, display trade partners, search and dropdown * chore: fixed styling, added filter modal/dropdown, refactored code * fix: added suggestions * fix: redirection when hiding advertiser page * fix: changed block users label * chore: fix button sizing, changed text, removed autosizer * chore: show no users to show if user has no blocked users. changed no ads text * chore: fixed block user modal padding issues * chore: put autosizer back, changed table styling, changed logic for displaying dropdown values * chore: removed styling * chore: fixed duplicate rows for trade partners list * chore: added error modal in block user tab if user B is banned whilst blocking * chore: dont allow barred user to navigate to advertisers page, fixed styling issue stats * chore: fixed navigation issue, styling, button hovering issue on mobile * chore: changed Block users to My Counterparties * chore: changed Counterparties to counterparties * chore: fix hovering issue on button * chore: removed hover effect in mobile for buttons * chore: fixed block issue on sell order Co-authored-by: Farrah Mae Ochoa <farrah@deriv.com> * translations: 📚 sync translations with crowdin (#7446) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * Feature/82781/diel_for_all (#7311) * fix: exit button issue * fix: hide currency selection modal if user has an mf mt5 account * fix: fixed an error in mobile mode and added isOnboardingVisited again * fix: remove toggleExitTradersHubModal action from traders-hub-store * fix: css styles * fix: currency selector for EU demo * fix: currency auto selecting first currency after refresh * fix: tradershub header issues on mobile * fix: multipliers_status_badge * fix: demo_low_risk flg in tradershub store * fix: add or remove modal * fix: reloading of account_switcher * chore: update currency switcher styles * chore: hide derivx for low_risk_cr_eu clients for real and demo * chore: update styles for currency switcher * fix: mt5 dashboard fix * fix: test cases * fix: test case * fix: fixed the alignment issue of password-selection-modal * fix: switching on exit traders modal * chore: show appropriate information on the account switcher in the old UI * fix: next button disabled in eu signup * fix: test case fix * fix: account switcher * fix: manage account in account switcher * fix: dxtrade error * fix: redirecting for traders_hub * fix: header traders hub cursor pointer * fix: acc switcher * fix: fixing issues of the tour guide * fix: change regulations to regulation * fix: regulations v2 * fix: icon and message * fix: cursor pointer for status badge * fix: mf real account signup width * fix: real account signup modal * fix: place of birth for eu * fix: tests * fix: fixed the scroll issue and added a new condition to tour guide * fix: removed the redundant line of trading-hub-header * fix: made a small change for the handle scroll function * fix: replaced interval with timeout * fix: hide idv for EU * fix: some capital characters * fix: signup modal title * fix: regulation compare table scroll smooth * fix: compare account modal * fix: responsive alignment * fix: fix popup content * fix: malta description fix and styles * fix: regulation responsive scroll * fix: compare account modal * fix: update jurisdiction content * fix: jurisdiction content * fix: get_more_btn * fix: regulators * fix: css for account type dropdown * fix: add options account for eu * fix: onboarding content desc * fix: onboarding content at stage 5 * fix: onboarding platform names * chore: hide region for new accounts * fix: add options account * fix: design-difference-in-transfer-popup * fix: regulator table scroll * fix: success modal meesage * fix: responsive scroll dashboard * fix: regulation switcher appearing for high risk * fix: 86699_stock_to_stocks * fix: fix add new account * fix: traders hub header dark theme icon * fix: tooltip description for non-eu * fix: dropdown icon for onboarding currency switcher * fix: add short code text for derived and financial accounts * fix: eu currency switcher showing in non-eu * fix: change dmt5 to deriv mt5 in total assets * fix: cfd learn more link * test: fix tests * fix: dark_mode_status_badge * fix: add icon for deriv and financial accounts in receipt * refactor: code refactoring * fix: transfer now to top-up now * fix: total assets to be shown based on selected region * fix: total assets to be shown based on selected region * fix: loginid error on logout * fix: show popover in mobile * fix: disable click on tourguide overlay and remove setting accountType on tour guide * fix: onboarding footer * fix: test failure * fix: fixed the background color issue of onboarding in dark theme * fix: region seitcher in mobile view * fix: fixed the glitch issue with onboarding * fix: fixed the issue of tour guide * fix: dont show loader if user has no account when switching * fix: deposit now style in cashier transfer modal * fix: dashboard title size * fix: decreased the delays * fix: redirect to static pages * fix: fixed the localization issue of tour guide * fix: remove balance when account has mt5 status * fix: regulation switcher glitch in high risk * fix: onboarding labels * fix: pointer display * fix: status badge icon overflow and total assets currency in dark theme * fix: success_message * fix: minor issues in contents * fix: account from field should be tha same as trading account * trigger codecov * fix: top-up to transfer * fix: switch account to real for demo_low_risk * fix: can create deriv x account if user has no cr account and status badge icon css * fix: status badge color inconsistency and size * fix: deriv x trade modal huawei css * fix: jurisdiction modal content * Account fix selected to (#27) * fix: default selected to account * fix: account transfer switch to default client acc * fix: onboarding footer text padding * fix: real account needed modal for mt5 if user has no cr account * fix: eu onboarding footer * fix: redirect_to_traders_hub_on_entering_mt5_url * fix: redirect derivx url * fix: icon design mismatch (#26) * fix: simplified the conditions * test: fix test * fix: fixed all conflicts * refactor: code refactoring * fix: salutation * fix: short code visibility * fix: fix short code visibility * refactor: code refactoring * fix: remove icon for derivx trade modal * fix: fixed the issue where is_pre_appstore was retrived from another place * fix: add Assets alias to webpack/tsconfig, refactor imports * test: fix jest config * fix: default page should be demo in onboarding * fix: freeze_mg_acc_on_cooling_perios * fix: onboarding buttons * fix: transfer_form_from_account_style * fix: mt5 trade modal css alignment * chore: hide disclaimer for low-risk clients * fix: notification console error * chore: add volatility in regulator modal * fix: account_transfer_title * chore: add disclamer to low risk eu * fix: asterik_on_required_fields * fix: adding loader to total asset balance on switching * fix: loader * fix: loader console error * fix: regulation switcher glitch when switching * fix: add back react content loader * fix: safari styling shiii * fix: close button on on boarding * fix: Trader's hub title * fix: disclaimer text change * fix: all dem loaders * fix: up/dpwn icon * fix: dmt5 paswrd * fix: low_risk flag in dbot * fix: fix layout shift on safari * fix: servererror component fix * fix: circleci and typo * fix: header loader * fix: investor password * fix: merge conflicts --------- Co-authored-by: amina-deriv <amina@deriv.com> Co-authored-by: mahdiyeh-deriv <82078941+mahdiyeh-deriv@users.noreply.github.com> Co-authored-by: Thisyahlen <thisyahlen@regentmarkets.com> Co-authored-by: Hirad <hirad@re-work.dev> Co-authored-by: mahdiyeh-fs <mahdiyeh@firstsource.tech> Co-authored-by: Jim Daniels Wasswa <jim@deriv.com> Co-authored-by: Thisyahlen Nair <thisyahlennair@Thisyahlens-MacBook-Pro.local> Co-authored-by: Bahar <bahar@regentmarkets.com> Co-authored-by: george-usynin-binary <heorhi@binary.com> Co-authored-by: GeorgeUsynin <70709786+GeorgeUsynin@users.noreply.github.com> * translations: 📚 sync translations with crowdin (#7458) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * translations: 📚 sync translations with crowdin (#7460) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * translations: 📚 sync translations with crowdin (#7461) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * chore: remove boom description for eu regulation (#7467) * Amina/87406/fix: exit modal fix (#7464) * fix: exit modal fix * chore: empty commit to trigger vercel deployment --------- Co-authored-by: Matin shafiei <matin@deriv.com> * fix: empty notification dropdown (#7468) Co-authored-by: Yashim Wong <yashim@deriv.com> --------- Co-authored-by: Shayan Khaleghparast <100833613+shayan-deriv@users.noreply.github.com> Co-authored-by: Shayan Khaleghparast <100833613+iman-fs@users.noreply.github.com> Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> Co-authored-by: kate-deriv <121025168+kate-deriv@users.noreply.github.com> Co-authored-by: Likhith Kolayari <98398322+likhith-deriv@users.noreply.github.com> Co-authored-by: Matin shafiei <matin@deriv.com> Co-authored-by: Farzin Mirzaie <72082844+farzin-deriv@users.noreply.github.com> Co-authored-by: Farzin Mirzaie <farzin@deriv.com> Co-authored-by: Niloofar Sadeghi <93518187+niloofar-deriv@users.noreply.github.com> Co-authored-by: Niloofar Sadeghi <niloofar.sadeghi@firstsource.tech> Co-authored-by: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com> Co-authored-by: Jim Daniels Wasswa <104334373+jim-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: vinu-deriv <vinu@deriv.com> Co-authored-by: Sui Sin <103026762+suisin-deriv@users.noreply.github.com> Co-authored-by: vinu-deriv <100689171+vinu-deriv@users.noreply.github.com> Co-authored-by: rupato-deriv <97010868+rupato-deriv@users.noreply.github.com> Co-authored-by: balakrishna-binary <bala.krishna@regentmarkets.com> Co-authored-by: Prince <prince@deriv.com> Co-authored-by: Farrah Mae Ochoa <82315152+farrah-deriv@users.noreply.github.com> Co-authored-by: Muhammad Hamza <120543468+hamza-deriv@users.noreply.github.com> Co-authored-by: Sergei Baranovski <120570511+sergei-deriv@users.noreply.github.com> Co-authored-by: Akmal Djumakhodjaev <akmal@binary.com> Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> Co-authored-by: Farrah Mae Ochoa <farrah@deriv.com> Co-authored-by: ameerul-deriv <103412909+ameerul-deriv@users.noreply.github.com> Co-authored-by: Rostik Kayko <119863957+rostislav-deriv@users.noreply.github.com> Co-authored-by: thibault-deriv <104425314+thibault-deriv@users.noreply.github.com> Co-authored-by: amina-deriv <amina@deriv.com> Co-authored-by: mahdiyeh-deriv <82078941+mahdiyeh-deriv@users.noreply.github.com> Co-authored-by: Thisyahlen <thisyahlen@regentmarkets.com> Co-authored-by: Hirad <hirad@re-work.dev> Co-authored-by: mahdiyeh-fs <mahdiyeh@firstsource.tech> Co-authored-by: Jim Daniels Wasswa <jim@deriv.com> Co-authored-by: Thisyahlen Nair <thisyahlennair@Thisyahlens-MacBook-Pro.local> Co-authored-by: Bahar <bahar@regentmarkets.com> Co-authored-by: george-usynin-binary <heorhi@binary.com> Co-authored-by: GeorgeUsynin <70709786+GeorgeUsynin@users.noreply.github.com> Co-authored-by: thisyahlen <104053934+thisyahlen-deriv@users.noreply.github.com> Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com> Co-authored-by: Yashim Wong <yashim@deriv.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
Please include a summary of the change and which issue is fixed below:
When you need to add unit test
When you need to add integration test
Test coverage checklist (for reviewer)
Type of change