KeySettings: Fix - Remove old LogAction by logManager

declarations.d.ts

@@ -30,4 +30,6 @@ declare module '@env' {
   export const BASESCAN_API_KEY: string;
   export const TEST_MODE_NETWORK: string;
   export const SENTRY_DSN: string;
+  export const REGTEST_BASE_BITPAY_URL: string;
+  export const STATIC_CONTENT_CARDS_ENABLED: string;
 }

src/components/modal/bottom-notification/BottomNotification.tsx

@@ -1,4 +1,4 @@
-import React, {ReactChild, useEffect, useMemo, useCallback} from 'react';
+import React, {ReactNode, useEffect, useMemo, useCallback} from 'react';
 import {Platform} from 'react-native';
 import {ScrollView} from 'react-native-gesture-handler';
 import SheetModal from '../base/sheet/SheetModal';
@@ -40,7 +40,7 @@ export interface BottomNotificationConfig {
     action: (rootState: RootState) => any;
   }>;
   code?: string;
-  message2?: ReactChild;
+  message2?: ReactNode;
   enableBackdropDismiss: boolean;
   onBackdropDismiss?: () => void;
 }

src/constants/config.ts

@@ -1,4 +1,3 @@
-// @ts-ignore
 import {
   REGTEST_BASE_BITPAY_URL,
   STATIC_CONTENT_CARDS_ENABLED as STATIC_CONTENT_CARDS_ENABLED_ENV,

src/navigation/tabs/home/hooks/usePortfolioAssetRows.ts

@@ -123,7 +123,8 @@ const usePortfolioAssetRows = ({gainLossMode, keyId}: Args): Result => {
     return getDisplayAssetRowItems(items);
   }, [items]);
 
-  const populateLoadingByKeyPrevRef = useRef<Record<string, boolean>>();
+  const populateLoadingByKeyPrevRef =
+    useRef<Record<string, boolean>>(undefined);
   const isPopulateLoadingByKey = useMemo(() => {
     if (!isPopulateInProgress || !walletIdsByAssetKey) {
       return undefined;

src/navigation/tabs/settings/about/screens/PortfolioWalletDebug.tsx

@@ -557,7 +557,7 @@ const PortfolioWalletDebug = ({
                 'WALLET',
               ],
             });
-            portfolioRaw = decrypt.out(parsed as any, 'PORTFOLIO');
+            portfolioRaw = decrypt.out(parsed as any, 'PORTFOLIO', undefined);
           } catch (e) {
             portfolioRaw = null;
           }

src/navigation/wallet/screens/KeySettings.tsx

@@ -53,9 +53,7 @@ import {
 import {
   buildAccountList,
   buildWalletObj,
-  checkEncryptPassword,
   checkPrivateKeyEncrypted,
-  generateKeyExportCode,
   mapAbbreviationAndName,
 } from '../../../store/wallet/utils/wallet';
 import {Key} from '../../../store/wallet/wallet.models';
@@ -76,7 +74,7 @@ import {useTheme} from 'styled-components/native';
 import {IsSVMChain, IsVMChain} from '../../../store/wallet/utils/currency';
 import {useOngoingProcess, useTokenContext} from '../../../contexts';
 import {isTSSKey} from '../../../store/wallet/effects/tss-send/tss-send';
-import {LogActions} from '../../utils/logging';
+import {logManager} from '../../../managers/LogManager';
 
 const WalletSettingsContainer = styled.SafeAreaView`
   flex: 1;
@@ -184,7 +182,7 @@ const KeySettings = () => {
           cta(decryptedKey);
         } catch (e: any) {
           const errStr = e instanceof Error ? e.message : JSON.stringify(e);
-          Logger.error('[KeySettings] Decrypt Error', errStr);
+          logManager.error('[KeySettings] Decrypt Error', errStr);
           await dispatch(AppActions.dismissDecryptPasswordModal());
           await sleep(500); // Wait to close Decrypt Password modal
           dispatch(showBottomNotificationModal(WrongPasswordError()));

src/store/card/card.effects.ts

@@ -599,8 +599,8 @@ export const startAddToGooglePay =
       const errMsg = err instanceof Error ? err.message : JSON.stringify(err);
       logManager.error(`googlePay - completePushProvisionError - ${errMsg}`);
 
-      if (e instanceof Error) {
-        if (['CANCELED'].includes(e.message)) {
+      if (err instanceof Error) {
+        if (['CANCELED'].includes(err.message)) {
           return;
         }
       }

tsconfig.json

@@ -47,6 +47,7 @@
     // "types": [],                           /* Type declaration files to be included in compilation. */
     "allowSyntheticDefaultImports": true,     /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "resolveJsonModule": true,                  
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
     "skipLibCheck": false                      /* Skip type checking of declaration files. */
 
@@ -61,6 +62,14 @@
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
   },
   "exclude": [
-    "node_modules", "babel.config.js", "metro.config.js", "jest.config.js", "android", "ios", "**/node_modules", "**/Pods"
+    "node_modules",
+    "babel.config.js",
+    "metro.config.js",
+    "jest.config.js",
+    "android",
+    "ios",
+    "**/node_modules",
+    "**/Pods",
+    "__mocks__"
   ]
 }