From 8b26f6fafee02ccaea904e2725317544b75f9dac Mon Sep 17 00:00:00 2001 From: Hamid Yaftian Date: Thu, 27 Oct 2022 16:00:56 +0330 Subject: [PATCH 1/3] feat: cancel wizard dialog --- .../cancel-wizard-dialog.tsx | 27 +++++++++++++++++++ .../payment-agent-signup/index.ts | 1 + .../src/components/dialog/dialog.scss | 1 - 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog.tsx create mode 100644 packages/cashier/src/pages/payment-agent/payment-agent-signup/index.ts diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog.tsx b/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog.tsx new file mode 100644 index 000000000000..ff68d5b7f9a0 --- /dev/null +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog.tsx @@ -0,0 +1,27 @@ +import React from 'react'; +import { Dialog } from '@deriv/components'; +import { localize } from '@deriv/translations'; + +type TCancelWizardDialogProps = { + onConfirm: () => void; + onCancel: () => void; + is_visible: boolean; +}; + +const CancelWizardDialog = ({ onConfirm, onCancel, is_visible }: TCancelWizardDialogProps) => { + return ( + onConfirm()} + onCancel={() => onCancel()} + is_visible={is_visible} + has_close_icon + > + {localize('If you click Cancel, you’ll lose the inputs you’ve made so far.')} + + ); +}; + +export { CancelWizardDialog }; diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/index.ts b/packages/cashier/src/pages/payment-agent/payment-agent-signup/index.ts new file mode 100644 index 000000000000..b6ad928fe911 --- /dev/null +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/index.ts @@ -0,0 +1 @@ +export * from './cancel-wizard-dialog'; diff --git a/packages/components/src/components/dialog/dialog.scss b/packages/components/src/components/dialog/dialog.scss index 11b61a95fb2d..6d64b09827d8 100644 --- 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; } From 80a470706be09551fb180fafc7856b48e5de5893 Mon Sep 17 00:00:00 2001 From: Hamid Yaftian Date: Sat, 29 Oct 2022 12:27:58 +0330 Subject: [PATCH 2/3] Resolve PR comments --- .../payment-agent-signup/cancel-wizard-dialog.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog.tsx b/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog.tsx index ff68d5b7f9a0..5c1377093a9d 100644 --- a/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog.tsx +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog.tsx @@ -3,8 +3,8 @@ import { Dialog } from '@deriv/components'; import { localize } from '@deriv/translations'; type TCancelWizardDialogProps = { - onConfirm: () => void; - onCancel: () => void; + onConfirm: VoidFunction; + onCancel: VoidFunction; is_visible: boolean; }; @@ -14,8 +14,8 @@ const CancelWizardDialog = ({ onConfirm, onCancel, is_visible }: TCancelWizardDi title={localize('Are you sure you want to cancel?')} confirm_button_text={localize('Yes, cancel')} cancel_button_text={localize('No, take me back')} - onConfirm={() => onConfirm()} - onCancel={() => onCancel()} + onConfirm={onConfirm} + onCancel={onCancel} is_visible={is_visible} has_close_icon > From 1f3eca4f75ec442029b184c1232b68c33c9c641d Mon Sep 17 00:00:00 2001 From: Hamid Yaftian Date: Mon, 31 Oct 2022 10:13:20 +0330 Subject: [PATCH 3/3] Change folder structure --- .../{ => cancel-wizard-dialog}/cancel-wizard-dialog.tsx | 2 +- .../payment-agent-signup/cancel-wizard-dialog/index.ts | 3 +++ .../src/pages/payment-agent/payment-agent-signup/index.ts | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{ => cancel-wizard-dialog}/cancel-wizard-dialog.tsx (95%) create mode 100644 packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog/index.ts delete mode 100644 packages/cashier/src/pages/payment-agent/payment-agent-signup/index.ts diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog.tsx b/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog/cancel-wizard-dialog.tsx similarity index 95% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog.tsx rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog/cancel-wizard-dialog.tsx index 5c1377093a9d..ec7a6d071297 100644 --- a/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog.tsx +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog/cancel-wizard-dialog.tsx @@ -24,4 +24,4 @@ const CancelWizardDialog = ({ onConfirm, onCancel, is_visible }: TCancelWizardDi ); }; -export { CancelWizardDialog }; +export default CancelWizardDialog; diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog/index.ts b/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog/index.ts new file mode 100644 index 000000000000..3a6a342039b8 --- /dev/null +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog/index.ts @@ -0,0 +1,3 @@ +import CancelWizardDialog from './cancel-wizard-dialog'; + +export default CancelWizardDialog; diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/index.ts b/packages/cashier/src/pages/payment-agent/payment-agent-signup/index.ts deleted file mode 100644 index b6ad928fe911..000000000000 --- a/packages/cashier/src/pages/payment-agent/payment-agent-signup/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './cancel-wizard-dialog';