Merge branch 'develop' into bump/rn73

apps/wallet-mobile/android/app/build.gradle

@@ -72,8 +72,8 @@ android {
         applicationId "com.emurgo"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 624
-        versionName "4.25.1"
+        versionCode 682
+        versionName "4.27.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }

apps/wallet-mobile/ios/NightlySpashScreen.storyboard

@@ -29,7 +29,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" image="BootSplashLogoNightly" translatesAutoresizingMaskIntoConstraints="NO" id="d1G-66-mAJ">
-                                <rect key="frame" x="74" y="295" width="245" height="263"/>
+                                <rect key="frame" x="74" y="293" width="245" height="263"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
                         </subviews>
@@ -51,6 +51,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="BootSplashLogoNightly" width="218" height="223"/>
+        <image name="BootSplashLogoNightly" width="239" height="223"/>
     </resources>
 </document>

apps/wallet-mobile/ios/nightly.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.25.1</string>
+	<string>4.27.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>513</string>
+	<string>569</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj

@@ -899,7 +899,7 @@
 				CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 513;
+				CURRENT_PROJECT_VERSION = 569;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -944,7 +944,7 @@
 				CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 513;
+				CURRENT_PROJECT_VERSION = 569;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.production";
@@ -1143,7 +1143,7 @@
 				CODE_SIGN_ENTITLEMENTS = nightly.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 513;
+				CURRENT_PROJECT_VERSION = 569;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -1188,7 +1188,7 @@
 				CODE_SIGN_ENTITLEMENTS = nightly.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 513;
+				CURRENT_PROJECT_VERSION = 569;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";

apps/wallet-mobile/ios/yoroi/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.25.1</string>
+	<string>4.27.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>513</string>
+	<string>569</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

apps/wallet-mobile/ios/yoroiTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.25.1</string>
+	<string>4.27.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>513</string>
+	<string>569</string>
 </dict>
 </plist>

apps/wallet-mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yoroi/wallet-mobile",
-  "version": "4.25.1",
+  "version": "4.27.0",
   "private": true,
   "scripts": {
     "android-bundle": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res",
@@ -128,12 +128,13 @@
     "@yoroi/api": "1.5.1",
     "@yoroi/common": "1.5.2",
     "@yoroi/exchange": "2.0.1",
+    "@yoroi/explorers": "1.0.0",
     "@yoroi/links": "1.5.4",
     "@yoroi/portfolio": "1.0.0",
-    "@yoroi/resolver": "2.0.4",
+    "@yoroi/resolver": "2.0.5",
     "@yoroi/setup-wallet": "1.0.0",
     "@yoroi/staking": "1.5.1",
-    "@yoroi/swap": "1.5.3",
+    "@yoroi/swap": "1.6.0",
     "@yoroi/theme": "^1.0.0",
     "@yoroi/transfer": "1.0.0",
     "add": "2.0.6",

apps/wallet-mobile/src/AppNavigator.tsx

@@ -20,13 +20,19 @@ import {AgreementChangedNavigator, InitializationNavigator} from './features/Ini
 import {LegalAgreement, useLegalAgreement} from './features/Initialization/common'
 import {useDeepLinkWatcher} from './features/Links/common/useDeepLinkWatcher'
 import {PortfolioScreen} from './features/Portfolio/useCases/PortfolioScreen'
-import {AddWalletNavigator} from './features/SetupWallet/SetupWalletNavigator'
+import {SetupWalletNavigator} from './features/SetupWallet/SetupWalletNavigator'
+import {
+  ChooseBiometricLoginScreen,
+  useShowBiometricsScreen,
+} from './features/SetupWallet/useCases/ChooseBiometricLogin/ChooseBiometricLoginScreen'
+import {useWalletManager} from './features/WalletManager/context/WalletManagerContext'
 import {CONFIG} from './legacy/config'
 import {DeveloperScreen} from './legacy/DeveloperScreen'
 import {AppRoutes} from './navigation'
 import {SearchProvider} from './Search/SearchContext'
 import {WalletNavigator} from './WalletNavigator'
 import {AuthSetting, useAuthSetting, useAuthWithOs, useIsAuthOsSupported} from './yoroi-wallets/auth'
+import {useHasWallets} from './yoroi-wallets/hooks'
 
 const Stack = createStackNavigator<AppRoutes>()
 const navRef = React.createRef<NavigationContainerRef<ReactNavigation.RootParamList>>()
@@ -37,10 +43,17 @@ export const AppNavigator = () => {
   const strings = useStrings()
   const [routeName, setRouteName] = React.useState<string>()
   useStatusBar(routeName)
-
+  const {showBiometricsScreen} = useShowBiometricsScreen()
+  const isAuthOsSupported = useIsAuthOsSupported()
+  const authSetting = useAuthSetting()
+  const walletManager = useWalletManager()
+  const {hasWallets} = useHasWallets(walletManager)
   useHideScreenInAppSwitcher()
+
   useAutoLogout()
 
+  const shouldAskToUseAuthWithOs = showBiometricsScreen && isAuthOsSupported && authSetting !== 'os'
+
   const {isLoggedIn, isLoggedOut, login} = useAuth()
   const {authWithOs} = useAuthWithOs({
     onSuccess: login,
@@ -135,7 +148,23 @@ export const AppNavigator = () => {
           {isLoggedIn && (
             <>
               <Stack.Group>
-                <Stack.Screen name="app-root">
+                {!hasWallets && shouldAskToUseAuthWithOs && (
+                  <Stack.Screen //
+                    name="choose-biometric-login"
+                    options={{headerShown: false}}
+                    component={ChooseBiometricLoginScreen}
+                  />
+                )}
+
+                {!hasWallets && !shouldAskToUseAuthWithOs && (
+                  <Stack.Screen //
+                    name="setup-wallet"
+                    options={{headerShown: false}}
+                    component={SetupWalletNavigator}
+                  />
+                )}
+
+                <Stack.Screen name="manage-wallets">
                   {() => (
                     <SearchProvider>
                       <TransferProvider>
@@ -144,8 +173,6 @@ export const AppNavigator = () => {
                     </SearchProvider>
                   )}
                 </Stack.Screen>
-
-                <Stack.Screen name="new-wallet" component={AddWalletNavigator} />
               </Stack.Group>
 
               <Stack.Group screenOptions={{presentation: 'transparentModal'}}>

apps/wallet-mobile/src/Catalyst/ConfirmVotingTx.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import React, {useState} from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 import {ScrollView, StyleSheet} from 'react-native'
@@ -7,7 +6,7 @@ import {SafeAreaView} from 'react-native-safe-area-context'
 import {KeyboardAvoidingView, ProgressStep, Spacer, TextInput} from '../components'
 import {ConfirmTx} from '../components/ConfirmTx'
 import {debugWalletInfo, features} from '../features'
-import {useSelectedWallet} from '../features/WalletManager/Context'
+import {useSelectedWallet} from '../features/WalletManager/context/SelectedWalletContext'
 import {Instructions as HWInstructions} from '../HW'
 import {errorMessages, txLabels} from '../i18n/global-messages'
 import LocalizableError from '../i18n/LocalizableError'
@@ -138,6 +137,7 @@ const useStrings = () => {
 
   return {
     errorMessage: (error: LocalizableError) =>
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       intl.formatMessage({id: error.id, defaultMessage: error.defaultMessage}, (error as any).values),
     fees: intl.formatMessage(txLabels.fees),
     subTitle: intl.formatMessage(messages.subTitle),

apps/wallet-mobile/src/Catalyst/DownloadCatalyst.tsx

@@ -9,7 +9,7 @@ import playstoreBadge from '../assets/img/google-play-badge.png'
 import AppDownload from '../assets/img/pic-catalyst-step1.png'
 import {Button, ProgressStep, Spacer, StandardModal, Text} from '../components'
 import {useStakingInfo} from '../Dashboard/StakePoolInfos'
-import {useSelectedWallet} from '../features/WalletManager/Context'
+import {useSelectedWallet} from '../features/WalletManager/context/SelectedWalletContext'
 import globalMessages, {confirmationMessages} from '../i18n/global-messages'
 import {Logger} from '../legacy/logging'
 import {Actions, Row} from './components'

apps/wallet-mobile/src/Catalyst/InsufficientFundsModal.tsx

@@ -4,7 +4,7 @@ import {useIntl} from 'react-intl'
 import {StyleSheet, Text, View} from 'react-native'
 
 import {StandardModal} from '../components'
-import {useSelectedWallet} from '../features/WalletManager/Context'
+import {useSelectedWallet} from '../features/WalletManager/context/SelectedWalletContext'
 import globalMessages, {confirmationMessages} from '../i18n/global-messages'
 import {formatTokenWithText} from '../legacy/format'
 import {CATALYST} from '../yoroi-wallets/cardano/utils'

apps/wallet-mobile/src/Catalyst/VotingBanner.stories.tsx

@@ -2,7 +2,7 @@ import {action} from '@storybook/addon-actions'
 import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
-import {SelectedWalletProvider} from '../features/WalletManager/Context'
+import {SelectedWalletProvider} from '../features/WalletManager/context/SelectedWalletContext'
 import {mocks} from '../yoroi-wallets/mocks'
 import {VotingBanner} from './VotingBanner'
 

apps/wallet-mobile/src/Catalyst/VotingBanner.tsx

@@ -5,7 +5,7 @@ import {defineMessages, useIntl} from 'react-intl'
 import {StyleSheet, TouchableOpacity, View} from 'react-native'
 
 import {Icon, Text} from '../components'
-import {useSelectedWallet} from '../features/WalletManager/Context'
+import {useSelectedWallet} from '../features/WalletManager/context/SelectedWalletContext'
 import globalMessages, {confirmationMessages} from '../i18n/global-messages'
 import {isNightly} from '../legacy/config'
 import {Logger} from '../legacy/logging'

apps/wallet-mobile/src/Catalyst/VotingRegistration.stories.tsx

@@ -5,7 +5,7 @@ import React from 'react'
 
 import {QueryProvider, WithModalProps} from '../../.storybook/decorators'
 import {Boundary} from '../components'
-import {SelectedWalletProvider} from '../features/WalletManager/Context'
+import {SelectedWalletProvider} from '../features/WalletManager/context/SelectedWalletContext'
 import {YoroiWallet} from '../yoroi-wallets/cardano/types'
 import {mocks} from '../yoroi-wallets/mocks'
 import {ConfirmPin} from './ConfirmPin'

apps/wallet-mobile/src/Dashboard/Dashboard.stories.tsx

@@ -2,7 +2,7 @@ import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 
 import {QueryProvider} from '../../.storybook/decorators'
-import {SelectedWalletProvider} from '../features/WalletManager/Context'
+import {SelectedWalletProvider} from '../features/WalletManager/context/SelectedWalletContext'
 import {YoroiWallet} from '../yoroi-wallets/cardano/types'
 import {mocks} from '../yoroi-wallets/mocks'
 import {Dashboard} from './Dashboard'

apps/wallet-mobile/src/Dashboard/Dashboard.tsx

@@ -14,7 +14,7 @@ import {
   WithdrawWarningModal,
 } from '../features/Staking/Governance'
 import {useIsGovernanceFeatureEnabled} from '../features/Staking/Governance'
-import {useSelectedWallet} from '../features/WalletManager/Context'
+import {useSelectedWallet} from '../features/WalletManager/context/SelectedWalletContext'
 import globalMessages from '../i18n/global-messages'
 import {Modal} from '../legacy/Modal'
 import {DashboardRoutes, useWalletNavigation} from '../navigation'

apps/wallet-mobile/src/Dashboard/DashboardNavigator.tsx

@@ -7,7 +7,7 @@ import {defineMessages, useIntl} from 'react-intl'
 
 import {SettingsButton} from '../components/Button'
 import {useGovernanceManagerMaker} from '../features/Staking/Governance'
-import {useSelectedWallet} from '../features/WalletManager/Context'
+import {useSelectedWallet} from '../features/WalletManager/context/SelectedWalletContext'
 import {DashboardRoutes, defaultStackNavigationOptions, useWalletNavigation} from '../navigation'
 import {DelegationConfirmation, FailedTxScreen} from '../Staking'
 import {StakingCenter} from '../Staking/StakingCenter'

apps/wallet-mobile/src/Dashboard/StakePoolInfo.tsx

@@ -5,7 +5,7 @@ import {ActivityIndicator, Linking, StyleSheet, View} from 'react-native'
 import {useQuery, UseQueryOptions} from 'react-query'
 
 import {Button, CopyButton, Text, TitledCard} from '../components'
-import {useSelectedWallet} from '../features/WalletManager/Context'
+import {useSelectedWallet} from '../features/WalletManager/context/SelectedWalletContext'
 import {isEmptyString} from '../utils/utils'
 import {YoroiWallet} from '../yoroi-wallets/cardano/types'
 import {StakePoolInfoAndHistory} from '../yoroi-wallets/types'

apps/wallet-mobile/src/Dashboard/StakePoolInfos.stories.tsx

@@ -2,7 +2,7 @@ import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 import {QueryClient, QueryClientProvider} from 'react-query'
 
-import {SelectedWalletProvider} from '../features/WalletManager/Context'
+import {SelectedWalletProvider} from '../features/WalletManager/context/SelectedWalletContext'
 import {YoroiWallet} from '../yoroi-wallets/cardano/types'
 import {mocks} from '../yoroi-wallets/mocks'
 import {StakePoolInfos} from './StakePoolInfos'

apps/wallet-mobile/src/Dashboard/StakePoolInfos.tsx

@@ -4,7 +4,7 @@ import React from 'react'
 import {ActivityIndicator, StyleSheet, View} from 'react-native'
 import {useQuery, useQueryClient, UseQueryOptions} from 'react-query'
 
-import {useSelectedWallet} from '../features/WalletManager/Context'
+import {useSelectedWallet} from '../features/WalletManager/context/SelectedWalletContext'
 import {YoroiWallet} from '../yoroi-wallets/cardano/types'
 import {StakingInfo, YoroiUnsignedTx} from '../yoroi-wallets/types'
 import {Quantities} from '../yoroi-wallets/utils'

apps/wallet-mobile/src/Dashboard/UserSummary.tsx

@@ -6,7 +6,7 @@ import {StyleSheet, View} from 'react-native'
 
 import {Button, Icon, Text, TitledCard} from '../components'
 import {usePrivacyMode} from '../features/Settings/PrivacyMode/PrivacyMode'
-import {useSelectedWallet} from '../features/WalletManager/Context'
+import {useSelectedWallet} from '../features/WalletManager/context/SelectedWalletContext'
 import globalMessages from '../i18n/global-messages'
 import {formatAdaWithText} from '../legacy/format'
 import {asQuantity} from '../yoroi-wallets/utils'

apps/wallet-mobile/src/Dashboard/WithdrawStakingRewards/ConfirmTx/ConfirmTxWithHW.tsx

@@ -2,9 +2,9 @@ import React from 'react'
 import {useIntl} from 'react-intl'
 
 import {Boundary, TwoActionView} from '../../../components'
+import {walletManager} from '../../../features/WalletManager/common/walletManager'
 import {LedgerConnect, LedgerTransportSwitch} from '../../../HW'
 import {confirmationMessages, txLabels} from '../../../i18n/global-messages'
-import {walletManager} from '../../../wallet-manager/walletManager'
 import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
 import {useSignWithHwAndSubmitTx} from '../../../yoroi-wallets/hooks'
 import {DeviceId, DeviceObj, withBLE, withUSB} from '../../../yoroi-wallets/hw'