Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor/36648 wallet enablement flow personal info #40357

Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
7c16aa4
refactor: personal info wip
koko57 Apr 3, 2024
6331ddd
Merge branch 'main' into refactor/36648-wallet-enablement-flow-person…
koko57 Apr 5, 2024
2fb2ce4
Merge branch 'main' into refactor/36648-wallet-enablement-flow-person…
koko57 Apr 9, 2024
8876374
fix: wrap the page for displaying offline indicator correctly, do not…
koko57 Apr 9, 2024
07559bd
Merge branch 'main' into refactor/36648-wallet-enablement-flow-person…
koko57 Apr 10, 2024
e8c9058
Merge branch 'main' into refactor/36648-wallet-enablement-flow-person…
koko57 Apr 10, 2024
fc2e134
refactor: rename AddressForm to AddressFormFields
koko57 Apr 11, 2024
03111d4
refactor: remove unused file
koko57 Apr 11, 2024
85e77ec
Merge branch 'main' into refactor/36648-wallet-enablement-flow-person…
koko57 Apr 12, 2024
f19d447
refactor: wip
koko57 Apr 12, 2024
647f538
Merge branch 'main' into refactor/36648-wallet-enablement-flow-person…
koko57 Apr 15, 2024
3e7f27d
Merge branch 'main' into refactor/36648-wallet-enablement-flow-person…
koko57 Apr 16, 2024
1e0e3af
feat: add phone number page
koko57 Apr 16, 2024
ffc26f9
feat: add validation for the field, editing phone number
koko57 Apr 16, 2024
9b665e8
Merge branch 'main' into refactor/36648-wallet-enablement-flow-person…
koko57 Apr 17, 2024
b8e9d43
feat: add proper copies
koko57 Apr 17, 2024
c135183
refactor: make useStepSubmit generic
koko57 Apr 17, 2024
4718b80
refactor: finishing touches
koko57 Apr 17, 2024
c888b6f
fix: change step order
koko57 Apr 17, 2024
744c276
fix: rename components
koko57 Apr 17, 2024
042138b
fix: linter
koko57 Apr 17, 2024
5303251
Merge branch 'main' into refactor/36648-wallet-enablement-flow-person…
koko57 Apr 17, 2024
10bb996
fix: minor fix
koko57 Apr 17, 2024
4a050bd
Merge branch 'main' into refactor/36648-wallet-enablement-flow-person…
koko57 Apr 18, 2024
bffc4b6
fix: add issue link
koko57 Apr 18, 2024
ec9ed98
fix: minor fix
koko57 Apr 18, 2024
d6f65ef
fix: minor fix
koko57 Apr 18, 2024
16b2067
refactor: replace withOnyx with useOnyx
koko57 Apr 18, 2024
c001154
fix: minor fix
koko57 Apr 18, 2024
3866998
fix: minor fix
koko57 Apr 18, 2024
0711f4c
Merge branch 'main' into refactor/36648-wallet-enablement-flow-person…
koko57 Apr 24, 2024
d88c4e7
fix: jumping inputs
koko57 Apr 24, 2024
5ea49d2
fix: remove wrappers, change the labels
koko57 Apr 24, 2024
57f1a7b
fix: address step title
koko57 Apr 24, 2024
04c20eb
fix: apply requested changes
koko57 Apr 25, 2024
879287c
fix: minor fix
koko57 Apr 25, 2024
67a43b1
fix: remove unnecessary style
koko57 Apr 25, 2024
e98ef14
Merge branch 'main' into refactor/36648-wallet-enablement-flow-person…
koko57 Apr 29, 2024
cb13e9c
fix: comment change
koko57 Apr 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: rename components
  • Loading branch information
koko57 committed Apr 17, 2024
commit 744c276e5122dc7044d820e326cebac4695fd1de
12 changes: 6 additions & 6 deletions src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@
// TODO: uncomment in the next PR
// import {parsePhoneNumber} from '@libs/PhoneNumber';
import Navigation from '@navigation/Navigation';
import PhoneNumber from '@pages/EnablePayments/PersonalInfo/substeps/PhoneNumber';
import * as Wallet from '@userActions/Wallet';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
@@ -20,13 +19,14 @@
import type {WalletAdditionalDetailsForm} from '@src/types/form';
import INPUT_IDS from '@src/types/form/WalletAdditionalDetailsForm';
import type {WalletAdditionalDetailsRefactor} from '@src/types/onyx/WalletAdditionalDetails';
import getInitialSubstepForPersonalInfo from '../utils/getInitialSubstepForPersonalInfo';

Check warning on line 22 in src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx

GitHub Actions / Run ESLint

Unexpected parent import '../utils/getInitialSubstepForPersonalInfo'. Use '@pages/EnablePayments/utils/getInitialSubstepForPersonalInfo' instead
import getSubstepValues from '../utils/getSubstepValues';

Check warning on line 23 in src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx

GitHub Actions / Run ESLint

Unexpected parent import '../utils/getSubstepValues'. Use '@pages/EnablePayments/utils/getSubstepValues' instead
import Address from './substeps/Address';
import Confirmation from './substeps/Confirmation';
import DateOfBirth from './substeps/DateOfBirth';
import FullName from './substeps/FullName';
import SocialSecurityNumber from './substeps/SocialSecurityNumber';
import Address from './substeps/AddressStep';
import Confirmation from './substeps/ConfirmationStep';
import DateOfBirth from './substeps/DateOfBirthStep';
import FullName from './substeps/FullNameStep';
import PhoneNumber from './substeps/PhoneNumberStep';
import SocialSecurityNumber from './substeps/SocialSecurityNumberStep';

type PersonalInfoPageOnyxProps = {
/** Reimbursement account from ONYX */
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL
return errors;
};

function Address({walletAdditionalDetails, onNext, isEditing}: AddressProps) {
function AddressStep({walletAdditionalDetails, onNext, isEditing}: AddressProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();

@@ -89,11 +89,11 @@ function Address({walletAdditionalDetails, onNext, isEditing}: AddressProps) {
);
}

Address.displayName = 'Address';
AddressStep.displayName = 'AddressStep';

export default withOnyx<AddressProps, AddressOnyxProps>({
// @ts-expect-error ONYXKEYS.WALLET_ADDITIONAL_DETAILS is conflicting with ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS
walletAdditionalDetails: {
key: ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS,
},
})(Address);
})(AddressStep);
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
import INPUT_IDS from '@src/types/form/WalletAdditionalDetailsForm';
import type {WalletAdditionalDetailsForm} from '@src/types/form/WalletAdditionalDetailsForm';
import type {WalletAdditionalDetailsRefactor} from '@src/types/onyx/WalletAdditionalDetails';
import getSubstepValues from '../../utils/getSubstepValues';

Check warning on line 22 in src/pages/EnablePayments/PersonalInfo/substeps/ConfirmationStep.tsx

GitHub Actions / Run ESLint

Unexpected parent import '../../utils/getSubstepValues'. Use '@pages/EnablePayments/utils/getSubstepValues' instead

type ConfirmationOnyxProps = {
/** wallet additional details from ONYX */
@@ -34,7 +34,7 @@
const PERSONAL_INFO_STEP_KEYS = INPUT_IDS.PERSONAL_INFO_STEP;
const PERSONAL_INFO_STEP_INDEXES = CONST.WALLET.SUBSTEP_INDEXES.PERSONAL_INFO;

function Confirmation({walletAdditionalDetails, walletAdditionalDetailsDraft, onNext, onMove}: ConfirmationProps) {
function ConfirmationStep({walletAdditionalDetails, walletAdditionalDetailsDraft, onNext, onMove}: ConfirmationProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();
const {isOffline} = useNetwork();
@@ -140,7 +140,7 @@
);
}

Confirmation.displayName = 'Confirmation';
ConfirmationStep.displayName = 'ConfirmationStep';

export default withOnyx<ConfirmationProps, ConfirmationOnyxProps>({
// @ts-expect-error ONYXKEYS.WALLET_ADDITIONAL_DETAILS is conflicting with ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS
@@ -151,4 +151,4 @@
walletAdditionalDetailsDraft: {
key: ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS_DRAFT,
},
})(Confirmation);
})(ConfirmationStep);
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL
const minDate = subYears(new Date(), CONST.DATE_BIRTH.MAX_AGE);
const maxDate = subYears(new Date(), CONST.DATE_BIRTH.MIN_AGE_FOR_PAYMENT);

function DateOfBirth({walletAdditionalDetails, onNext, isEditing}: DateOfBirthProps) {
function DateOfBirthStep({walletAdditionalDetails, onNext, isEditing}: DateOfBirthProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();

@@ -82,11 +82,11 @@ function DateOfBirth({walletAdditionalDetails, onNext, isEditing}: DateOfBirthPr
);
}

DateOfBirth.displayName = 'DateOfBirth';
DateOfBirthStep.displayName = 'DateOfBirthStep';

export default withOnyx<DateOfBirthProps, DateOfBirthOnyxProps>({
// @ts-expect-error ONYXKEYS.WALLET_ADDITIONAL_DETAILS is conflicting with ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS
walletAdditionalDetails: {
key: ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS,
},
})(DateOfBirth);
})(DateOfBirthStep);
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL
return errors;
};

function FullName({walletAdditionalDetails, onNext, isEditing}: FullNameProps) {
function FullNameStep({walletAdditionalDetails, onNext, isEditing}: FullNameProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();

@@ -94,11 +94,11 @@ function FullName({walletAdditionalDetails, onNext, isEditing}: FullNameProps) {
);
}

FullName.displayName = 'FullName';
FullNameStep.displayName = 'FullNameStep';

export default withOnyx<FullNameProps, FullNameOnyxProps>({
// @ts-expect-error: ONYXKEYS.WALLET_ADDITIONAL_DETAILS is conflicting with ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS
walletAdditionalDetails: {
key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
},
})(FullName);
})(FullNameStep);
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL
}
return errors;
};
function PhoneNumber({walletAdditionalDetails, onNext, isEditing}: PhoneNumberProps) {
function PhoneNumberStep({walletAdditionalDetails, onNext, isEditing}: PhoneNumberProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();

@@ -80,11 +80,11 @@ function PhoneNumber({walletAdditionalDetails, onNext, isEditing}: PhoneNumberPr
);
}

PhoneNumber.displayName = 'PhoneNumber';
PhoneNumberStep.displayName = 'PhoneNumberStep';

export default withOnyx<PhoneNumberProps, PhoneNumberOnyxProps>({
// @ts-expect-error ONYXKEYS.WALLET_ADDITIONAL_DETAILS is conflicting with ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS
walletAdditionalDetails: {
key: ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS,
},
})(PhoneNumber);
})(PhoneNumberStep);
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL

return errors;
};
function SocialSecurityNumber({walletAdditionalDetails, onNext, isEditing}: SocialSecurityNumberProps) {
function SocialSecurityNumberStep({walletAdditionalDetails, onNext, isEditing}: SocialSecurityNumberProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();

@@ -81,11 +81,11 @@ function SocialSecurityNumber({walletAdditionalDetails, onNext, isEditing}: Soci
);
}

SocialSecurityNumber.displayName = 'SocialSecurityNumber';
SocialSecurityNumberStep.displayName = 'SocialSecurityNumberStep';

export default withOnyx<SocialSecurityNumberProps, SocialSecurityNumberOnyxProps>({
// @ts-expect-error ONYXKEYS.WALLET_ADDITIONAL_DETAILS is conflicting with ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS
walletAdditionalDetails: {
key: ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS,
},
})(SocialSecurityNumber);
})(SocialSecurityNumberStep);

Unchanged files with check annotations Beta

import type {FormOnyxKeys} from '@components/Form/types';
import useStepFormSubmit from '@hooks/useStepFormSubmit';

Check warning on line 2 in src/hooks/useReimbursementAccountStepFormSubmit.ts

GitHub Actions / Run ESLint

Unexpected subpath import via alias '@hooks/useStepFormSubmit'. Use './useStepFormSubmit' instead
import type {OnyxFormKey} from '@src/ONYXKEYS';
import ONYXKEYS from '@src/ONYXKEYS';
import type {SubStepProps} from './useSubStep/types';
import type {FormOnyxKeys} from '@components/Form/types';
import useStepFormSubmit from '@hooks/useStepFormSubmit';

Check warning on line 2 in src/hooks/useWalletAdditionalDetailsStepFormSubmit.ts

GitHub Actions / Run ESLint

Unexpected subpath import via alias '@hooks/useStepFormSubmit'. Use './useStepFormSubmit' instead
import type {OnyxFormKey} from '@src/ONYXKEYS';
import ONYXKEYS from '@src/ONYXKEYS';
import type {SubStepProps} from './useSubStep/types';