Fix translatoons, coverage, and dapp check

Emurgo · May 20, 2024 · de8481c · de8481c
1 parent 890c479
commit de8481c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/apps/wallet-mobile/src/features/Discover/common/hooks.tsx b/apps/wallet-mobile/src/features/Discover/common/hooks.tsx
@@ -8,6 +8,7 @@ import {Logger} from '../../../yoroi-wallets/logging'
 import {ConfirmRawTxWithOs} from '../../Swap/common/ConfirmRawTx/ConfirmRawTxWithOs'
 import {ConfirmRawTxWithPassword} from '../../Swap/common/ConfirmRawTx/ConfirmRawTxWithPassword'
 import {walletConfig} from './wallet-config'
+import {useStrings} from './useStrings'
 
 export const useConnectWalletToWebView = (wallet: YoroiWallet, webViewRef: React.RefObject<WebView | null>) => {
   const {manager, sessionId} = useDappConnector()
@@ -57,6 +58,8 @@ const getInitScript = (sessionId: string, dappConnector: DappConnectorManager) =
 
 export const useConfirmRawTx = (wallet: YoroiWallet) => {
   const {openModal, closeModal} = useModal()
+  const strings = useStrings()
+  const modalHeight = 350
 
   return ({onConfirm, onClose}: {onConfirm: (rootKey: string) => Promise<void>; onClose: () => void}) => {
     const handleOnConfirm = async (rootKey: string) => {
@@ -70,10 +73,10 @@ export const useConfirmRawTx = (wallet: YoroiWallet) => {
     }
 
     if (wallet.isEasyConfirmationEnabled) {
-      openModal('Confirm TX', <ConfirmRawTxWithOs onConfirm={handleOnConfirm} />, undefined, onClose)
+      openModal(strings.confirmTx, <ConfirmRawTxWithOs onConfirm={handleOnConfirm} />, modalHeight, onClose)
       return
     }
 
-    openModal('Confirm TX', <ConfirmRawTxWithPassword onConfirm={handleOnConfirm} />, undefined, onClose)
+    openModal(strings.confirmTx, <ConfirmRawTxWithPassword onConfirm={handleOnConfirm} />, modalHeight, onClose)
   }
 }
diff --git a/apps/wallet-mobile/src/features/Discover/common/useStrings.tsx b/apps/wallet-mobile/src/features/Discover/common/useStrings.tsx
@@ -23,11 +23,16 @@ export const useStrings = () => {
     confirmConnectionModalAllowThisDAppTo: intl.formatMessage(messages.confirmConnectionModalAllowThisDAppTo),
     confirmConnectionModalPermission1: intl.formatMessage(messages.confirmConnectionModalPermission1),
     confirmConnectionModalPermission2: intl.formatMessage(messages.confirmConnectionModalPermission2),
+    confirmTx: intl.formatMessage(messages.confirmTx),
   }).current
 }
 
 export const messages = Object.freeze(
   defineMessages({
+    confirmTx: {
+      id: 'global.confirmationTransaction',
+      defaultMessage: '!!!Confirm transaction',
+    },
     discoverTitle: {
       id: 'discover.discoverList.discoverTitle',
       defaultMessage: '!!!Discover Cardano',

diff --git a/...et-mobile/src/features/Discover/useCases/SelectDappFromList/DAppListItem/DAppListItem.tsx b/...et-mobile/src/features/Discover/useCases/SelectDappFromList/DAppListItem/DAppListItem.tsx
@@ -33,7 +33,7 @@ export const DAppListItem = ({dApp, connected, onPress}: Props) => {
 
   const [isPressed, setIsPressed] = React.useState(false)
 
-  const logo = dApp.logo.length === 0 ? getDappFallbackLogo(dApp.origins[0]) : dApp.logo
+  const logo = dApp.logo.length === 0 ? getDappFallbackLogo(dApp.uri) : dApp.logo
 
   const handlePressing = (isPressIn: boolean) => {
     setIsPressed(isPressIn)
@@ -97,13 +97,7 @@ export const DAppListItem = ({dApp, connected, onPress}: Props) => {
       onPress={handlePress}
     >
       <View style={styles.dAppItemContainer}>
-        {isGoogleSearchItem(dApp) ? (
-          <Icon.Google />
-        ) : (
-          <View>
-            <Image source={{uri: logo}} style={styles.dAppLogo} />
-          </View>
-        )}
+        {isGoogleSearchItem(dApp) ? <Icon.Google /> : <Image source={{uri: logo}} style={styles.dAppLogo} />}
 
         <View style={styles.flexFull}>
           <Text numberOfLines={1} style={styles.nameText}>

diff --git a/packages/dapp-connector/package.json b/packages/dapp-connector/package.json
@@ -107,7 +107,7 @@
     "src/connector.js"
   ],
   "jest": {
-    "collectCoverage": false,
+    "collectCoverage": true,
     "coveragePathIgnorePatterns": [
       "connector.js",
       "manager.mocks.ts"