Merge branch 'develop' into feat/dapp-cip-30

apps/wallet-mobile/src/Staking/PoolTransition/usePoolTransition.tsx

@@ -6,6 +6,7 @@ import {defineMessages, useIntl} from 'react-intl'
 import {useQuery} from 'react-query'
 
 import {useStakingInfo} from '../../Dashboard/StakePoolInfos'
+import {features} from '../../features'
 import {useSelectedWallet} from '../../features/WalletManager/Context'
 import {YoroiWallet} from '../../yoroi-wallets/cardano/types'
 import {asQuantity, Quantities} from '../../yoroi-wallets/utils'
@@ -39,7 +40,7 @@ export const usePoolTransition = () => {
     retry: false,
     staleTime: 20 * 1000,
     queryKey: [wallet.id, 'poolTransition', currentPoolId],
-    queryFn: () => poolInfoApi.getTransition(currentPoolId),
+    queryFn: () => (features.poolTransition ? poolInfoApi.getTransition(currentPoolId) : null),
   })
 
   const poolTransition = poolTransitionQuery.data ?? null

apps/wallet-mobile/src/components/Icon/Icon.stories.tsx

@@ -266,6 +266,8 @@ storiesOf('Icon', module).add('Gallery', () => {
         <Item icon={<Icon.Reload />} title="Reload" />
 
         <Item icon={<Icon.Square />} title="Square" />
+
+        <Item icon={<Icon.Google />} title="Google" />
       </ScrollView>
     </FilterProvider>
   )

apps/wallet-mobile/src/components/Icon/index.ts

@@ -46,6 +46,7 @@ import {Forward} from './Forward'
 import {Gear} from './Gear'
 import {Github} from './Github'
 import {Globe} from './Globe'
+import {Google} from './Google'
 import {Governance} from './Governance'
 import {HardwareWallet} from './HardwareWallet'
 import {Image} from './Image'
@@ -242,4 +243,5 @@ export const Icon = {
   Share2,
   Reload,
   Square,
+  Google,
 }

apps/wallet-mobile/src/features/Discover/BrowserNavigator.tsx

@@ -1,15 +1,10 @@
 import {createStackNavigator} from '@react-navigation/stack'
-import {useAsyncStorage} from '@yoroi/common'
-import {connectionStorageMaker, dappConnectorMaker, DappConnectorProvider, ResolverWallet} from '@yoroi/dapp-connector'
 import {useTheme} from '@yoroi/theme'
-import {App} from '@yoroi/types'
 import * as React from 'react'
-import {Alert, StyleSheet} from 'react-native'
+import {StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 import {BrowserRoutes} from 'src/navigation'
 
-import {YoroiWallet} from '../../yoroi-wallets/cardano/types'
-import {useSelectedWallet} from '../WalletManager/Context'
 import {BrowseDappScreen} from './useCases/BrowseDapp/BrowseDappScreen'
 import {SearchDappInBrowserScreen} from './useCases/SearchDappInBrowser/SearchDappInBrowserScreen'
 
@@ -18,12 +13,7 @@ const Tab = createStackNavigator<BrowserRoutes>()
 export const BrowserNavigator = () => {
   const {styles} = useStyles()
 
-  const appStorage = useAsyncStorage()
-  const wallet = useSelectedWallet()
-  const manager = React.useMemo(() => createDappConnector(appStorage, wallet), [appStorage, wallet])
-
   return (
-    <DappConnectorProvider manager={manager}>
       <SafeAreaView edges={['left', 'right', 'top']} style={styles.root}>
         <Tab.Navigator
           screenOptions={{
@@ -36,29 +26,9 @@ export const BrowserNavigator = () => {
           <Tab.Screen name="discover-search-dapp-in-browser" component={SearchDappInBrowserScreen} />
         </Tab.Navigator>
       </SafeAreaView>
-    </DappConnectorProvider>
   )
 }
 
-const createDappConnector = (appStorage: App.Storage, wallet: YoroiWallet) => {
-  const handlerWallet: ResolverWallet = {
-    id: wallet.id,
-    networkId: wallet.networkId,
-    getBalance: (tokenId) => wallet.getBalance(tokenId),
-    confirmConnection: async (origin: string) => {
-      return new Promise<boolean>((resolve) => {
-        // TODO: Use modal with translations here instead of alert
-        Alert.alert('Confirm connection', `Do you want to connect to ${origin}?`, [
-          {text: 'Cancel', style: 'cancel', onPress: () => resolve(false)},
-          {text: 'OK', onPress: () => resolve(true)},
-        ])
-      })
-    },
-  }
-  const storage = connectionStorageMaker({storage: appStorage.join('dapp-connections/')})
-  return dappConnectorMaker(storage, handlerWallet)
-}
-
 const useStyles = () => {
   const {theme} = useTheme()
 

apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx

@@ -1,11 +1,17 @@
 import {createStackNavigator} from '@react-navigation/stack'
+import {useAsyncStorage} from '@yoroi/common'
+import {DappConnectorProvider} from '@yoroi/dapp-connector'
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
 
+import {LoadingBoundary} from '../../components'
 import {defaultStackNavigationOptions, DiscoverRoutes} from '../../navigation'
+import {useSelectedWallet} from '../WalletManager/Context'
 import {BrowserNavigator} from './BrowserNavigator'
 import {BrowserProvider} from './common/BrowserProvider'
+import {createDappConnector} from './common/helpers'
 import {useStrings} from './common/useStrings'
+import {ListSkeleton} from './useCases/SelectDappFromList/ListSkeleton'
 import {SelectDappFromListScreen} from './useCases/SelectDappFromList/SelectDappFromListScreen'
 
 const Stack = createStackNavigator<DiscoverRoutes>()
@@ -14,25 +20,33 @@ export const DiscoverNavigator = () => {
   const {theme} = useTheme()
   const strings = useStrings()
 
+  const appStorage = useAsyncStorage()
+  const wallet = useSelectedWallet()
+  const manager = React.useMemo(() => createDappConnector(appStorage, wallet), [appStorage, wallet])
+
   return (
-    <BrowserProvider>
-      <Stack.Navigator
-        screenOptions={{
-          ...defaultStackNavigationOptions(theme),
-          headerLeft: () => null,
-          detachPreviousScreen: false /* https://github.com/react-navigation/react-navigation/issues/9883 */,
-          gestureEnabled: true,
-        }}
-        initialRouteName="discover-select-dapp-from-list"
-      >
-        <Stack.Screen
-          name="discover-select-dapp-from-list"
-          component={SelectDappFromListScreen}
-          options={{title: strings.discoverTitle}}
-        />
+    <DappConnectorProvider manager={manager}>
+      <BrowserProvider>
+        <Stack.Navigator
+          screenOptions={{
+            ...defaultStackNavigationOptions(theme),
+            headerLeft: () => null,
+            detachPreviousScreen: false /* https://github.com/react-navigation/react-navigation/issues/9883 */,
+            gestureEnabled: true,
+          }}
+          initialRouteName="discover-select-dapp-from-list"
+        >
+          <Stack.Screen name="discover-select-dapp-from-list" options={{title: strings.discoverTitle}}>
+            {() => (
+              <LoadingBoundary fallback={<ListSkeleton />}>
+                <SelectDappFromListScreen />
+              </LoadingBoundary>
+            )}
+          </Stack.Screen>
 
-        <Stack.Screen name="discover-browser" component={BrowserNavigator} options={{headerShown: false}} />
-      </Stack.Navigator>
-    </BrowserProvider>
+          <Stack.Screen name="discover-browser" component={BrowserNavigator} options={{headerShown: false}} />
+        </Stack.Navigator>
+      </BrowserProvider>
+    </DappConnectorProvider>
   )
 }