Merge pull request #11 from ameerul-deriv/P2PS-1305-access-the-share-…

…ad-link Ameerul /P2PS-1305 access the share ad link
ameerul-deriv · Sep 1, 2023 · fd08ecd · fd08ecd
2 parents 5282366 + 1953d9f
commit fd08ecd
Show file tree

Hide file tree

Showing 27 changed files with 490 additions and 124 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/account/package.json b/packages/account/package.json
@@ -43,7 +43,7 @@
         "mobx-react": "^7.5.1",
         "onfido-sdk-ui": "^11.0.0",
         "prop-types": "^15.7.2",
-        "qrcode.react": "^1.0.0",
+        "qrcode.react": "^3.1.0",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
         "react-i18next": "^11.11.0",

diff --git a/packages/cashier/package.json b/packages/cashier/package.json
@@ -53,7 +53,7 @@
         "mobx": "^6.6.1",
         "moment": "^2.29.2",
         "prop-types": "^15.7.2",
-        "qrcode.react": "^1.0.0",
+        "qrcode.react": "^3.1.0",
         "react": "^17.0.2",
         "react-content-loader": "^6.2.0",
         "react-dom": "^17.0.2",

diff --git a/packages/cashier/src/components/error-dialog/error-dialog.tsx b/packages/cashier/src/components/error-dialog/error-dialog.tsx
@@ -13,9 +13,9 @@ type TErrorDialogProps = {
 
 type TSetDetails = {
     title: string;
-    cancel_button_text: undefined | string;
+    cancel_button_text?: string;
     confirm_button_text: undefined | string;
-    onConfirm: undefined | (() => void);
+    onConfirm?: () => void;
     message: undefined | string | TReactElement;
     has_close_icon?: boolean;
 };
@@ -107,6 +107,13 @@ const ErrorDialog = observer(({ className, error = {} }: TErrorDialogProps) => {
                     onConfirm: undefined,
                     message: error_message,
                 });
+            } else if (error_code === 'ShareMyAdsError') {
+                setDetails({
+                    title: localize('Deriv P2P unavailable'),
+                    confirm_button_text: localize('OK'),
+                    message: error_message,
+                    has_close_icon: true,
+                });
             } else {
                 setDetails({
                     title: localize('Cashier Error'),

diff --git a/packages/cashier/src/containers/cashier/cashier.tsx b/packages/cashier/src/containers/cashier/cashier.tsx
@@ -49,7 +49,7 @@ type TCashierOptions = {
 };
 
 const Cashier = observer(({ history, location, routes: routes_config }: TCashierProps) => {
-    const { common, ui, client } = useStore();
+    const { common, ui, client, traders_hub } = useStore();
     const { withdraw, general_store, payment_agent } = useCashierStore();
     const { error } = withdraw;
     const {
@@ -68,8 +68,9 @@ const Cashier = observer(({ history, location, routes: routes_config }: TCashier
     } = usePaymentAgentTransferVisible();
     const { is_payment_agent_visible } = payment_agent;
     const { is_from_derivgo } = common;
-    const { is_cashier_visible: is_visible, toggleCashier } = ui;
-    const { is_account_setting_loaded, is_logged_in, is_logging_in } = client;
+    const { is_demo } = traders_hub;
+    const { is_cashier_visible: is_visible, toggleCashier, toggleReadyToDepositModal } = ui;
+    const { currency, is_account_setting_loaded, is_logged_in, is_logging_in, is_svg } = client;
     const is_account_transfer_visible = useAccountTransferVisible();
     const is_onramp_visible = useOnrampVisible();
     const p2p_notification_count = useP2PNotificationCount();
@@ -200,8 +201,26 @@ const Cashier = observer(({ history, location, routes: routes_config }: TCashier
 
     useEffect(() => {
         if (is_p2p_enabled_success && !is_p2p_enabled && history.location.pathname.startsWith(routes.cashier_p2p)) {
+            const url_params = new URLSearchParams(history.location.search);
+            const advert_id = url_params.get('advert_id');
+
             history.push(routes.cashier_deposit);
+
+            if (advert_id) {
+                if (is_demo) {
+                    toggleReadyToDepositModal();
+                } else {
+                    error.setErrorMessage({
+                        code: 'ShareMyAdsError',
+                        message:
+                            currency !== 'USD' && is_svg
+                                ? localize('Deriv P2P is currently unavailable in this currency.')
+                                : localize('Deriv P2P is currently unavailable in your country.'),
+                    });
+                }
+            }
         }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [history, is_p2p_enabled, is_p2p_enabled_success]);
 
     if (

diff --git a/packages/components/src/components/dialog/dialog.scss b/packages/components/src/components/dialog/dialog.scss
@@ -73,7 +73,6 @@
             justify-content: space-between;
             align-items: center;
             margin-bottom: 1rem;
-            margin-top: 1.4rem;
             &--end {
                 justify-content: flex-end;
             }