Merge remote-tracking branch 'origin/develop' into refactor/catalyst-…

…voting
Emurgo · Aug 30, 2024 · f21f4e0 · f21f4e0
2 parents 266894e + d49a778
commit f21f4e0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/apps/wallet-mobile/src/AppNavigator.tsx b/apps/wallet-mobile/src/AppNavigator.tsx
@@ -184,6 +184,7 @@ export const AppNavigator = () => {
                 screenOptions={{
                   presentation: 'transparentModal',
                   ...(Platform.OS === 'android' && {...TransitionPresets.DefaultTransition}), // overriding general navigation settings
+                  cardStyle: {backgroundColor: 'transparent'}, // this is needed for the modal to be transparent
                 }}
               >
                 <Stack.Screen name="modal" component={ModalScreen} />

diff --git a/apps/wallet-mobile/src/kernel/navigation.tsx b/apps/wallet-mobile/src/kernel/navigation.tsx
@@ -59,7 +59,7 @@ export const defaultStackNavigationOptions = (atoms: Atoms, color: ThemedPalette
     ...(Platform.OS === 'android' && {...TransitionPresets.SlideFromRightIOS}),
     detachPreviousScreen: false /* https://github.com/react-navigation/react-navigation/issues/9883 */,
     cardStyle: {
-      backgroundColor: 'transparent',
+      backgroundColor: color.bg_color_max,
     },
     cardOverlay: () => (
       <View

diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts
@@ -10,7 +10,6 @@ import assert from 'assert'
 import {BigNumber} from 'bignumber.js'
 import {Buffer} from 'buffer'
 import _ from 'lodash'
-import DeviceInfo from 'react-native-device-info'
 import {defaultMemoize} from 'reselect'
 import {Observable} from 'rxjs'
 
@@ -86,7 +85,6 @@ export const makeCardanoWallet = (
   const {BACKEND, NETWORK_CONFIG, PRIMARY_TOKEN, PRIMARY_TOKEN_INFO, TOKEN_INFO_SERVICE} = constants
 
   return class CardanoWallet implements YoroiWallet {
-    readonly version: string
     readonly id: string
 
     readonly encryptedStorage: WalletEncryptedStorage
@@ -123,7 +121,7 @@ export const makeCardanoWallet = (
     readonly primaryTokenInfo: Balance.TokenInfo = PRIMARY_TOKEN_INFO
 
     // =================== create =================== //
-    static build = async ({
+    static readonly build = async ({
       id,
       accountPubKeyHex,
       accountVisual,
@@ -245,7 +243,6 @@ export const makeCardanoWallet = (
 
       this.encryptedStorage = makeWalletEncryptedStorage(id)
 
-      this.version = DeviceInfo.getVersion()
       this.setupSubscriptions()
     }
 

diff --git a/apps/wallet-mobile/translations/messages/src/AppNavigator.json b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
@@ -4,59 +4,59 @@
     "defaultMessage": "!!!Enter PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 231,
+      "line": 232,
       "column": 17,
-      "index": 8343
+      "index": 8456
     },
     "end": {
-      "line": 234,
+      "line": 235,
       "column": 3,
-      "index": 8433
+      "index": 8546
     }
   },
   {
     "id": "components.initialization.custompinscreen.title",
     "defaultMessage": "!!!Set PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 235,
+      "line": 236,
       "column": 18,
-      "index": 8453
+      "index": 8566
     },
     "end": {
-      "line": 238,
+      "line": 239,
       "column": 3,
-      "index": 8551
+      "index": 8664
     }
   },
   {
     "id": "global.actions.dialogs.walletKeysInvalidated.title",
     "defaultMessage": "!!!Auth with OS changes",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 239,
+      "line": 240,
       "column": 25,
-      "index": 8578
+      "index": 8691
     },
     "end": {
-      "line": 242,
+      "line": 243,
       "column": 3,
-      "index": 8692
+      "index": 8805
     }
   },
   {
     "id": "global.actions.dialogs.biometricsChange.message",
     "defaultMessage": "!!!Auth with OS changed detected",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 243,
+      "line": 244,
       "column": 27,
-      "index": 8721
+      "index": 8834
     },
     "end": {
-      "line": 246,
+      "line": 247,
       "column": 3,
-      "index": 8842
+      "index": 8955
     }
   }
 ]