From 52dfdd7feec9d88c735cc21d4208bc6903de83fa Mon Sep 17 00:00:00 2001 From: George Usynin <103181646+george-usynin-binary@users.noreply.github.com> Date: Wed, 30 Nov 2022 17:31:16 +0300 Subject: [PATCH] refactor: folder structure (#23) --- .../payment-agent-container.jsx | 2 +- .../payment-agent-list/payment-agent-list.jsx | 2 +- .../cancel-wizard-dialog.tsx | 0 .../cancel-wizard-dialog/index.ts | 0 .../components/signup-side-note/index.ts | 3 +++ .../signup-side-note-provider.tsx | 0 .../signup-side-note/signup-side-note.scss | 0 .../signup-side-note/signup-side-note.tsx | 4 ++-- .../payment-agent/payment-agent-signup/index.ts | 4 ++-- .../signup-side-note/index.ts | 3 --- .../select-country-step/index.ts | 3 --- .../{signup-wizard => }/signup-wizard.scss | 0 .../{signup-wizard => }/signup-wizard.tsx | 16 ++++++---------- .../payment-agent-signup/signup-wizard/index.ts | 3 --- .../country-of-issue/country-of-issue.tsx} | 6 +++--- .../country-selector/country-selector.tsx | 2 +- .../country-of-issue}/country-selector/index.ts | 0 .../steps/country-of-issue/index.ts | 3 +++ .../payment-agent-signup/steps/selfie/index.ts | 3 +++ .../selfie-step => steps/selfie}/selfie.scss | 0 .../selfie-step.tsx => steps/selfie/selfie.tsx} | 4 ++-- .../{signup-wizard => steps}/steps-reducer.ts | 14 +++++++------- 22 files changed, 34 insertions(+), 38 deletions(-) rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{ => components}/cancel-wizard-dialog/cancel-wizard-dialog.tsx (100%) rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{ => components}/cancel-wizard-dialog/index.ts (100%) create mode 100644 packages/cashier/src/pages/payment-agent/payment-agent-signup/components/signup-side-note/index.ts rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{ => components}/signup-side-note/signup-side-note-provider.tsx (100%) rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{ => components}/signup-side-note/signup-side-note.scss (100%) rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{ => components}/signup-side-note/signup-side-note.tsx (96%) delete mode 100644 packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-side-note/index.ts delete mode 100644 packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard-steps/select-country-step/index.ts rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{signup-wizard => }/signup-wizard.scss (100%) rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{signup-wizard => }/signup-wizard.tsx (87%) delete mode 100644 packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard/index.ts rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{signup-wizard-steps/select-country-step/select-country-step.tsx => steps/country-of-issue/country-of-issue.tsx} (87%) rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{ => steps/country-of-issue}/country-selector/country-selector.tsx (99%) rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{ => steps/country-of-issue}/country-selector/index.ts (100%) create mode 100644 packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/country-of-issue/index.ts create mode 100644 packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/selfie/index.ts rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{signup-wizard-steps/selfie-step => steps/selfie}/selfie.scss (100%) rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{signup-wizard-steps/selfie-step/selfie-step.tsx => steps/selfie/selfie.tsx} (89%) rename packages/cashier/src/pages/payment-agent/payment-agent-signup/{signup-wizard => steps}/steps-reducer.ts (68%) diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-container/payment-agent-container.jsx b/packages/cashier/src/pages/payment-agent/payment-agent-container/payment-agent-container.jsx index 87d36edd8715..325aa93593bc 100644 --- a/packages/cashier/src/pages/payment-agent/payment-agent-container/payment-agent-container.jsx +++ b/packages/cashier/src/pages/payment-agent/payment-agent-container/payment-agent-container.jsx @@ -11,7 +11,7 @@ import PaymentAgentReceipt from '../payment-agent-receipt'; import PaymentAgentSearchBox from '../payment-agent-search-box'; import PaymentAgentUnlistedWithdrawForm from '../payment-agent-unlisted-withdraw-form'; import PaymentAgentWithdrawConfirm from '../payment-agent-withdraw-confirm'; -import { SignupSideNote as PaymentAgentSignupSideNote } from '../payment-agent-signup'; +import { PaymentAgentSignupSideNote } from '../payment-agent-signup/components/signup-side-note'; const PaymentAgentSearchWarning = () => { return ( diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-list/payment-agent-list.jsx b/packages/cashier/src/pages/payment-agent/payment-agent-list/payment-agent-list.jsx index cf58bc2de986..b3b5751094dc 100644 --- a/packages/cashier/src/pages/payment-agent/payment-agent-list/payment-agent-list.jsx +++ b/packages/cashier/src/pages/payment-agent/payment-agent-list/payment-agent-list.jsx @@ -9,7 +9,7 @@ import VerificationEmail from 'Components/verification-email'; import PaymentAgentContainer from '../payment-agent-container'; import PaymentAgentWithdrawalLocked from '../payment-agent-withdrawal-locked'; import PaymentAgentDisclaimer from '../payment-agent-disclaimer'; -import { SignupSideNote as PaymentAgentSignupSideNote } from '../payment-agent-signup'; +import { PaymentAgentSignupSideNote } from '../payment-agent-signup/components/signup-side-note'; import SideNote from 'Components/side-note'; import './payment-agent-list.scss'; diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog/cancel-wizard-dialog.tsx b/packages/cashier/src/pages/payment-agent/payment-agent-signup/components/cancel-wizard-dialog/cancel-wizard-dialog.tsx similarity index 100% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog/cancel-wizard-dialog.tsx rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/components/cancel-wizard-dialog/cancel-wizard-dialog.tsx 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/components/cancel-wizard-dialog/index.ts similarity index 100% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/cancel-wizard-dialog/index.ts rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/components/cancel-wizard-dialog/index.ts diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/components/signup-side-note/index.ts b/packages/cashier/src/pages/payment-agent/payment-agent-signup/components/signup-side-note/index.ts new file mode 100644 index 000000000000..fbc4447a6252 --- /dev/null +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/components/signup-side-note/index.ts @@ -0,0 +1,3 @@ +import SignupSideNote from './signup-side-note'; + +export { SignupSideNote as PaymentAgentSignupSideNote }; diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-side-note/signup-side-note-provider.tsx b/packages/cashier/src/pages/payment-agent/payment-agent-signup/components/signup-side-note/signup-side-note-provider.tsx similarity index 100% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-side-note/signup-side-note-provider.tsx rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/components/signup-side-note/signup-side-note-provider.tsx diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-side-note/signup-side-note.scss b/packages/cashier/src/pages/payment-agent/payment-agent-signup/components/signup-side-note/signup-side-note.scss similarity index 100% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-side-note/signup-side-note.scss rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/components/signup-side-note/signup-side-note.scss diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-side-note/signup-side-note.tsx b/packages/cashier/src/pages/payment-agent/payment-agent-signup/components/signup-side-note/signup-side-note.tsx similarity index 96% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-side-note/signup-side-note.tsx rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/components/signup-side-note/signup-side-note.tsx index 28906895fdde..48c4311589e5 100644 --- a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-side-note/signup-side-note.tsx +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/components/signup-side-note/signup-side-note.tsx @@ -3,8 +3,8 @@ import { observer } from 'mobx-react-lite'; import { Button, Icon, Text } from '@deriv/components'; import getNote from './signup-side-note-provider'; import { useHistory } from 'react-router'; -import { useStore } from '../../../../hooks'; -import SignupWizard from '../signup-wizard'; +import { useStore } from '../../../../../hooks'; +import SignupWizard from '../../signup-wizard'; import './signup-side-note.scss'; export type TNote = { 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 index da0a24221463..f4292d26e7ab 100644 --- a/packages/cashier/src/pages/payment-agent/payment-agent-signup/index.ts +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/index.ts @@ -1,3 +1,3 @@ -import SignupSideNote from './signup-side-note'; +import SignupWizard from './signup-wizard'; -export { SignupSideNote }; +export { SignupWizard }; diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-side-note/index.ts b/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-side-note/index.ts deleted file mode 100644 index 666858cacd57..000000000000 --- a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-side-note/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import SignupSideNote from './signup-side-note'; - -export default SignupSideNote; diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard-steps/select-country-step/index.ts b/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard-steps/select-country-step/index.ts deleted file mode 100644 index 222a85026bb7..000000000000 --- a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard-steps/select-country-step/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import SelectCountryStep from './select-country-step'; - -export default SelectCountryStep; diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard/signup-wizard.scss b/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard.scss similarity index 100% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard/signup-wizard.scss rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard.scss diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard/signup-wizard.tsx b/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard.tsx similarity index 87% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard/signup-wizard.tsx rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard.tsx index 672c0203379e..d9d9d9fcea89 100644 --- a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard/signup-wizard.tsx +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard.tsx @@ -4,10 +4,10 @@ import { createPortal } from 'react-dom'; import { Text } from '@deriv/components'; import { Localize, localize } from '@deriv/translations'; import { Wizard } from '@deriv/ui'; -import CancelWizardDialog from '../cancel-wizard-dialog'; -import SelectCountryStep from '../signup-wizard-steps/select-country-step'; -import SelfieStep from '../signup-wizard-steps/selfie-step/selfie-step'; -import { usePaymentAgentSignupReducer } from './steps-reducer'; +import CancelWizardDialog from './components/cancel-wizard-dialog'; +import CountryOfIssue from './steps/country-of-issue'; +import Selfie from './steps/selfie'; +import { usePaymentAgentSignupReducer } from './steps/steps-reducer'; import './signup-wizard.scss'; type TSignupWizardProps = { @@ -33,10 +33,6 @@ const SignupWizard = ({ closeWizard }: TSignupWizardProps) => { closeWizard(); }; - const onSelfieSelect: React.ComponentProps['onSelect'] = selfie => { - setSelfie({ selfie_with_id: selfie }); - }; - const onChangeStep = (_current_step: number, _current_step_key?: string) => { setCurrentStepKey(_current_step_key); }; @@ -69,7 +65,7 @@ const SignupWizard = ({ closeWizard }: TSignupWizardProps) => { is_submit_disabled={!steps_state.selected_country?.value} is_fullwidth > - @@ -79,7 +75,7 @@ const SignupWizard = ({ closeWizard }: TSignupWizardProps) => { is_submit_disabled={!steps_state.selfie?.selfie_with_id} is_fullwidth > - + <> diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard/index.ts b/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard/index.ts deleted file mode 100644 index 9f4c9c32874c..000000000000 --- a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import SignupWizard from './signup-wizard'; - -export default SignupWizard; diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard-steps/select-country-step/select-country-step.tsx b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/country-of-issue/country-of-issue.tsx similarity index 87% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard-steps/select-country-step/select-country-step.tsx rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/country-of-issue/country-of-issue.tsx index 603bd558a43e..08b939e9e549 100644 --- a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard-steps/select-country-step/select-country-step.tsx +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/country-of-issue/country-of-issue.tsx @@ -2,14 +2,14 @@ import React from 'react'; import { Text, DesktopWrapper } from '@deriv/components'; import { ResidenceList } from '@deriv/api-types'; import { Localize } from '@deriv/translations'; -import CountrySelector from '../../country-selector'; +import CountrySelector from './country-selector'; type TCountrySelectorProps = { onSelect: React.ComponentProps['onSelect']; selected_country?: ResidenceList[number]; }; -const SelectCountryStep = ({ onSelect, selected_country }: TCountrySelectorProps) => { +const CountryOfIssue = ({ onSelect, selected_country }: TCountrySelectorProps) => { return ( <> @@ -32,4 +32,4 @@ const SelectCountryStep = ({ onSelect, selected_country }: TCountrySelectorProps ); }; -export default React.memo(SelectCountryStep); +export default React.memo(CountryOfIssue); diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/country-selector/country-selector.tsx b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/country-of-issue/country-selector/country-selector.tsx similarity index 99% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/country-selector/country-selector.tsx rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/country-of-issue/country-selector/country-selector.tsx index 3045d1916fc0..e6c25f8e84e7 100644 --- a/packages/cashier/src/pages/payment-agent/payment-agent-signup/country-selector/country-selector.tsx +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/country-of-issue/country-selector/country-selector.tsx @@ -3,7 +3,7 @@ import { ResidenceList } from '@deriv/api-types'; import { Formik, Field, FieldProps } from 'formik'; import { Autocomplete, DesktopWrapper, MobileWrapper, SelectNative } from '@deriv/components'; import { localize } from '@deriv/translations'; -import { useStore } from '../../../../hooks'; +import { useStore } from '../../../../../../hooks'; import { TReactChangeEvent } from 'Types'; import { observer } from 'mobx-react'; diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/country-selector/index.ts b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/country-of-issue/country-selector/index.ts similarity index 100% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/country-selector/index.ts rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/country-of-issue/country-selector/index.ts diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/country-of-issue/index.ts b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/country-of-issue/index.ts new file mode 100644 index 000000000000..71199c4c3c16 --- /dev/null +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/country-of-issue/index.ts @@ -0,0 +1,3 @@ +import CountryOfIssue from './country-of-issue'; + +export default CountryOfIssue; diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/selfie/index.ts b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/selfie/index.ts new file mode 100644 index 000000000000..1f5ac5242d80 --- /dev/null +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/selfie/index.ts @@ -0,0 +1,3 @@ +import Selfie from './selfie'; + +export default Selfie; diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard-steps/selfie-step/selfie.scss b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/selfie/selfie.scss similarity index 100% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard-steps/selfie-step/selfie.scss rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/selfie/selfie.scss diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard-steps/selfie-step/selfie-step.tsx b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/selfie/selfie.tsx similarity index 89% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard-steps/selfie-step/selfie-step.tsx rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/selfie/selfie.tsx index 9c568d305669..238a4c070d8f 100644 --- a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard-steps/selfie-step/selfie-step.tsx +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/selfie/selfie.tsx @@ -32,9 +32,9 @@ type TSelfieStep = { onSelect: (value: TSelfie) => void; }; -const SelfieStep = ({ selfie, onSelect }: TSelfieStep) => { +const Selfie = ({ selfie, onSelect }: TSelfieStep) => { //TODO: change the description for the selfie depending on the step number return ; }; -export default React.memo(SelfieStep); +export default React.memo(Selfie); diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard/steps-reducer.ts b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/steps-reducer.ts similarity index 68% rename from packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard/steps-reducer.ts rename to packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/steps-reducer.ts index f15176966d0e..96813fbffcf5 100644 --- a/packages/cashier/src/pages/payment-agent/payment-agent-signup/signup-wizard/steps-reducer.ts +++ b/packages/cashier/src/pages/payment-agent/payment-agent-signup/steps/steps-reducer.ts @@ -1,6 +1,6 @@ import { useCallback, useReducer } from 'react'; import { ResidenceList } from '@deriv/api-types'; -import { TSelfie } from '../signup-wizard-steps/selfie-step/selfie-step'; +import { TSelfie } from './selfie/selfie'; type TStepsState = { selfie: { @@ -15,7 +15,7 @@ const ACTION_TYPES = { } as const; // Action creators -const setSelfieAC = (value: { selfie_with_id: TSelfie }) => { +const setSelfieAC = (value: TSelfie) => { return { type: ACTION_TYPES.SET_SELFIE, value, @@ -30,13 +30,13 @@ const setSelectedCountryAC = (value?: ResidenceList[number]) => { }; // Initial state -const initial_state = { selfie: null, is_selfie_step_enabled: false, selected_country: {} }; +const initial_state = { selected_country: {}, selfie: null }; // Reducer -const stepReducer = (state: TStepsState, action: TActionsTypes): TStepsState => { +const stepsReducer = (state: TStepsState, action: TActionsTypes): TStepsState => { switch (action.type) { case ACTION_TYPES.SET_SELFIE: - return { ...state, selfie: action.value }; + return { ...state, selfie: { selfie_with_id: action.value } }; case ACTION_TYPES.SET_SELECTED_COUNTRY: return { ...state, selected_country: action.value }; default: @@ -45,9 +45,9 @@ const stepReducer = (state: TStepsState, action: TActionsTypes): TStepsState => }; export const usePaymentAgentSignupReducer = () => { - const [steps_state, dispatch] = useReducer(stepReducer, initial_state); + const [steps_state, dispatch] = useReducer(stepsReducer, initial_state); - const setSelfie = useCallback((value: { selfie_with_id: TSelfie }) => dispatch(setSelfieAC(value)), []); + const setSelfie = useCallback((value: TSelfie) => dispatch(setSelfieAC(value)), []); const setSelectedCountry = useCallback( (value?: ResidenceList[number]) => dispatch(setSelectedCountryAC(value)), []