fix imports

abdel-h66 · Nov 30, 2023 · a0ab476 · a0ab476
1 parent c034e71
commit a0ab476
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 39 deletions.
diff --git a/src/components/Icon/BankIcons.ts b/src/components/Icon/BankIcons.ts
@@ -24,63 +24,73 @@ function getAssetIcon(bankNameKey: BankNameKey, isCard: boolean): React.FC<SvgPr
     // Depending on whether 'isCard' is true, it selects either a card icon or a bank icon.
     const iconMappings = {
         [CONST.BANK_NAMES.EXPENSIFY]: isCard
-            ? (require('@assets/images/cardicons/expensify-card-dark.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/expensify.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/expensify-card-dark.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/expensify.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.AMERICAN_EXPRESS]: isCard
-            ? (require('@assets/images/cardicons/american-express.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/american-express.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/american-express.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/american-express.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.BANK_OF_AMERICA]: isCard
-            ? (require('@assets/images/cardicons/bank-of-america.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/bank-of-america.svg') as React.FC<SvgProps>),
-        [CONST.BANK_NAMES.BB_T]: isCard ? (require('@assets/images/cardicons/bb-t.svg') as React.FC<SvgProps>) : (require('@assets/images/bankicons/bb-t.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/bank-of-america.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/bank-of-america.svg').default as React.FC<SvgProps>),
+        [CONST.BANK_NAMES.BB_T]: isCard
+            ? (require('@assets/images/cardicons/bb-t.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/bb-t.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.CAPITAL_ONE]: isCard
-            ? (require('@assets/images/cardicons/capital-one.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/capital-one.svg') as React.FC<SvgProps>),
-        [CONST.BANK_NAMES.CHASE]: isCard ? (require('@assets/images/cardicons/chase.svg') as React.FC<SvgProps>) : (require('@assets/images/bankicons/chase.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/capital-one.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/capital-one.svg').default as React.FC<SvgProps>),
+        [CONST.BANK_NAMES.CHASE]: isCard
+            ? (require('@assets/images/cardicons/chase.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/chase.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.CHARLES_SCHWAB]: isCard
-            ? (require('@assets/images/cardicons/charles-schwab.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/charles-schwab.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/charles-schwab.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/charles-schwab.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.CITIBANK]: isCard
-            ? (require('@assets/images/cardicons/citibank.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/citibank.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/citibank.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/citibank.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.CITIZENS_BANK]: isCard
-            ? (require('@assets/images/cardicons/citizens.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/citizens-bank.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/citizens.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/citizens-bank.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.DISCOVER]: isCard
-            ? (require('@assets/images/cardicons/discover.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/discover.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/discover.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/discover.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.FIDELITY]: isCard
-            ? (require('@assets/images/cardicons/fidelity.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/fidelity.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/fidelity.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/fidelity.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.GENERIC_BANK]: isCard
-            ? (require('@assets/images/cardicons/generic-bank-card.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/generic-bank-account.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/generic-bank-card.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/generic-bank-account.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.HUNTINGTON_BANK]: isCard
-            ? (require('@assets/images/cardicons/huntington-bank.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/huntington-bank.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/huntington-bank.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/huntington-bank.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.NAVY_FEDERAL_CREDIT_UNION]: isCard
-            ? (require('@assets/images/cardicons/navy-federal-credit-union.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/navy-federal-credit-union.svg') as React.FC<SvgProps>),
-        [CONST.BANK_NAMES.PNC]: isCard ? (require('@assets/images/cardicons/pnc.svg') as React.FC<SvgProps>) : (require('@assets/images/bankicons/pnc.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/navy-federal-credit-union.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/navy-federal-credit-union.svg').default as React.FC<SvgProps>),
+        [CONST.BANK_NAMES.PNC]: isCard
+            ? (require('@assets/images/cardicons/pnc.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/pnc.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.REGIONS_BANK]: isCard
-            ? (require('@assets/images/cardicons/regions-bank.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/regions-bank.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/regions-bank.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/regions-bank.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.SUNTRUST]: isCard
-            ? (require('@assets/images/cardicons/suntrust.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/suntrust.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/suntrust.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/suntrust.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.TD_BANK]: isCard
-            ? (require('@assets/images/cardicons/td-bank.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/td-bank.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/td-bank.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/td-bank.svg').default as React.FC<SvgProps>),
         [CONST.BANK_NAMES.US_BANK]: isCard
-            ? (require('@assets/images/cardicons/us-bank.svg') as React.FC<SvgProps>)
-            : (require('@assets/images/bankicons/us-bank.svg') as React.FC<SvgProps>),
-        [CONST.BANK_NAMES.USAA]: isCard ? (require('@assets/images/cardicons/usaa.svg') as React.FC<SvgProps>) : (require('@assets/images/bankicons/usaa.svg') as React.FC<SvgProps>),
+            ? (require('@assets/images/cardicons/us-bank.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/us-bank.svg').default as React.FC<SvgProps>),
+        [CONST.BANK_NAMES.USAA]: isCard
+            ? (require('@assets/images/cardicons/usaa.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/usaa.svg').default as React.FC<SvgProps>),
     } as const;
 
     // Fallback to generic bank/card icon
     const iconModule =
         iconMappings[bankValue] ||
-        (isCard ? (require('@assets/images/cardicons/generic-bank-card.svg') as React.FC<SvgProps>) : (require('@assets/images/bankicons/generic-bank-account.svg') as React.FC<SvgProps>));
+        (isCard
+            ? (require('@assets/images/cardicons/generic-bank-card.svg').default as React.FC<SvgProps>)
+            : (require('@assets/images/bankicons/generic-bank-account.svg').default as React.FC<SvgProps>));
     return iconModule;
 }
 

diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js
@@ -29,6 +29,7 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
+import DesktopSignInRedirectPage from '@pages/signin/DesktopSignInRedirectPage';
 import createCustomStackNavigator from './createCustomStackNavigator';
 import defaultScreenOptions from './defaultScreenOptions';
 import getRootNavigatorScreenOptions from './getRootNavigatorScreenOptions';
@@ -40,7 +41,6 @@ const loadSidebarScreen = () => require('../../../pages/home/sidebar/SidebarScre
 const loadValidateLoginPage = () => require('../../../pages/ValidateLoginPage').default;
 const loadLogOutPreviousUserPage = () => require('../../../pages/LogOutPreviousUserPage').default;
 const loadConciergePage = () => require('../../../pages/ConciergePage').default;
-const LoadDesktopSignInRedirectPage = () => require('../../../pages/signin/DesktopSignInRedirectPage').default;
 
 let timezone;
 let currentAccountID;
@@ -338,7 +338,7 @@ function AuthScreens({isUsingMemoryOnlyKeys, lastUpdateIDAppliedToClient, sessio
                 <RootStack.Screen
                     name={SCREENS.DESKTOP_SIGN_IN_REDIRECT}
                     options={screenOptions.fullScreen}
-                    component={LoadDesktopSignInRedirectPage}
+                    component={DesktopSignInRedirectPage}
                 />
             </RootStack.Navigator>
         </View>