Replace NetworkError instance for the common one

Emurgo · Apr 23, 2024 · 076af12 · 076af12
1 parent 06b6760
commit 076af12
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 34 deletions.
diff --git a/apps/wallet-mobile/src/features/SetupWallet/legacy/SaveNanoX/SaveNanoXScreen.stories.tsx b/apps/wallet-mobile/src/features/SetupWallet/legacy/SaveNanoX/SaveNanoXScreen.stories.tsx
@@ -1,11 +1,11 @@
 import {NavigationRouteContext} from '@react-navigation/native'
 import {action} from '@storybook/addon-actions'
 import {storiesOf} from '@storybook/react-native'
+import {NetworkError} from '@yoroi/common'
 import React from 'react'
 
 import {WalletManager, walletManager} from '../../../../wallet-manager/walletManager'
 import {WalletManagerProvider} from '../../../../wallet-manager/WalletManagerContext'
-import {NetworkError} from '../../../../yoroi-wallets/cardano/errors'
 import {SaveNanoXScreen} from './SaveNanoXScreen'
 
 storiesOf('SaveNanoXScreen', module)

diff --git a/apps/wallet-mobile/src/features/SetupWallet/legacy/SaveNanoX/SaveNanoXScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/legacy/SaveNanoX/SaveNanoXScreen.tsx
@@ -1,3 +1,4 @@
+import {NetworkError} from '@yoroi/common'
 import {useSetupWallet} from '@yoroi/setup-wallet'
 import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
@@ -9,7 +10,6 @@ import {errorMessages} from '../../../../i18n/global-messages'
 import {useMetrics} from '../../../../metrics/metricsManager'
 import {useWalletNavigation} from '../../../../navigation'
 import {AddressMode} from '../../../../wallet-manager/types'
-import {NetworkError} from '../../../../yoroi-wallets/cardano/errors'
 import {useCreateBip44Wallet} from '../../../../yoroi-wallets/hooks'
 import {WalletImplementationId} from '../../../../yoroi-wallets/types'
 import {WalletNameForm} from '../WalletNameForm/WalletNameForm'

diff --git a/...e/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.stories.tsx b/...e/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.stories.tsx
@@ -1,11 +1,11 @@
 import {NavigationRouteContext} from '@react-navigation/native'
 import {action} from '@storybook/addon-actions'
 import {storiesOf} from '@storybook/react-native'
+import {NetworkError} from '@yoroi/common'
 import React from 'react'
 
 import {WalletManager, walletManager} from '../../../../wallet-manager/walletManager'
 import {WalletManagerProvider} from '../../../../wallet-manager/WalletManagerContext'
-import {NetworkError} from '../../../../yoroi-wallets/cardano/errors'
 import {SaveReadOnlyWalletScreen} from './SaveReadOnlyWalletScreen'
 
 storiesOf('SaveReadOnlyWalletScreen', module)

diff --git a/...et-mobile/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx b/...et-mobile/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.tsx
@@ -1,3 +1,4 @@
+import {NetworkError} from '@yoroi/common'
 import {useSetupWallet} from '@yoroi/setup-wallet'
 import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
@@ -12,7 +13,6 @@ import {useWalletNavigation} from '../../../../navigation'
 import {theme} from '../../../../theme'
 import {isEmptyString} from '../../../../utils/utils'
 import {AddressMode} from '../../../../wallet-manager/types'
-import {NetworkError} from '../../../../yoroi-wallets/cardano/errors'
 import {NUMBERS} from '../../../../yoroi-wallets/cardano/numbers'
 import {useCreateBip44Wallet, usePlate} from '../../../../yoroi-wallets/hooks'
 import {NetworkId, WalletImplementationId} from '../../../../yoroi-wallets/types'

diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx
@@ -1,5 +1,5 @@
 import {useFocusEffect} from '@react-navigation/native'
-import {useAsyncStorage} from '@yoroi/common'
+import {NetworkError, useAsyncStorage} from '@yoroi/common'
 import {useSetupWallet} from '@yoroi/setup-wallet'
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
@@ -27,7 +27,7 @@ import {isEmptyString} from '../../../../utils'
 import {AddressMode} from '../../../../wallet-manager/types'
 import {parseWalletMeta} from '../../../../wallet-manager/validators'
 import {useWalletManager} from '../../../../wallet-manager/WalletManagerContext'
-import {InvalidState, NetworkError} from '../../../../yoroi-wallets/cardano/errors'
+import {InvalidState} from '../../../../yoroi-wallets/cardano/errors'
 import {useCreateWallet, useOpenWallet, usePlate, useWalletNames} from '../../../../yoroi-wallets/hooks'
 import {WalletImplementationId} from '../../../../yoroi-wallets/types'
 import {
@@ -233,7 +233,7 @@ export const WalletDetailsScreen = () => {
   ])
 
   React.useEffect(() => {
-    if (showRestoreWalletInfoModal) showModalTipsPassword()
+    if (showRestoreWalletInfoModal === true) showModalTipsPassword()
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [showRestoreWalletInfoModal])
 

diff --git a/...let-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx b/...let-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx
@@ -1,5 +1,5 @@
 import {useFocusEffect} from '@react-navigation/native'
-import {useAsyncStorage} from '@yoroi/common'
+import {NetworkError, useAsyncStorage} from '@yoroi/common'
 import {useSetupWallet} from '@yoroi/setup-wallet'
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
@@ -28,7 +28,7 @@ import {isEmptyString} from '../../../../utils'
 import {AddressMode} from '../../../../wallet-manager/types'
 import {parseWalletMeta} from '../../../../wallet-manager/validators'
 import {useWalletManager} from '../../../../wallet-manager/WalletManagerContext'
-import {InvalidState, NetworkError} from '../../../../yoroi-wallets/cardano/errors'
+import {InvalidState} from '../../../../yoroi-wallets/cardano/errors'
 import {useCreateWallet, useOpenWallet, usePlate, useWalletNames} from '../../../../yoroi-wallets/hooks'
 import {WalletImplementationId} from '../../../../yoroi-wallets/types'
 import {

diff --git a/...let-mobile/src/features/WalletManager/SelectWalletFromList/SelectWalletFromListScreen.tsx b/...let-mobile/src/features/WalletManager/SelectWalletFromList/SelectWalletFromListScreen.tsx
@@ -1,4 +1,5 @@
 import {useFocusEffect, useNavigation} from '@react-navigation/native'
+import {NetworkError} from '@yoroi/common'
 import {useSetupWallet} from '@yoroi/setup-wallet'
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
@@ -16,7 +17,7 @@ import {useWalletNavigation} from '../../../navigation'
 import {WalletMeta} from '../../../wallet-manager/types'
 import {useWalletManager} from '../../../wallet-manager/WalletManagerContext'
 import * as HASKELL_SHELLEY from '../../../yoroi-wallets/cardano/constants/mainnet/constants'
-import {InvalidState, NetworkError} from '../../../yoroi-wallets/cardano/errors'
+import {InvalidState} from '../../../yoroi-wallets/cardano/errors'
 import {isJormungandr} from '../../../yoroi-wallets/cardano/networks'
 import {useOpenWallet, useWalletMetas} from '../../../yoroi-wallets/hooks'
 import {useLinksRequestWallet} from '../../Links/common/useLinksRequestWallet'

diff --git a/apps/wallet-mobile/src/legacy/DeveloperScreen.tsx b/apps/wallet-mobile/src/legacy/DeveloperScreen.tsx
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import {useNavigation} from '@react-navigation/native'
+import {NetworkError} from '@yoroi/common'
 import {useTheme} from '@yoroi/theme'
 import assert from 'assert'
 import ExtendableError from 'es6-error'
@@ -19,7 +20,6 @@ import {errorMessages} from '../i18n/global-messages'
 import {storageVersionMaker} from '../migrations/storageVersion'
 import {AppRoutes, useWalletNavigation} from '../navigation'
 import {isEmptyString} from '../utils/utils'
-import {NetworkError} from '../yoroi-wallets/cardano/errors'
 import {generateAdaMnemonic} from '../yoroi-wallets/cardano/mnemonic'
 import {useCreateWallet} from '../yoroi-wallets/hooks'
 import {rootStorage} from '../yoroi-wallets/storage/rootStorage'

diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/api/fetch.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/api/fetch.ts
@@ -1,10 +1,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import {NetworkError} from '@yoroi/common'
 import {Platform} from 'react-native'
 import DeviceInfo from 'react-native-device-info'
 
 import {Logger} from '../../logging'
 import type {BackendConfig} from '../../types/other'
-import {ApiError, ApiHistoryError, NetworkError} from '../errors'
+import {ApiError, ApiHistoryError} from '../errors'
 
 type RequestMethod = 'POST' | 'GET'
 

diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/errors.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/errors.ts
@@ -17,16 +17,6 @@ export class ApiError extends LocalizableError {
   }
 }
 
-// thrown when api failed to connect to the server
-export class NetworkError extends LocalizableError {
-  constructor() {
-    super({
-      id: errorMessages.networkError.message.id,
-      defaultMessage: errorMessages.networkError.message.defaultMessage || '',
-    })
-  }
-}
-
 // thrown by the backend after a rollback
 export class ApiHistoryError extends ApiError {
   public static readonly errors = {

diff --git a/...bile/translations/messages/src/features/SetupWallet/legacy/SaveNanoX/SaveNanoXScreen.json b/...bile/translations/messages/src/features/SetupWallet/legacy/SaveNanoX/SaveNanoXScreen.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 80,
       "column": 30,
-      "index": 2604
+      "index": 2577
     },
     "end": {
       "line": 83,
       "column": 3,
-      "index": 2741
+      "index": 2714
     }
   }
 ]
diff --git a/...messages/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.json b/...messages/src/features/SetupWallet/legacy/SaveReadOnlyWallet/SaveReadOnlyWalletScreen.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 143,
       "column": 21,
-      "index": 4260
+      "index": 4233
     },
     "end": {
       "line": 146,
       "column": 3,
-      "index": 4387
+      "index": 4360
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 147,
       "column": 17,
-      "index": 4406
+      "index": 4379
     },
     "end": {
       "line": 150,
       "column": 3,
-      "index": 4520
+      "index": 4493
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 151,
       "column": 22,
-      "index": 4544
+      "index": 4517
     },
     "end": {
       "line": 154,
       "column": 3,
-      "index": 4668
+      "index": 4641
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 155,
       "column": 7,
-      "index": 4677
+      "index": 4650
     },
     "end": {
       "line": 158,
       "column": 3,
-      "index": 4775
+      "index": 4748
     }
   },
   {
@@ -66,12 +66,12 @@
     "start": {
       "line": 159,
       "column": 18,
-      "index": 4795
+      "index": 4768
     },
     "end": {
       "line": 162,
       "column": 3,
-      "index": 4916
+      "index": 4889
     }
   }
 ]