Skip to content

Commit

Permalink
refactor(get physical card): rename routes
Browse files Browse the repository at this point in the history
  • Loading branch information
@pac-guerreiro
pac-guerreiro committed Nov 14, 2023
1 parent 6530e75 commit 4ff162d
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 36 deletions.
24 changes: 12 additions & 12 deletions src/ROUTES.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,21 @@ export default {
route: '/settings/wallet/card/:domain/report-virtual-fraud',
getRoute: (domain: string) => `/settings/wallet/card/${domain}/report-virtual-fraud`,
},
SETTINGS_WALLET_CARDS_GET_PHYSICAL_NAME: {
route: '/settings/wallet/cards/:domain/get-physical/name',
getRoute: (domain: string) => `/settings/wallet/cards/${domain}/get-physical/name`,
SETTINGS_WALLET_CARD_GET_PHYSICAL_NAME: {
route: '/settings/wallet/card/:domain/get-physical/name',
getRoute: (domain: string) => `/settings/wallet/card/${domain}/get-physical/name`,
},
SETTINGS_WALLET_CARDS_GET_PHYSICAL_PHONE: {
route: '/settings/wallet/cards/:domain/get-physical/phone',
getRoute: (domain: string) => `/settings/wallet/cards/${domain}/get-physical/phone`,
SETTINGS_WALLET_CARD_GET_PHYSICAL_PHONE: {
route: '/settings/wallet/card/:domain/get-physical/phone',
getRoute: (domain: string) => `/settings/wallet/card/${domain}/get-physical/phone`,
},
SETTINGS_WALLET_CARDS_GET_PHYSICAL_ADDRESS: {
route: '/settings/wallet/cards/:domain/get-physical/address',
getRoute: (domain: string) => `/settings/wallet/cards/${domain}/get-physical/address`,
SETTINGS_WALLET_CARD_GET_PHYSICAL_ADDRESS: {
route: '/settings/wallet/card/:domain/get-physical/address',
getRoute: (domain: string) => `/settings/wallet/card/${domain}/get-physical/address`,
},
SETTINGS_WALLET_CARDS_GET_PHYSICAL_CONFIRM: {
route: '/settings/wallet/cards/:domain/get-physical/confirm',
getRoute: (domain: string) => `/settings/wallet/cards/${domain}/get-physical/confirm`,
SETTINGS_WALLET_CARD_GET_PHYSICAL_CONFIRM: {
route: '/settings/wallet/card/:domain/get-physical/confirm',
getRoute: (domain: string) => `/settings/wallet/card/${domain}/get-physical/confirm`,
},
SETTINGS_ADD_DEBIT_CARD: 'settings/wallet/add-debit-card',
SETTINGS_ADD_BANK_ACCOUNT: 'settings/wallet/add-bank-account',
Expand Down
10 changes: 5 additions & 5 deletions src/SCREENS.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ export default {
STATUS: 'Settings_Status',
WALLET: 'Settings_Wallet',
WALLET_DOMAIN_CARD: 'Settings_Wallet_DomainCard',
WALLET_CARDS_GET_PHYSICAL: {
NAME: 'Settings_Cards_Get_Physical_Name',
PHONE: 'Settings_Cards_Get_Physical_Phone',
ADDRESS: 'Settings_Cards_Get_Physical_Address',
CONFIRM: 'Settings_Cards_Get_Physical_Confirm',
WALLET_CARD_GET_PHYSICAL: {
NAME: 'Settings_Card_Get_Physical_Name',
PHONE: 'Settings_Card_Get_Physical_Phone',
ADDRESS: 'Settings_Card_Get_Physical_Address',
CONFIRM: 'Settings_Card_Get_Physical_Confirm',
},
},
SAVE_THE_WORLD: {
Expand Down
8 changes: 4 additions & 4 deletions src/libs/Navigation/AppNavigator/ModalStackNavigators.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@ const SettingsModalStackNavigator = createModalStackNavigator({
Settings_Wallet_DomainCard: () => require('../../../pages/settings/Wallet/ExpensifyCardPage').default,
Settings_Wallet_ReportVirtualCardFraud: () => require('../../../pages/settings/Wallet/ReportVirtualCardFraudPage').default,
Settings_Wallet_Card_Activate: () => require('../../../pages/settings/Wallet/ActivatePhysicalCardPage').default,
[SCREENS.SETTINGS.WALLET_CARDS_GET_PHYSICAL.NAME]: () => require('../../../pages/settings/Wallet/Cards/GetPhysicalCardName').default,
[SCREENS.SETTINGS.WALLET_CARDS_GET_PHYSICAL.PHONE]: () => require('../../../pages/settings/Wallet/Cards/GetPhysicalCardPhone').default,
[SCREENS.SETTINGS.WALLET_CARDS_GET_PHYSICAL.ADDRESS]: () => require('../../../pages/settings/Wallet/Cards/GetPhysicalCardAddress').default,
[SCREENS.SETTINGS.WALLET_CARDS_GET_PHYSICAL.CONFIRM]: () => require('../../../pages/settings/Wallet/Cards/GetPhysicalCardConfirm').default,
[SCREENS.SETTINGS.WALLET_CARD_GET_PHYSICAL.NAME]: () => require('../../../pages/settings/Wallet/Card/GetPhysicalCardName').default,
[SCREENS.SETTINGS.WALLET_CARD_GET_PHYSICAL.PHONE]: () => require('../../../pages/settings/Wallet/Card/GetPhysicalCardPhone').default,
[SCREENS.SETTINGS.WALLET_CARD_GET_PHYSICAL.ADDRESS]: () => require('../../../pages/settings/Wallet/Card/GetPhysicalCardAddress').default,
[SCREENS.SETTINGS.WALLET_CARD_GET_PHYSICAL.CONFIRM]: () => require('../../../pages/settings/Wallet/Card/GetPhysicalCardConfirm').default,
Settings_Wallet_Transfer_Balance: () => require('../../../pages/settings/Wallet/TransferBalancePage').default,
Settings_Wallet_Choose_Transfer_Account: () => require('../../../pages/settings/Wallet/ChooseTransferAccountPage').default,
Settings_Wallet_EnablePayments: () => require('../../../pages/EnablePayments/EnablePaymentsPage').default,
Expand Down
8 changes: 4 additions & 4 deletions src/libs/Navigation/Navigation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,19 +316,19 @@ function goToNextPhysicalCardRoute(privatePersonalDetails, loginList) {
const {domain} = (currentRoute && currentRoute.params) || {domain: ''};

if (!legalFirstName && !legalLastName) {
navigate(ROUTES.SETTINGS_WALLET_CARDS_GET_PHYSICAL_NAME.getRoute(domain));
navigate(ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_NAME.getRoute(domain));
return;
}
if (!phoneNumber && !UserUtils.getSecondaryPhoneLogin(loginList)) {
navigate(ROUTES.SETTINGS_WALLET_CARDS_GET_PHYSICAL_PHONE.getRoute(domain));
navigate(ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_PHONE.getRoute(domain));
return;
}
if (!address) {
navigate(ROUTES.SETTINGS_WALLET_CARDS_GET_PHYSICAL_ADDRESS.getRoute(domain));
navigate(ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_ADDRESS.getRoute(domain));
return;
}

navigate(ROUTES.SETTINGS_WALLET_CARDS_GET_PHYSICAL_CONFIRM.getRoute(domain));
navigate(ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_CONFIRM.getRoute(domain));
}

export default {
Expand Down
16 changes: 8 additions & 8 deletions src/libs/Navigation/linkingConfig.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,20 +81,20 @@ export default {
path: ROUTES.SETTINGS_REPORT_FRAUD.route,
exact: true,
},
[SCREENS.SETTINGS.WALLET_CARDS_GET_PHYSICAL.NAME]: {
path: ROUTES.SETTINGS_WALLET_CARDS_GET_PHYSICAL_NAME.route,
[SCREENS.SETTINGS.WALLET_CARD_GET_PHYSICAL.NAME]: {
path: ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_NAME.route,
exact: true,
},
[SCREENS.SETTINGS.WALLET_CARDS_GET_PHYSICAL.PHONE]: {
path: ROUTES.SETTINGS_WALLET_CARDS_GET_PHYSICAL_PHONE.route,
[SCREENS.SETTINGS.WALLET_CARD_GET_PHYSICAL.PHONE]: {
path: ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_PHONE.route,
exact: true,
},
[SCREENS.SETTINGS.WALLET_CARDS_GET_PHYSICAL.ADDRESS]: {
path: ROUTES.SETTINGS_WALLET_CARDS_GET_PHYSICAL_ADDRESS.route,
[SCREENS.SETTINGS.WALLET_CARD_GET_PHYSICAL.ADDRESS]: {
path: ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_ADDRESS.route,
exact: true,
},
[SCREENS.SETTINGS.WALLET_CARDS_GET_PHYSICAL.CONFIRM]: {
path: ROUTES.SETTINGS_WALLET_CARDS_GET_PHYSICAL_CONFIRM.route,
[SCREENS.SETTINGS.WALLET_CARD_GET_PHYSICAL.CONFIRM]: {
path: ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_CONFIRM.route,
exact: true,
},
Settings_Wallet_EnablePayments: {
Expand Down
0 ...tings/Wallet/Cards/BaseGetPhysicalCard.js → ...ttings/Wallet/Card/BaseGetPhysicalCard.js
View file
File renamed without changes.
0 ...gs/Wallet/Cards/GetPhysicalCardAddress.js → ...ngs/Wallet/Card/GetPhysicalCardAddress.js
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...gs/Wallet/Cards/GetPhysicalCardConfirm.js → ...ngs/Wallet/Card/GetPhysicalCardConfirm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ import * as PersonalDetailsUtils from '../../../../libs/PersonalDetailsUtils';
import * as UserUtils from '../../../../libs/UserUtils';

const goToGetPhysicalCardName = (domain) => {
Navigation.navigate(ROUTES.SETTINGS_WALLET_CARDS_GET_PHYSICAL_NAME.getRoute(domain));
Navigation.navigate(ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_NAME.getRoute(domain));
};

const goToGetPhysicalCardPhone = (domain) => {
Navigation.navigate(ROUTES.SETTINGS_WALLET_CARDS_GET_PHYSICAL_PHONE.getRoute(domain));
Navigation.navigate(ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_PHONE.getRoute(domain));
};

const goToGetPhysicalCardAddress = (domain) => {
Navigation.navigate(ROUTES.SETTINGS_WALLET_CARDS_GET_PHYSICAL_ADDRESS.getRoute(domain));
Navigation.navigate(ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_ADDRESS.getRoute(domain));
};

const propTypes = {
Expand Down
0 ...tings/Wallet/Cards/GetPhysicalCardName.js → ...ttings/Wallet/Card/GetPhysicalCardName.js
View file
File renamed without changes.
0 ...ings/Wallet/Cards/GetPhysicalCardPhone.js → ...tings/Wallet/Card/GetPhysicalCardPhone.js
View file
File renamed without changes.

0 comments on commit 4ff162d

Please sign in to comment.