-
+
e.preventDefault()}
@@ -197,13 +199,10 @@ export default connect(({ modules, ui }: TRootStore) => ({
deposit_address: modules.cashier.onramp.deposit_address,
is_dark_mode_on: ui.is_dark_mode_on,
is_deposit_address_loading: modules.cashier.onramp.is_deposit_address_loading,
- is_deposit_address_popover_open: modules.cashier.onramp.is_deposit_address_popover_open,
is_requesting_widget_html: modules.cashier.onramp.is_requesting_widget_html,
- onClickCopyDepositAddress: modules.cashier.onramp.onClickCopyDepositAddress,
onClickDisclaimerContinue: modules.cashier.onramp.onClickDisclaimerContinue,
onClickGoToDepositPage: modules.cashier.onramp.onClickGoToDepositPage,
selected_provider: modules.cashier.onramp.selected_provider,
- setDepositAddressRef: modules.cashier.onramp.setDepositAddressRef,
setIsOnRampModalOpen: modules.cashier.onramp.setIsOnRampModalOpen,
should_show_dialog: modules.cashier.onramp.should_show_dialog,
should_show_widget: modules.cashier.onramp.should_show_widget,
diff --git a/packages/cashier/src/stores/__tests__/on-ramp-store.spec.js b/packages/cashier/src/stores/__tests__/on-ramp-store.spec.js
index 6aaeaf2132e0..2130813bd62b 100644
--- a/packages/cashier/src/stores/__tests__/on-ramp-store.spec.js
+++ b/packages/cashier/src/stores/__tests__/on-ramp-store.spec.js
@@ -164,35 +164,6 @@ describe('OnRampStore', () => {
// expect(spyDisposeGetWidgetHtmlReaction).toBeCalledTimes(1);
// });
- // it('should show and hide deposit address popover when deposit address is copied', async () => {
- // jest.useFakeTimers();
- // jest.spyOn(document, 'createRange').mockImplementation(() => ({
- // selectNodeContents: jest.fn(),
- // }));
- // jest.spyOn(window, 'window', 'get').mockImplementation(() => ({
- // getSelection: () => ({
- // addRange: jest.fn(),
- // removeAllRanges: jest.fn(),
- // }),
- // }));
- // Object.assign(navigator, {
- // clipboard: {
- // writeText: jest.fn(() => Promise.resolve()),
- // },
- // });
- // const spySetIsDepositAddressPopoverOpen = jest.spyOn(onramp_store, 'setIsDepositAddressPopoverOpen');
- // onramp_store.onClickCopyDepositAddress();
-
- // expect(await spySetIsDepositAddressPopoverOpen).toHaveBeenCalledWith(true);
- // jest.runAllTimers();
- // expect(setTimeout).toHaveBeenCalledTimes(1);
- // expect(setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 500);
- // expect(await spySetIsDepositAddressPopoverOpen).toHaveBeenCalledWith(false);
-
- // jest.restoreAllMocks();
- // jest.useRealTimers();
- // });
-
it('should show widget when onClickDisclaimerContinue method was called', () => {
onramp_store.onClickDisclaimerContinue();
@@ -277,7 +248,6 @@ describe('OnRampStore', () => {
expect(onramp_store.api_error).toBeNull();
expect(onramp_store.deposit_address).toBeNull();
- expect(onramp_store.deposit_address_ref).toBeNull();
expect(onramp_store.is_deposit_address_loading).toBeTruthy();
expect(onramp_store.selected_provider).toBeNull();
expect(onramp_store.should_show_widget).toBeFalsy();
@@ -303,24 +273,12 @@ describe('OnRampStore', () => {
expect(onramp_store.deposit_address).toBe('deposit address');
});
- it('should set deposit address ref', () => {
- onramp_store.setDepositAddressRef('deposit address ref');
-
- expect(onramp_store.deposit_address_ref).toBe('deposit address ref');
- });
-
it('should change value of the variable is_deposit_address_loading', () => {
onramp_store.setIsDepositAddressLoading(true);
expect(onramp_store.is_deposit_address_loading).toBeTruthy();
});
- it('should change value of the variable is_deposit_address_popover_open', () => {
- onramp_store.setIsDepositAddressPopoverOpen(true);
-
- expect(onramp_store.is_deposit_address_popover_open).toBeTruthy();
- });
-
it('should change value of the variable is_onramp_modal_open', () => {
onramp_store.setIsOnRampModalOpen(true);
diff --git a/packages/cashier/src/stores/on-ramp-store.js b/packages/cashier/src/stores/on-ramp-store.js
index f9d6d8375060..d08446fb9884 100644
--- a/packages/cashier/src/stores/on-ramp-store.js
+++ b/packages/cashier/src/stores/on-ramp-store.js
@@ -8,7 +8,6 @@ export default class OnRampStore extends BaseStore {
api_error = null;
deposit_address = null;
is_deposit_address_loading = true;
- is_deposit_address_popover_open = false;
is_onramp_modal_open = false;
is_requesting_widget_html = false;
onramp_providers = [];
@@ -17,8 +16,6 @@ export default class OnRampStore extends BaseStore {
widget_error = null;
widget_html = null;
- deposit_address_ref = null;
-
constructor({ WS, root_store }) {
super({ root_store });
@@ -26,7 +23,6 @@ export default class OnRampStore extends BaseStore {
api_error: observable,
deposit_address: observable,
is_deposit_address_loading: observable,
- is_deposit_address_popover_open: observable,
is_onramp_modal_open: observable,
is_requesting_widget_html: observable,
onramp_providers: observable.shallow,
@@ -40,7 +36,6 @@ export default class OnRampStore extends BaseStore {
should_show_dialog: computed,
onMountOnramp: action.bound,
onUnmountOnramp: action.bound,
- onClickCopyDepositAddress: action.bound,
onClickDisclaimerContinue: action.bound,
onClickGoToDepositPage: action.bound,
pollApiForDepositAddress: action.bound,
@@ -48,9 +43,7 @@ export default class OnRampStore extends BaseStore {
setApiError: action.bound,
setCopyIconRef: action.bound,
setDepositAddress: action.bound,
- setDepositAddressRef: action.bound,
setIsDepositAddressLoading: action.bound,
- setIsDepositAddressPopoverOpen: action.bound,
setIsOnRampModalOpen: action.bound,
setIsRequestingWidgetHtml: action.bound,
setSelectedProvider: action.bound,
@@ -182,20 +175,6 @@ export default class OnRampStore extends BaseStore {
}
}
- onClickCopyDepositAddress() {
- const range = document.createRange();
- range.selectNodeContents(this.deposit_address_ref);
-
- const selections = window.getSelection();
- selections.removeAllRanges();
- selections.addRange(range);
-
- navigator.clipboard.writeText(this.deposit_address).then(() => {
- this.setIsDepositAddressPopoverOpen(true);
- setTimeout(() => this.setIsDepositAddressPopoverOpen(false), 500);
- });
- }
-
onClickDisclaimerContinue() {
this.setShouldShowWidget(true);
}
@@ -248,7 +227,6 @@ export default class OnRampStore extends BaseStore {
resetPopup() {
this.setApiError(null);
this.setDepositAddress(null);
- this.setDepositAddressRef(null);
this.setIsDepositAddressLoading(true);
this.setSelectedProvider(null);
this.setShouldShowWidget(false);
@@ -268,18 +246,10 @@ export default class OnRampStore extends BaseStore {
this.deposit_address = deposit_address;
}
- setDepositAddressRef(ref) {
- this.deposit_address_ref = ref;
- }
-
setIsDepositAddressLoading(is_loading) {
this.is_deposit_address_loading = is_loading;
}
- setIsDepositAddressPopoverOpen(is_open) {
- this.is_deposit_address_popover_open = is_open;
- }
-
setIsOnRampModalOpen(is_open) {
this.is_onramp_modal_open = is_open;
}
diff --git a/packages/cashier/src/utils/utility.js b/packages/cashier/src/utils/utility.js
index 4ce3d73bd19c..df9c28765299 100644
--- a/packages/cashier/src/utils/utility.js
+++ b/packages/cashier/src/utils/utility.js
@@ -46,14 +46,6 @@ class PromiseClass {
}
}
-const copyToClipboard = text => {
- const textField = document.createElement('textarea');
- textField.innerText = text;
- document.body.appendChild(textField);
- textField.select();
- document.execCommand('copy');
- textField.remove();
-};
// TODO: [duplicate_code] - Move this to shared package
// eu countries to support
const eu_countries = [
@@ -104,4 +96,4 @@ const getAccountText = account => {
return account_text;
};
-export { copyToClipboard, createElement, getAccountText, getStaticHash, isEuCountry, PromiseClass, template };
+export { createElement, getAccountText, getStaticHash, isEuCountry, PromiseClass, template };
diff --git a/packages/cfd/src/Components/cfd-account-card.tsx b/packages/cfd/src/Components/cfd-account-card.tsx
index 477e4a303c66..dbd392075556 100644
--- a/packages/cfd/src/Components/cfd-account-card.tsx
+++ b/packages/cfd/src/Components/cfd-account-card.tsx
@@ -175,17 +175,18 @@ const CFDAccountCardComponent = ({
is_eu,
isEligibleForMoreDemoMt5Svg,
isEligibleForMoreRealMt5,
- platform,
- title,
- type,
- specs,
- onSelectAccount,
onClickFund,
onPasswordManager,
+ onSelectAccount,
+ platform,
+ setIsAcuityModalOpen,
+ setMT5TradeAccount,
+ specs,
+ title,
toggleAccountsDialog,
toggleMT5TradeModal,
toggleShouldShowRealAccountsList,
- setMT5TradeAccount,
+ type,
}: TCFDAccountCard) => {
const existing_data = existing_accounts_data?.length ? existing_accounts_data?.[0] : existing_accounts_data;
const all_svg_acc: DetailsOfEachMT5Loginid[] = [];
@@ -329,6 +330,22 @@ const CFDAccountCardComponent = ({
)}
+ {platform === CFD_PLATFORMS.MT5 && type.type === 'financial' && !isMobile() && is_logged_in && (
+
+ )}
{existing_data && }
@@ -676,10 +693,11 @@ const CFDAccountCardComponent = ({
);
};
-const CFDAccountCard = connect(({ modules: { cfd }, client }: RootStore) => ({
+const CFDAccountCard = connect(({ modules: { cfd }, client, ui }: RootStore) => ({
dxtrade_tokens: cfd.dxtrade_tokens,
isEligibleForMoreDemoMt5Svg: client.isEligibleForMoreDemoMt5Svg,
isEligibleForMoreRealMt5: client.isEligibleForMoreRealMt5,
+ setIsAcuityModalOpen: ui.setIsAcuityModalOpen,
setMT5TradeAccount: cfd.setMT5TradeAccount,
}))(CFDAccountCardComponent);
diff --git a/packages/cfd/src/Components/cfd-mt5-demo-account-display.tsx b/packages/cfd/src/Components/cfd-mt5-demo-account-display.tsx
index 8f9bc6c06437..061c7cb8f0ea 100644
--- a/packages/cfd/src/Components/cfd-mt5-demo-account-display.tsx
+++ b/packages/cfd/src/Components/cfd-mt5-demo-account-display.tsx
@@ -107,7 +107,7 @@ const CFDMT5DemoAccountDisplay = ({
}, [is_logged_in, is_eu, is_eu_country, residence, platform]);
return (
-
+
);
};
diff --git a/packages/cfd/src/Components/cfd-real-account-display.tsx b/packages/cfd/src/Components/cfd-real-account-display.tsx
index 527fa67192f3..958595b13ad9 100644
--- a/packages/cfd/src/Components/cfd-real-account-display.tsx
+++ b/packages/cfd/src/Components/cfd-real-account-display.tsx
@@ -61,6 +61,7 @@ type TCFDRealAccountDisplayProps = {
account_status?: object;
openDerivRealAccountNeededModal: () => void;
should_enable_add_button?: boolean;
+ setIsAcuityModalOpen: (value: boolean) => void;
};
const CFDRealAccountDisplay = ({
@@ -88,6 +89,7 @@ const CFDRealAccountDisplay = ({
residence,
openDerivRealAccountNeededModal,
should_enable_add_button,
+ setIsAcuityModalOpen,
}: TCFDRealAccountDisplayProps) => {
const is_eu_user = (is_logged_in && is_eu) || (!is_logged_in && is_eu_country);
@@ -231,6 +233,7 @@ const CFDRealAccountDisplay = ({
toggleShouldShowRealAccountsList={toggleShouldShowRealAccountsList}
toggleAccountsDialog={toggleAccountsDialog}
toggleMT5TradeModal={toggleMT5TradeModal}
+ setIsAcuityModalOpen={setIsAcuityModalOpen}
/>
);
diff --git a/packages/cfd/src/Components/props.types.ts b/packages/cfd/src/Components/props.types.ts
index d2f0d6d443cb..ec638a4951f2 100644
--- a/packages/cfd/src/Components/props.types.ts
+++ b/packages/cfd/src/Components/props.types.ts
@@ -108,6 +108,7 @@ export type TCFDAccountCard = {
toggleMT5TradeModal: (arg?: boolean) => void;
toggleShouldShowRealAccountsList?: (arg?: boolean) => void;
setMT5TradeAccount: (arg: any) => void;
+ setIsAcuityModalOpen: (value: boolean) => void;
};
export type TTradingPlatformAccounts = {
diff --git a/packages/cfd/src/Containers/__tests__/cfd-dashboard.spec.tsx b/packages/cfd/src/Containers/__tests__/cfd-dashboard.spec.tsx
index 377092a28232..88e110edcb48 100644
--- a/packages/cfd/src/Containers/__tests__/cfd-dashboard.spec.tsx
+++ b/packages/cfd/src/Containers/__tests__/cfd-dashboard.spec.tsx
@@ -142,6 +142,7 @@ describe('
+
{is_loading ? (
)}
-
+
+
+
+
+ })
+
+
+
+
+
+
+
+
+
+
+
+
+
+