Skip to content

Commit

Permalink
Sandeep/dbot homepage fix conflicts (#6654)
Browse files Browse the repository at this point in the history
* 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>

* 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>

* 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

* 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>

* 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

* reran bootstrap and build

Co-authored-by: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
Co-authored-by: Hamid <hamid@re-work.dev>
Co-authored-by: Farzin Mirzaie <72082844+farzin-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: George Usynin <103181646+george-usynin-binary@users.noreply.github.com>
Co-authored-by: Likhith Kolayari <98398322+likhith-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: Matin shafiei <matin@deriv.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: Sui Sin <103026762+suisin-deriv@users.noreply.github.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: 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 <likhith@deriv.com>
Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com>
Co-authored-by: maryiafrantsava-binary <103181650+maryiafrantsava-binary@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: Adrienne Rio <adrienne@deriv.com>
Co-authored-by: Ameerul Hady <ameerul@deriv.com>
Co-authored-by: thisyahlen <104053934+thisyahlen-deriv@users.noreply.github.com>
Co-authored-by: Akmal Djumakhodjaev <akmal@binary.com>
Co-authored-by: Yashim Wong <yashim@deriv.com>
Co-authored-by: vinu-deriv <vinu@deriv.com>
  • Loading branch information
1 parent 9a29daa commit 8a0dce1
Show file tree
Hide file tree
Showing 187 changed files with 3,287 additions and 1,446 deletions.
1 change: 0 additions & 1 deletion packages/account/build/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ module.exports = function (env) {
'self-exclusion': 'Components/self-exclusion',
'scrollbars-container': 'Components/scrollbars-container',
'sent-email-modal': 'Components/sent-email-modal',
'text-container': 'Components/text-container',
'terms-of-use': 'Components/terms-of-use',
'terms-of-use-config': 'Configs/terms-of-use-config',
'proof-of-identity-config': 'Configs/proof-of-identity-config',
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import DemoMessage from '../demo-message';

// eslint-disable-next-line react/display-name
jest.mock('Components/icon-with-message', () => () => <div>DemoMessage</div>);

it('should render DemoMessage component', () => {
render(<DemoMessage />);
expect(screen.getByText('DemoMessage')).toBeInTheDocument();
});
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
import React from 'react';
import PropTypes from 'prop-types';
import { localize } from '@deriv/translations';
import IconWithMessage from 'Components/icon-with-message';

const DemoMessage = ({ has_demo_icon, has_button }) => (
type TDemoMessage = {
has_demo_icon?: boolean;
has_button?: boolean;
};

const DemoMessage = ({ has_demo_icon, has_button }: TDemoMessage) => (
<IconWithMessage
icon={has_demo_icon ? 'IcPoaLockDemo' : 'IcPoaLock'}
message={localize('This feature is not available for demo accounts.')}
has_button={has_button}
/>
);

DemoMessage.propTypes = {
has_button: PropTypes.bool,
has_demo_icon: PropTypes.bool,
full_width: PropTypes.bool,
};

export default DemoMessage;
1 change: 0 additions & 1 deletion packages/account/src/Components/demo-message/index.js

This file was deleted.

3 changes: 3 additions & 0 deletions packages/account/src/Components/demo-message/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import DemoMessage from './demo-message';

export default DemoMessage;
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jest.mock('react-router-dom', () => ({

const interactWithPasswordField = async (trigger_click = true) => {
await waitForElementToBeRemoved(() => screen.getByTestId('dt_initial_loader'));
fireEvent.change(screen.getByLabelText('DMT5 password', { selector: 'input' }), {
fireEvent.change(screen.getByLabelText('Deriv MT5 password', { selector: 'input' }), {
target: { value: 'hN795jCWkDtPy5' },
});
if (trigger_click) {
Expand Down Expand Up @@ -85,7 +85,7 @@ describe('<ResetTradingPasswordModal/>', () => {
);
await interactWithPasswordField();

expect(await screen.findByText('Reset DMT5 password')).toBeInTheDocument();
expect(await screen.findByText('Reset Deriv MT5 password')).toBeInTheDocument();
});

it('should display error message returned by API', async () => {
Expand Down

This file was deleted.

3 changes: 0 additions & 3 deletions packages/account/src/Components/text-container/index.js

This file was deleted.

This file was deleted.

Loading

0 comments on commit 8a0dce1

Please sign in to comment.