From 5d72fe9d6d13c7c0a60c77a2864d2f4cc441005f Mon Sep 17 00:00:00 2001
From: Michal S <miso.szorad@gmail.com>
Date: Wed, 22 May 2024 18:45:38 +0100
Subject: [PATCH 1/2] feat(dapp-connector): Add CIP-30 support (#3225)

---
 .../.storybook/storybook.requires.js          |   1 +
 apps/wallet-mobile/ios/Podfile.lock           |   4 +-
 apps/wallet-mobile/package.json               |   2 +-
 .../src/components/Icon/Connection.tsx        |  18 +
 .../src/components/Icon/Icon.stories.tsx      |   4 +
 .../src/components/Icon/YoroiApp.tsx          |  34 ++
 .../src/components/Icon/index.ts              |   4 +
 .../src/components/Modal/ModalContext.tsx     |  26 +-
 .../features/Discover/DiscoverNavigator.tsx   |  61 ++-
 .../common/ConfirmConnectionModal.stories.tsx |  39 ++
 .../common/ConfirmConnectionModal.tsx         | 123 ++++++
 .../src/features/Discover/common/helpers.ts   |  52 ++-
 .../Discover/common/{hooks.ts => hooks.tsx}   |  37 +-
 .../Discover/common/useDAppsConnected.tsx     |   3 +-
 .../features/Discover/common/useStrings.tsx   |  35 ++
 .../useCases/BrowseDapp/BrowserTabBar.tsx     |  17 +-
 .../useCases/BrowseDapp/WebViewItem.tsx       |   5 +-
 .../SearchDappInBrowserScreen.tsx             |   5 +-
 .../DAppListItem/DAppListItem.tsx             |  35 +-
 .../SelectDappFromListScreen.tsx              | 217 ++++++-----
 .../wallet-mobile/src/i18n/locales/en-US.json |   8 +-
 .../src/yoroi-wallets/cardano/api/api.ts      |   2 +-
 .../cardano/byron/ByronWallet.ts              |  16 +-
 .../src/yoroi-wallets/cardano/cip30.test.ts   |  91 +++++
 .../src/yoroi-wallets/cardano/cip30.ts        | 363 ++++++++++++++++++
 .../cardano/common/signatureUtils.ts          |  22 +-
 .../cardano/shelley/ShelleyWallet.ts          |  14 +-
 .../src/yoroi-wallets/cardano/types.ts        |  14 +-
 .../src/yoroi-wallets/cardano/utils.ts        |   2 +-
 .../cardano/utxoManager/types.ts              |   1 +
 .../cardano/utxoManager/utxos.test.ts         |   4 +-
 .../cardano/utxoManager/utxos.ts              |  29 +-
 .../src/yoroi-wallets/cardano/wrappedCsl.ts   |  62 +++
 .../src/yoroi-wallets/mocks/wallet.ts         |   8 +-
 .../messages/src/Dashboard/Dashboard.json     |   4 +-
 .../features/Discover/common/useStrings.json  | 201 +++++++---
 .../SetupWallet/legacy/WalletForm.json        |  92 +++++
 packages/dapp-connector/src/connector.js      |  20 +-
 .../dapp-connector/src/dapp-connector.test.ts | 218 ++++++++++-
 packages/dapp-connector/src/dapp-connector.ts |  16 +-
 packages/dapp-connector/src/index.ts          |   5 +-
 packages/dapp-connector/src/resolver.ts       | 153 +++++++-
 yarn.lock                                     |  39 +-
 43 files changed, 1771 insertions(+), 335 deletions(-)
 create mode 100644 apps/wallet-mobile/src/components/Icon/Connection.tsx
 create mode 100644 apps/wallet-mobile/src/components/Icon/YoroiApp.tsx
 create mode 100644 apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.stories.tsx
 create mode 100644 apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.tsx
 rename apps/wallet-mobile/src/features/Discover/common/{hooks.ts => hooks.tsx} (59%)
 create mode 100644 apps/wallet-mobile/src/yoroi-wallets/cardano/cip30.test.ts
 create mode 100644 apps/wallet-mobile/src/yoroi-wallets/cardano/cip30.ts
 create mode 100644 apps/wallet-mobile/src/yoroi-wallets/cardano/wrappedCsl.ts
 create mode 100644 apps/wallet-mobile/translations/messages/src/features/SetupWallet/legacy/WalletForm.json

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index 78213ed93d..c214949c1d 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -112,6 +112,7 @@ const getStories = () => {
     "./src/features/Claim/illustrations/Ilustrations.stories.tsx": require("../src/features/Claim/illustrations/Ilustrations.stories.tsx"),
     "./src/features/Claim/useCases/AskConfirmation.stories.tsx": require("../src/features/Claim/useCases/AskConfirmation.stories.tsx"),
     "./src/features/Claim/useCases/ShowSuccessScreen.stories.tsx": require("../src/features/Claim/useCases/ShowSuccessScreen.stories.tsx"),
+    "./src/features/Discover/common/ConfirmConnectionModal.stories.tsx": require("../src/features/Discover/common/ConfirmConnectionModal.stories.tsx"),
     "./src/features/Discover/common/LabelCategoryDApp.stories.tsx": require("../src/features/Discover/common/LabelCategoryDApp.stories.tsx"),
     "./src/features/Discover/common/LabelConnected.stories.tsx": require("../src/features/Discover/common/LabelConnected.stories.tsx"),
     "./src/features/Discover/useCases/BrowseDapp/BrowseDappScreen.stories.tsx": require("../src/features/Discover/useCases/BrowseDapp/BrowseDappScreen.stories.tsx"),
diff --git a/apps/wallet-mobile/ios/Podfile.lock b/apps/wallet-mobile/ios/Podfile.lock
index 9adeb1bc5c..8efec1c935 100644
--- a/apps/wallet-mobile/ios/Podfile.lock
+++ b/apps/wallet-mobile/ios/Podfile.lock
@@ -821,7 +821,7 @@ SPEC CHECKSUMS:
   amplitude-react-native: 1ea3d5e1f80ccc357dd178c55c29e51c89f1cd11
   boost: 57d2868c099736d80fcd648bf211b4431e51a558
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
-  DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
+  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   EXApplication: d8f53a7eee90a870a75656280e8d4b85726ea903
   EXBarCodeScanner: 8e23fae8d267dbef9f04817833a494200f1fce35
   EXCamera: 0fbfa338a3776af2722d626a3437abe33f708aad
@@ -838,7 +838,7 @@ SPEC CHECKSUMS:
   FBLazyVector: 12ea01e587c9594e7b144e1bfc86ac4d9ac28fde
   FBReactNativeSpec: faca7d16c37626ca5780a87adef703817722fe61
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
+  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
   hermes-engine: d7cc127932c89c53374452d6f93473f1970d8e88
   libaom: 144606b1da4b5915a1054383c3a4459ccdb3c661
   libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index 407c76ce46..877a68d992 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -99,7 +99,7 @@
     "@emurgo/csl-mobile-bridge": "6.0.0-alpha.9",
     "@emurgo/react-native-blockies-svg": "^0.0.2",
     "@emurgo/react-native-hid": "^5.15.6",
-    "@emurgo/yoroi-lib": "0.15.4-alpha.6",
+    "@emurgo/yoroi-lib": "0.15.4-alpha.7",
     "@formatjs/intl-datetimeformat": "^6.7.0",
     "@formatjs/intl-getcanonicallocales": "^2.1.0",
     "@formatjs/intl-locale": "^3.2.1",
diff --git a/apps/wallet-mobile/src/components/Icon/Connection.tsx b/apps/wallet-mobile/src/components/Icon/Connection.tsx
new file mode 100644
index 0000000000..389cdee819
--- /dev/null
+++ b/apps/wallet-mobile/src/components/Icon/Connection.tsx
@@ -0,0 +1,18 @@
+import React from 'react'
+import Svg, {Path} from 'react-native-svg'
+
+type Props = {
+  size?: number
+  color?: string
+}
+
+export const Connection = ({size = 36, color = '#000000'}: Props) => {
+  return (
+    <Svg width={size} height={size} viewBox="0 0 21 20" fill="none">
+      <Path
+        d="M16.207.293a1 1 0 10-1.414 1.414L17.086 4H7.5a1 1 0 000 2h9.586l-2.293 2.293a1 1 0 001.414 1.414l4-4a1 1 0 000-1.414l-4-4zM6.207 10.293a1 1 0 010 1.414L3.914 14H13.5a1 1 0 110 2H3.914l2.293 2.293a1 1 0 11-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z"
+        fill={color}
+      />
+    </Svg>
+  )
+}
diff --git a/apps/wallet-mobile/src/components/Icon/Icon.stories.tsx b/apps/wallet-mobile/src/components/Icon/Icon.stories.tsx
index 5092c39e1d..90023ecf54 100644
--- a/apps/wallet-mobile/src/components/Icon/Icon.stories.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Icon.stories.tsx
@@ -272,6 +272,10 @@ storiesOf('Icon', module).add('Gallery', () => {
         <Item icon={<Icon.Square />} title="Square" />
 
         <Item icon={<Icon.Google />} title="Google" />
+
+        <Item icon={<Icon.Connection />} title="Connection" />
+
+        <Item icon={<Icon.YoroiApp />} title="YoroiApp" />
       </ScrollView>
     </FilterProvider>
   )
diff --git a/apps/wallet-mobile/src/components/Icon/YoroiApp.tsx b/apps/wallet-mobile/src/components/Icon/YoroiApp.tsx
new file mode 100644
index 0000000000..4bcda88191
--- /dev/null
+++ b/apps/wallet-mobile/src/components/Icon/YoroiApp.tsx
@@ -0,0 +1,34 @@
+import React from 'react'
+import Svg, {Defs, LinearGradient, Path, Rect, Stop} from 'react-native-svg'
+
+type Props = {
+  size?: number
+}
+
+export const YoroiApp = ({size = 36}: Props) => {
+  return (
+    <Svg width={size} height={size} viewBox="0 0 49 48" fill="none">
+      <Rect x={0.5} width={48} height={48} rx={8} fill="url(#paint0_linear_16084_126466)" />
+
+      <Path
+        d="M23.702 21.15L10 11h4.304l10.16 7.293L34.674 11H39L25.23 21.15a1.318 1.318 0 01-1.527 0zM29.06 32.771L12.298 20.762v-3.44l19.465 13.834-2.703 1.615zM29.871 25.748l5.948-4.424v-3.3l-8.246 6.039 2.298 1.685zM35.143 29.54l.676-.561v-3.23l-2.974 2.106 2.298 1.686zM12.298 28.205L23.383 36l2.77-1.545-13.855-9.832v3.582z"
+        fill="#fff"
+      />
+
+      <Defs>
+        <LinearGradient
+          id="paint0_linear_16084_126466"
+          x1={50.6518}
+          y1={77.0646}
+          x2={108.781}
+          y2={-23.2391}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#244ABF" />
+
+          <Stop offset={1} stopColor="#4760FF" />
+        </LinearGradient>
+      </Defs>
+    </Svg>
+  )
+}
diff --git a/apps/wallet-mobile/src/components/Icon/index.ts b/apps/wallet-mobile/src/components/Icon/index.ts
index b04759e0c7..25a590bc3b 100644
--- a/apps/wallet-mobile/src/components/Icon/index.ts
+++ b/apps/wallet-mobile/src/components/Icon/index.ts
@@ -20,6 +20,7 @@ import {Clock} from './Clock'
 import {Close} from './Close'
 import {Coins} from './Coins'
 import {Collateral} from './Collateral'
+import {Connection} from './Connection'
 import {Copy} from './Copy'
 import {CopySuccess} from './CopySuccess'
 import {Cross} from './Cross'
@@ -120,6 +121,7 @@ import {Wallets} from './Wallets'
 import {WalletStack} from './WalletStack'
 import {Warning} from './Warning'
 import {WingRiders} from './WingRiders'
+import {YoroiApp} from './YoroiApp'
 import {YoroiNightly} from './YoroiNightly'
 import {YoroiWallet} from './YoroiWallet'
 
@@ -248,4 +250,6 @@ export const Icon = {
   Reload,
   Square,
   Google,
+  Connection,
+  YoroiApp,
 }
diff --git a/apps/wallet-mobile/src/components/Modal/ModalContext.tsx b/apps/wallet-mobile/src/components/Modal/ModalContext.tsx
index 7dd04387ab..7cf9316741 100644
--- a/apps/wallet-mobile/src/components/Modal/ModalContext.tsx
+++ b/apps/wallet-mobile/src/components/Modal/ModalContext.tsx
@@ -1,4 +1,4 @@
-import {useNavigation} from '@react-navigation/native'
+import {NavigationProp, useNavigation} from '@react-navigation/native'
 import React from 'react'
 import {Keyboard} from 'react-native'
 
@@ -10,7 +10,12 @@ type ModalState = {
   isLoading: boolean
 }
 type ModalActions = {
-  openModal: (title: ModalState['title'], content: ModalState['content'], height?: ModalState['height']) => void
+  openModal: (
+    title: ModalState['title'],
+    content: ModalState['content'],
+    height?: ModalState['height'],
+    onClose?: () => void,
+  ) => void
   closeModal: () => void
   startLoading: () => void
   stopLoading: () => void
@@ -35,18 +40,25 @@ export const ModalProvider = ({
 }) => {
   const [state, dispatch] = React.useReducer(modalReducer, {...defaultState, ...initialState})
   const navigation = useNavigation()
+  const onCloseRef = React.useRef<() => void>()
   const actions = React.useRef<ModalActions>({
     closeModal: () => {
-      const lastRouteName = navigation.getState().routes.slice(-1)[0].name
-      if (lastRouteName === 'modal') {
+      if (getLastRouteName(navigation) === 'modal') {
         dispatch({type: 'close'})
         navigation.goBack()
+        onCloseRef.current?.()
       }
     },
-    openModal: (title: ModalState['title'], content: ModalState['content'], height?: ModalState['height']) => {
+    openModal: (
+      title: ModalState['title'],
+      content: ModalState['content'],
+      height?: ModalState['height'],
+      onClose?: () => void,
+    ) => {
       Keyboard.dismiss()
       dispatch({type: 'open', title, content, height})
       navigation.navigate('modal')
+      onCloseRef.current = onClose
     },
     startLoading: () => dispatch({type: 'startLoading'}),
     stopLoading: () => dispatch({type: 'stopLoading'}),
@@ -96,3 +108,7 @@ const defaultState: ModalState = Object.freeze({
   isOpen: false,
   isLoading: false,
 })
+
+const getLastRouteName = (navigation: NavigationProp<ReactNavigation.RootParamList>) => {
+  return navigation.getState().routes.slice(-1)[0].name
+}
diff --git a/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx b/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx
index c07d40ef68..a47550e8cb 100644
--- a/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx
@@ -1,6 +1,6 @@
 import {createStackNavigator} from '@react-navigation/stack'
 import {useAsyncStorage} from '@yoroi/common'
-import {DappConnectorProvider} from '@yoroi/dapp-connector'
+import {DappConnector, DappConnectorProvider} from '@yoroi/dapp-connector'
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
 
@@ -9,7 +9,9 @@ import {defaultStackNavigationOptions, DiscoverRoutes} from '../../navigation'
 import {useSelectedWallet} from '../WalletManager/context/SelectedWalletContext'
 import {BrowserNavigator} from './BrowserNavigator'
 import {BrowserProvider} from './common/BrowserProvider'
+import {useOpenConfirmConnectionModal} from './common/ConfirmConnectionModal'
 import {createDappConnector} from './common/helpers'
+import {useConfirmRawTx} from './common/hooks'
 import {useStrings} from './common/useStrings'
 import {ListSkeleton} from './useCases/SelectDappFromList/ListSkeleton'
 import {SelectDappFromListScreen} from './useCases/SelectDappFromList/SelectDappFromListScreen'
@@ -20,9 +22,7 @@ export const DiscoverNavigator = () => {
   const {atoms, color} = useTheme()
   const strings = useStrings()
 
-  const appStorage = useAsyncStorage()
-  const wallet = useSelectedWallet()
-  const manager = React.useMemo(() => createDappConnector(appStorage, wallet), [appStorage, wallet])
+  const manager = useDappConnectorManager()
 
   return (
     <DappConnectorProvider manager={manager}>
@@ -50,3 +50,56 @@ export const DiscoverNavigator = () => {
     </DappConnectorProvider>
   )
 }
+
+const useDappConnectorManager = () => {
+  const appStorage = useAsyncStorage()
+  const wallet = useSelectedWallet()
+  const {openConfirmConnectionModal} = useOpenConfirmConnectionModal()
+  const confirmRawTx = useConfirmRawTx(wallet)
+
+  const confirmConnection = React.useCallback(
+    async (origin: string, manager: DappConnector) => {
+      const recommendedDApps = await manager.getDAppList()
+      const selectedDapp = recommendedDApps.dapps.find((dapp) => dapp.origins.includes(origin))
+      return new Promise<boolean>((resolve) => {
+        openConfirmConnectionModal({
+          name: selectedDapp?.name ?? origin,
+          website: origin,
+          logo: selectedDapp?.logo ?? '',
+          onConfirm: () => resolve(true),
+          onClose: () => resolve(false),
+        })
+      })
+    },
+    [openConfirmConnectionModal],
+  )
+
+  const signTx = React.useCallback(() => {
+    return new Promise<string>((resolve, reject) => {
+      confirmRawTx({
+        onConfirm: (rootKey) => {
+          resolve(rootKey)
+          return Promise.resolve()
+        },
+        onClose: () => reject(new Error('User rejected')),
+      })
+    })
+  }, [confirmRawTx])
+
+  const signData = React.useCallback(() => {
+    return new Promise<string>((resolve, reject) => {
+      confirmRawTx({
+        onConfirm: (rootKey) => {
+          resolve(rootKey)
+          return Promise.resolve()
+        },
+        onClose: () => reject(new Error('User rejected')),
+      })
+    })
+  }, [confirmRawTx])
+
+  return React.useMemo(
+    () => createDappConnector({appStorage, wallet, confirmConnection, signTx, signData}),
+    [appStorage, wallet, confirmConnection, signTx, signData],
+  )
+}
diff --git a/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.stories.tsx b/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.stories.tsx
new file mode 100644
index 0000000000..840d9ce35e
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.stories.tsx
@@ -0,0 +1,39 @@
+import {action} from '@storybook/addon-actions'
+import {storiesOf} from '@storybook/react-native'
+import * as React from 'react'
+import {View} from 'react-native'
+
+import {Button} from '../../../components'
+import {ConfirmConnectionModal, useOpenConfirmConnectionModal} from './ConfirmConnectionModal'
+
+storiesOf('Discover ConfirmConnectionModal', module)
+  .addDecorator((story) => <View style={{padding: 20}}>{story()}</View>)
+  .add('initial', () => <Initial />)
+  .add('With Button', () => <WithButton />)
+
+const Initial = () => {
+  return (
+    <ConfirmConnectionModal
+      logo="https://daehx1qv45z7c.cloudfront.net/cardano-spot.png"
+      onConfirm={action('onConfirm')}
+      name="Example DApp"
+      website="example.com"
+    />
+  )
+}
+
+const WithButton = () => {
+  const {openConfirmConnectionModal} = useOpenConfirmConnectionModal()
+
+  const handleOnPress = () => {
+    openConfirmConnectionModal({
+      onConfirm: action('onConfirm'),
+      website: 'example.com',
+      name: 'Example DApp',
+      logo: 'https://daehx1qv45z7c.cloudfront.net/cardano-spot.png',
+      onClose: action('onClose'),
+    })
+  }
+
+  return <Button title="Open Modal" shelleyTheme onPress={handleOnPress} />
+}
diff --git a/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.tsx b/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.tsx
new file mode 100644
index 0000000000..811161ca12
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Discover/common/ConfirmConnectionModal.tsx
@@ -0,0 +1,123 @@
+import {useTheme} from '@yoroi/theme'
+import * as React from 'react'
+import {Image, StyleSheet, Text, View} from 'react-native'
+
+import {Button, Icon, Spacer, useModal} from '../../../components'
+import {getDappFallbackLogo} from './helpers'
+import {useStrings} from './useStrings'
+
+type Props = {
+  name: string
+  website: string
+  logo: string
+  onConfirm: () => void
+}
+
+export const confirmConnectionModalHeight = 400
+
+export const useOpenConfirmConnectionModal = () => {
+  const {openModal, closeModal} = useModal()
+  const strings = useStrings()
+  const open = React.useCallback(
+    (props: Props & {onClose: () => void}) => {
+      openModal(
+        strings.confirmConnectionModalTitle,
+        <ConfirmConnectionModal
+          name={props.name}
+          website={props.website}
+          logo={props.logo}
+          onConfirm={() => {
+            props.onConfirm()
+            closeModal()
+          }}
+        />,
+        confirmConnectionModalHeight,
+        props.onClose,
+      )
+    },
+    [openModal, closeModal, strings.confirmConnectionModalTitle],
+  )
+  return {openConfirmConnectionModal: open, closeModal}
+}
+
+export const ConfirmConnectionModal = ({name, website, onConfirm, logo}: Props) => {
+  const {styles, colors} = useStyles()
+  const strings = useStrings()
+
+  return (
+    <View>
+      <View style={styles.imagesLine}>
+        <Icon.YoroiApp size={48} />
+
+        <Icon.Connection size={20} color={colors.connection} />
+
+        <Image source={{uri: logo.length === 0 ? getDappFallbackLogo(website) : logo}} style={styles.image} />
+      </View>
+
+      <Spacer height={8} />
+
+      <View style={styles.line}>
+        <Text style={styles.text}>{strings.confirmConnectionModalConnectTo}</Text>
+
+        <Text style={styles.bold}>{name}</Text>
+      </View>
+
+      <Spacer height={8} />
+
+      <View style={styles.line}>
+        <Text style={styles.text}>{website}</Text>
+      </View>
+
+      <Spacer height={16} />
+
+      <View>
+        <Text style={styles.text}>{strings.confirmConnectionModalAllowThisDAppTo}</Text>
+
+        <Text style={styles.text}>{`\u2022 ${strings.confirmConnectionModalPermission1}`}</Text>
+
+        <Text style={styles.text}>{`\u2022 ${strings.confirmConnectionModalPermission2}`}</Text>
+      </View>
+
+      <Spacer height={46} />
+
+      <Button title={strings.confirmConnectionModalConnect} shelleyTheme onPress={onConfirm} />
+    </View>
+  )
+}
+
+const useStyles = () => {
+  const theme = useTheme()
+  const colors = {connection: theme.color.black_static}
+  const styles = StyleSheet.create({
+    imagesLine: {
+      display: 'flex',
+      flexDirection: 'row',
+      alignItems: 'center',
+      justifyContent: 'center',
+      gap: 24,
+    },
+    image: {
+      width: 48,
+      height: 48,
+    },
+    line: {
+      display: 'flex',
+      flexDirection: 'row',
+      alignItems: 'center',
+      justifyContent: 'center',
+      gap: 4,
+    },
+    text: {
+      color: theme.color.gray_c900,
+      fontSize: 16,
+      lineHeight: 24,
+    },
+    bold: {
+      fontWeight: 'bold',
+      color: theme.color.gray_c900,
+      fontSize: 16,
+      lineHeight: 24,
+    },
+  })
+  return {styles, colors}
+}
diff --git a/apps/wallet-mobile/src/features/Discover/common/helpers.ts b/apps/wallet-mobile/src/features/Discover/common/helpers.ts
index 08046612b9..1888190952 100644
--- a/apps/wallet-mobile/src/features/Discover/common/helpers.ts
+++ b/apps/wallet-mobile/src/features/Discover/common/helpers.ts
@@ -1,8 +1,8 @@
-import {connectionStorageMaker, dappConnectorMaker} from '@yoroi/dapp-connector'
-import {dappConnectorApiMaker} from '@yoroi/dapp-connector'
+import {connectionStorageMaker, dappConnectorApiMaker, dappConnectorMaker, ResolverWallet} from '@yoroi/dapp-connector'
+import {DappConnector} from '@yoroi/dapp-connector'
 import {App} from '@yoroi/types'
-import {Alert} from 'react-native'
 
+import {cip30ExtensionMaker} from '../../../yoroi-wallets/cardano/cip30'
 import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
 
 export const validUrl = (url: string) => {
@@ -57,21 +57,45 @@ export const getGoogleSearchItem = (searchQuery: string): DAppItem => ({
 
 export const isGoogleSearchItem = (dApp: DAppItem) => dApp.id === googleDappId
 
-export const createDappConnector = (appStorage: App.Storage, wallet: YoroiWallet) => {
+type CreateDappConnectorOptions = {
+  appStorage: App.Storage
+  wallet: YoroiWallet
+  confirmConnection: (origin: string, manager: DappConnector) => Promise<boolean>
+  signTx: (cbor: string) => Promise<string>
+  signData: (address: string, payload: string) => Promise<string>
+}
+
+export const createDappConnector = (options: CreateDappConnectorOptions) => {
+  const {wallet, appStorage, confirmConnection, signTx, signData} = options
   const api = dappConnectorApiMaker()
-  const handlerWallet = {
+  const cip30 = cip30ExtensionMaker(wallet)
+  const handlerWallet: ResolverWallet = {
     id: wallet.id,
     networkId: wallet.networkId,
-    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)},
-        ])
-      })
+    getUsedAddresses: (params) => cip30.getUsedAddresses(params),
+    getUnusedAddresses: () => cip30.getUnusedAddresses(),
+    getBalance: (tokenId) => cip30.getBalance(tokenId),
+    getChangeAddress: () => cip30.getChangeAddress(),
+    getRewardAddresses: () => cip30.getRewardAddresses(),
+    submitTx: (cbor) => cip30.submitTx(cbor),
+    getCollateral: (value) => cip30.getCollateral(value),
+    getUtxos: (value, pagination) => cip30.getUtxos(value, pagination),
+    confirmConnection: (origin: string) => confirmConnection(origin, manager),
+    signData: async (address, payload) => {
+      const rootKey = await signData(address, payload)
+      return cip30.signData(rootKey, address, payload)
+    },
+    signTx: async (cbor: string, partial?: boolean) => {
+      const rootKey = await signTx(cbor)
+      return cip30.signTx(rootKey, cbor, partial)
     },
   }
   const storage = connectionStorageMaker({storage: appStorage.join('dapp-connections/')})
-  return dappConnectorMaker(storage, handlerWallet, api)
+  const manager = dappConnectorMaker(storage, handlerWallet, api)
+  return manager
+}
+
+export const getDappFallbackLogo = (website: string) => {
+  const withoutProtocol = website.replace(/(^\w+:|^)\/\//, '')
+  return `https://api.faviconkit.com/${withoutProtocol}/144`
 }
diff --git a/apps/wallet-mobile/src/features/Discover/common/hooks.ts b/apps/wallet-mobile/src/features/Discover/common/hooks.tsx
similarity index 59%
rename from apps/wallet-mobile/src/features/Discover/common/hooks.ts
rename to apps/wallet-mobile/src/features/Discover/common/hooks.tsx
index a599ce48a8..7535678616 100644
--- a/apps/wallet-mobile/src/features/Discover/common/hooks.ts
+++ b/apps/wallet-mobile/src/features/Discover/common/hooks.tsx
@@ -1,10 +1,13 @@
-import {useDappConnector} from '@yoroi/dapp-connector'
-import {DappConnectorManager} from '@yoroi/dapp-connector/src/dapp-connector'
+import {DappConnectorManager, useDappConnector} from '@yoroi/dapp-connector'
 import * as React from 'react'
 import {WebView, WebViewMessageEvent} from 'react-native-webview'
 
+import {useModal} from '../../../components'
 import {YoroiWallet} from '../../../yoroi-wallets/cardano/types'
 import {Logger} from '../../../yoroi-wallets/logging'
+import {ConfirmRawTxWithOs} from '../../Swap/common/ConfirmRawTx/ConfirmRawTxWithOs'
+import {ConfirmRawTxWithPassword} from '../../Swap/common/ConfirmRawTx/ConfirmRawTxWithPassword'
+import {useStrings} from './useStrings'
 import {walletConfig} from './wallet-config'
 
 export const useConnectWalletToWebView = (wallet: YoroiWallet, webViewRef: React.RefObject<WebView | null>) => {
@@ -17,7 +20,7 @@ export const useConnectWalletToWebView = (wallet: YoroiWallet, webViewRef: React
       Logger.info('DappConnector', 'sending result to webview', result, 'as a response to', event)
     }
 
-    webViewRef.current?.injectJavaScript(getInjectableMessage({id, result, error: error?.message || null}))
+    webViewRef.current?.injectJavaScript(getInjectableMessage({id, result, error: error?.message ?? null}))
   }
 
   const handleWebViewEvent = async (e: WebViewMessageEvent) => {
@@ -52,3 +55,31 @@ const getInitScript = (sessionId: string, dappConnector: DappConnectorManager) =
     sessionId,
   })
 }
+
+export const useConfirmRawTx = (wallet: YoroiWallet) => {
+  const {openModal, closeModal} = useModal()
+  const strings = useStrings()
+  const modalHeight = 350
+
+  return React.useCallback(
+    ({onConfirm, onClose}: {onConfirm: (rootKey: string) => Promise<void>; onClose: () => void}) => {
+      const handleOnConfirm = async (rootKey: string) => {
+        const result = await onConfirm(rootKey)
+        closeModal()
+        return result
+      }
+
+      if (wallet.isHW) {
+        throw new Error('Not implemented yet')
+      }
+
+      if (wallet.isEasyConfirmationEnabled) {
+        openModal(strings.confirmTx, <ConfirmRawTxWithOs onConfirm={handleOnConfirm} />, modalHeight, onClose)
+        return
+      }
+
+      openModal(strings.confirmTx, <ConfirmRawTxWithPassword onConfirm={handleOnConfirm} />, modalHeight, onClose)
+    },
+    [openModal, closeModal, strings, modalHeight, wallet],
+  )
+}
diff --git a/apps/wallet-mobile/src/features/Discover/common/useDAppsConnected.tsx b/apps/wallet-mobile/src/features/Discover/common/useDAppsConnected.tsx
index 0b462d576d..e52f9d2eff 100644
--- a/apps/wallet-mobile/src/features/Discover/common/useDAppsConnected.tsx
+++ b/apps/wallet-mobile/src/features/Discover/common/useDAppsConnected.tsx
@@ -1,5 +1,4 @@
-import {useDappConnector} from '@yoroi/dapp-connector'
-import {DappConnection} from '@yoroi/dapp-connector/src/adapters/async-storage'
+import {DappConnection, useDappConnector} from '@yoroi/dapp-connector'
 import {useQuery, UseQueryOptions} from 'react-query'
 
 import {useSelectedWallet} from '../../WalletManager/context/SelectedWalletContext'
diff --git a/apps/wallet-mobile/src/features/Discover/common/useStrings.tsx b/apps/wallet-mobile/src/features/Discover/common/useStrings.tsx
index 362b93dc87..de937a4799 100644
--- a/apps/wallet-mobile/src/features/Discover/common/useStrings.tsx
+++ b/apps/wallet-mobile/src/features/Discover/common/useStrings.tsx
@@ -17,11 +17,22 @@ export const useStrings = () => {
     openDApp: intl.formatMessage(messages.openDApp),
     disconnectWalletFromDApp: intl.formatMessage(messages.disconnectWalletFromDApp),
     dAppActions: intl.formatMessage(messages.dAppActions),
+    confirmConnectionModalTitle: intl.formatMessage(messages.confirmConnectionModalTitle),
+    confirmConnectionModalConnectTo: intl.formatMessage(messages.confirmConnectionModalConnectTo),
+    confirmConnectionModalConnect: intl.formatMessage(messages.confirmConnectionModalConnect),
+    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',
@@ -71,5 +82,29 @@ export const messages = Object.freeze(
       id: 'discover.discoverList.dAppActions',
       defaultMessage: '!!!DApp actions',
     },
+    confirmConnectionModalTitle: {
+      id: 'discover.confirmConnectionModal.title',
+      defaultMessage: '!!!Confirm connection',
+    },
+    confirmConnectionModalConnectTo: {
+      id: 'discover.confirmConnectionModal.connectTo',
+      defaultMessage: '!!!Connect to',
+    },
+    confirmConnectionModalConnect: {
+      id: 'discover.confirmConnectionModal.connect',
+      defaultMessage: '!!!Connect',
+    },
+    confirmConnectionModalAllowThisDAppTo: {
+      id: 'discover.confirmConnectionModal.allowThisDAppTo',
+      defaultMessage: '!!!Allow this DApp to:',
+    },
+    confirmConnectionModalPermission1: {
+      id: 'discover.confirmConnectionModal.permission1',
+      defaultMessage: '!!!View addresses, account balance, activity',
+    },
+    confirmConnectionModalPermission2: {
+      id: 'discover.confirmConnectionModal.permission2',
+      defaultMessage: '!!!Request approval for transactions',
+    },
   }),
 )
diff --git a/apps/wallet-mobile/src/features/Discover/useCases/BrowseDapp/BrowserTabBar.tsx b/apps/wallet-mobile/src/features/Discover/useCases/BrowseDapp/BrowserTabBar.tsx
index 486ee787f5..d1c8795e26 100644
--- a/apps/wallet-mobile/src/features/Discover/useCases/BrowseDapp/BrowserTabBar.tsx
+++ b/apps/wallet-mobile/src/features/Discover/useCases/BrowseDapp/BrowserTabBar.tsx
@@ -1,7 +1,6 @@
 import {useTheme} from '@yoroi/theme'
 import * as React from 'react'
 import {StyleSheet, Text, TouchableOpacity, TouchableOpacityProps, View} from 'react-native'
-import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import Share from 'react-native-share'
 import WebView from 'react-native-webview'
 
@@ -16,7 +15,6 @@ type Props = {
 export const BrowserTabBar = ({webViewRef, webViewState}: Props) => {
   const {styles, color, colors} = useStyles()
   const {tabs, openTabs} = useBrowser()
-  const insets = useSafeAreaInsets()
 
   const totalTabs = Math.min(tabs.length, 99)
 
@@ -56,7 +54,7 @@ export const BrowserTabBar = ({webViewRef, webViewState}: Props) => {
   }
 
   return (
-    <View style={[styles.root, styles.shadow, {paddingBottom: insets.bottom + 12}]}>
+    <View style={[styles.root, styles.shadow, {height: tabBarHeight}]}>
       <Touch disabled={!webViewState.canGoBack} onPress={handleBackward}>
         <Icon.Backward color={colorBackward} />
       </Touch>
@@ -80,14 +78,10 @@ export const BrowserTabBar = ({webViewRef, webViewState}: Props) => {
   )
 }
 
-const Touch = ({children, ...props}: React.PropsWithChildren<TouchableOpacityProps>) => {
-  const {styles} = useStyles()
+const tabBarHeight = 46
 
-  return (
-    <TouchableOpacity style={styles.touchBox} {...props}>
-      {children}
-    </TouchableOpacity>
-  )
+const Touch = ({children, ...props}: React.PropsWithChildren<TouchableOpacityProps>) => {
+  return <TouchableOpacity {...props}>{children}</TouchableOpacity>
 }
 
 type TabItemProps = {
@@ -133,9 +127,6 @@ const useStyles = () => {
 
       zIndex: 1,
     },
-    touchBox: {
-      ...atoms.py_2xl,
-    },
     tabViewContainer: {
       position: 'relative',
     },
diff --git a/apps/wallet-mobile/src/features/Discover/useCases/BrowseDapp/WebViewItem.tsx b/apps/wallet-mobile/src/features/Discover/useCases/BrowseDapp/WebViewItem.tsx
index 3aef545615..f0a753cf34 100644
--- a/apps/wallet-mobile/src/features/Discover/useCases/BrowseDapp/WebViewItem.tsx
+++ b/apps/wallet-mobile/src/features/Discover/useCases/BrowseDapp/WebViewItem.tsx
@@ -3,7 +3,7 @@ import * as React from 'react'
 import {Dimensions, StyleSheet, Text, TouchableOpacity, TouchableWithoutFeedback} from 'react-native'
 import LinearGradient from 'react-native-linear-gradient'
 import Animated, {Easing, useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated'
-import {initialWindowMetrics, useSafeAreaInsets} from 'react-native-safe-area-context'
+import {useSafeAreaInsets} from 'react-native-safe-area-context'
 import WebView from 'react-native-webview'
 import {WebViewNavigation, WebViewNavigationEvent} from 'react-native-webview/lib/WebViewTypes'
 
@@ -41,8 +41,7 @@ export const WebViewItem = ({tab, index}: Props) => {
 
   const {initScript, handleEvent} = useConnectWalletToWebView(wallet, webViewRef)
 
-  const topInset = Math.max(insets.top, initialWindowMetrics?.insets.top ?? 0)
-  const visibleAreaHeight = SCREEN_HEIGHT - topInset
+  const visibleAreaHeight = SCREEN_HEIGHT - insets.top - insets.bottom
 
   const containerStyleAnimated = useAnimatedStyle(() => {
     return {
diff --git a/apps/wallet-mobile/src/features/Discover/useCases/SearchDappInBrowser/SearchDappInBrowserScreen.tsx b/apps/wallet-mobile/src/features/Discover/useCases/SearchDappInBrowser/SearchDappInBrowserScreen.tsx
index d6e92ee453..a6576cb4e8 100644
--- a/apps/wallet-mobile/src/features/Discover/useCases/SearchDappInBrowser/SearchDappInBrowserScreen.tsx
+++ b/apps/wallet-mobile/src/features/Discover/useCases/SearchDappInBrowser/SearchDappInBrowserScreen.tsx
@@ -10,7 +10,10 @@ import {BrowserSearchToolbar} from '../BrowseDapp/BrowserSearchToolbar'
 import {DAppListItem} from '../SelectDappFromList/DAppListItem/DAppListItem'
 
 const getUrl = (searchValue: string, isEngineSearch: boolean) => {
-  if (isEngineSearch || !validUrl(searchValue)) {
+  if (isEngineSearch) {
+    if (validUrl(searchValue)) {
+      return urlWithProtocol(searchValue)
+    }
     return 'https://www.google.com/search?q=' + encodeURIComponent(searchValue)
   }
 
diff --git a/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/DAppListItem/DAppListItem.tsx b/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/DAppListItem/DAppListItem.tsx
index 024b2e8f57..f412ae3fa1 100644
--- a/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/DAppListItem/DAppListItem.tsx
+++ b/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/DAppListItem/DAppListItem.tsx
@@ -7,7 +7,7 @@ import uuid from 'uuid'
 
 import {Icon, Spacer, useModal} from '../../../../../components'
 import {useBrowser} from '../../../common/BrowserProvider'
-import {type DAppItem, isGoogleSearchItem} from '../../../common/helpers'
+import {type DAppItem, getDappFallbackLogo, isGoogleSearchItem} from '../../../common/helpers'
 import {LabelCategoryDApp} from '../../../common/LabelCategoryDApp'
 import {LabelConnected} from '../../../common/LabelConnected'
 import {useNavigateTo} from '../../../common/useNavigateTo'
@@ -33,6 +33,8 @@ export const DAppListItem = ({dApp, connected, onPress}: Props) => {
 
   const [isPressed, setIsPressed] = React.useState(false)
 
+  const logo = dApp.logo.length === 0 ? getDappFallbackLogo(dApp.uri) : dApp.logo
+
   const handlePressing = (isPressIn: boolean) => {
     setIsPressed(isPressIn)
   }
@@ -67,7 +69,7 @@ export const DAppListItem = ({dApp, connected, onPress}: Props) => {
       strings.dAppActions,
       <View>
         <View style={styles.dAppInfo}>
-          <Image source={{uri: dApp.logo}} style={styles.dAppLogoDialog} />
+          <Image source={{uri: logo}} style={styles.dAppLogoDialog} />
 
           <Text style={styles.dAppName}>{dApp.name}</Text>
         </View>
@@ -88,8 +90,6 @@ export const DAppListItem = ({dApp, connected, onPress}: Props) => {
     )
   }
 
-  const showIconPlaceholder = dApp.logo.length === 0
-
   return (
     <TouchableWithoutFeedback
       onPressIn={() => handlePressing(true)}
@@ -97,15 +97,7 @@ export const DAppListItem = ({dApp, connected, onPress}: Props) => {
       onPress={handlePress}
     >
       <View style={styles.dAppItemContainer}>
-        {isGoogleSearchItem(dApp) ? (
-          <Icon.Google />
-        ) : showIconPlaceholder ? (
-          <EmptyIcon />
-        ) : (
-          <View>
-            <Image source={{uri: dApp.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}>
@@ -129,16 +121,6 @@ export const DAppListItem = ({dApp, connected, onPress}: Props) => {
   )
 }
 
-const EmptyIcon = () => {
-  const {colors, styles} = useStyles()
-
-  return (
-    <View style={styles.emptyIcon}>
-      <Icon.DApp color={colors.dappIcon} />
-    </View>
-  )
-}
-
 type DAppActionProps = {
   icon: React.ReactNode
   title: string
@@ -160,13 +142,6 @@ const useStyles = () => {
   const {color, atoms} = useTheme()
 
   const styles = StyleSheet.create({
-    emptyIcon: {
-      borderRadius: 8,
-      backgroundColor: color.gray_c50,
-      padding: 8,
-      width: 40,
-      height: 40,
-    },
     dAppItemContainer: {
       flexDirection: 'row',
       gap: 12,
diff --git a/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/SelectDappFromListScreen.tsx b/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/SelectDappFromListScreen.tsx
index beaaaa7235..b6eb05a629 100644
--- a/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/SelectDappFromListScreen.tsx
+++ b/apps/wallet-mobile/src/features/Discover/useCases/SelectDappFromList/SelectDappFromListScreen.tsx
@@ -5,7 +5,7 @@ import {FlatList, StyleSheet, View} from 'react-native'
 
 import {Spacer} from '../../../../components'
 import {useSearch, useSearchOnNavBar} from '../../../../Search/SearchContext'
-import {DAppItem, getGoogleSearchItem} from '../../common/helpers'
+import {getGoogleSearchItem} from '../../common/helpers'
 import {useDAppsConnected} from '../../common/useDAppsConnected'
 import {useStrings} from '../../common/useStrings'
 import {CountDAppsAvailable} from './CountDAppsAvailable/CountDAppsAvailable'
@@ -23,32 +23,20 @@ type TDAppTabs = keyof typeof DAppTabs
 export const SelectDappFromListScreen = () => {
   const styles = useStyles()
   const strings = useStrings()
-  const {search, visible} = useSearch()
-
   const [currentTab, setCurrentTab] = React.useState<TDAppTabs>('connected')
   const [categoriesSelected, setCategoriesSelected] = React.useState<string[]>([])
 
-  const isSearching = visible
-
   useSearchOnNavBar({
     title: strings.discoverTitle,
     placeholder: strings.searchDApps,
     noBack: true,
   })
-  const {data: list} = useDappList({suspense: true})
   const {data: connectedOrigins = []} = useDAppsConnected({refetchOnMount: true, refetchInterval: 500})
-  const hasConnectedDapps = connectedOrigins.length > 0
-
-  const filters = Object.keys(list?.filters ?? {})
 
   const isDappConnected = (dappOrigins: string[]) => {
     return dappOrigins.some((dappOrigin) => connectedOrigins.includes(dappOrigin))
   }
 
-  const dAppOriginsThatAreConnectedButNotInList = connectedOrigins.filter((connectedOrigin) => {
-    return !list?.dapps.some((dapp) => dapp.origins.includes(connectedOrigin))
-  })
-
   const handleToggleCategory = React.useCallback(
     (category: string) => {
       if (categoriesSelected.includes(category)) {
@@ -61,99 +49,31 @@ export const SelectDappFromListScreen = () => {
     [categoriesSelected],
   )
 
-  const getDAppsConnectedButNotInList = () => {
-    return dAppOriginsThatAreConnectedButNotInList.map((origin) => {
-      return {
-        id: origin,
-        name: origin.replace(/^https?:\/\//, ''),
-        description: origin,
-        category: 'Other',
-        logo: '',
-        uri: origin,
-        origins: [origin],
-      }
-    })
-  }
-
-  const getListDApps = (): DAppItem[] => {
-    if (!list?.dapps) return []
-    const allDapps = currentTab === 'connected' ? [...list.dapps, ...getDAppsConnectedButNotInList()] : list.dapps
-
-    if (isSearching) {
-      if (search?.length > 0) {
-        return allDapps
-          .filter((dApp) => dApp.name.toLowerCase().includes(search.toLowerCase()))
-          .sort((dAppFirst, dAppSecond) => dAppFirst.name.localeCompare(dAppSecond.name))
-          .concat(getGoogleSearchItem(search))
-      }
-
-      return allDapps
-    }
-
-    if (hasConnectedDapps && currentTab === DAppTabs.connected) {
-      return allDapps
-        .filter((dApp) => isDappConnected(dApp.origins))
-        .sort((dAppFirst, dAppSecond) => dAppFirst.name.localeCompare(dAppSecond.name))
-    }
-
-    if (categoriesSelected.length > 0) {
-      return allDapps
-        .filter((dApp) => categoriesSelected.some((filter) => list.filters[filter].includes(dApp.category)))
-        .sort((dAppFirst, dAppSecond) => dAppFirst.name.localeCompare(dAppSecond.name))
-    }
-
-    return allDapps.sort((dAppFirst, dAppSecond) => dAppFirst.name.localeCompare(dAppSecond.name))
-  }
+  const myDapps = useFilteredDappList(currentTab, categoriesSelected)
 
   const handleChangeTab = (tab: TDAppTabs) => {
     setCurrentTab(tab)
   }
 
-  const headerDAppControl = () => {
-    if (isSearching) return <Spacer height={16} />
-
-    return (
-      <>
-        {hasConnectedDapps && (
-          <View style={[styles.dAppItemBox, styles.tabsContainer]}>
-            <DAppExplorerTabItem
-              name={strings.connected}
-              isActive={currentTab === DAppTabs.connected}
-              onPress={() => handleChangeTab(DAppTabs.connected)}
-            />
-
-            <DAppExplorerTabItem
-              name={strings.recommended}
-              isActive={currentTab === DAppTabs.recommended}
-              onPress={() => handleChangeTab(DAppTabs.recommended)}
-            />
-          </View>
-        )}
-
-        {(!hasConnectedDapps || currentTab === DAppTabs.recommended) && (
-          <View style={styles.containerHeader}>
-            <DAppTypes types={filters} onToggle={handleToggleCategory} selectedTypes={categoriesSelected} />
-
-            <CountDAppsAvailable total={getListDApps().length} />
-
-            <Spacer style={styles.dAppsBox} />
-          </View>
-        )}
-      </>
-    )
-  }
-
   return (
     <>
       <WelcomeDAppModal />
 
       <View style={[styles.root]}>
         <FlatList
-          data={getListDApps()}
+          data={myDapps}
           extraData={connectedOrigins}
           keyExtractor={(item) => item.id.toString()}
           ListHeaderComponentStyle={styles.boxHeader}
-          ListHeaderComponent={headerDAppControl}
+          ListHeaderComponent={
+            <HeaderControl
+              currentTab={currentTab}
+              onTabChange={handleChangeTab}
+              count={myDapps.length}
+              selectedCategories={categoriesSelected}
+              onCategoryToggle={handleToggleCategory}
+            />
+          }
           renderItem={({item: entry}) => (
             <View style={styles.dAppItemBox}>
               <DAppListItem dApp={entry} connected={isDappConnected(entry.origins)} />
@@ -191,3 +111,116 @@ const useStyles = () => {
 
   return styles
 }
+
+const HeaderControl = ({
+  currentTab,
+  onTabChange,
+  count,
+  selectedCategories,
+  onCategoryToggle,
+}: {
+  currentTab: TDAppTabs
+  onTabChange: (tab: TDAppTabs) => void
+  count: number
+  selectedCategories: string[]
+  onCategoryToggle: (category: string) => void
+}) => {
+  const {visible} = useSearch()
+  const styles = useStyles()
+  const strings = useStrings()
+  const {data: connectedOrigins = []} = useDAppsConnected({refetchOnMount: true, refetchInterval: 500})
+  const hasConnectedDapps = connectedOrigins.length > 0
+  const {data: list} = useDappList({suspense: true})
+  const filters = Object.keys(list?.filters ?? {})
+
+  if (visible) return <Spacer height={16} />
+
+  return (
+    <>
+      {hasConnectedDapps && (
+        <View style={[styles.dAppItemBox, styles.tabsContainer]}>
+          <DAppExplorerTabItem
+            name={strings.connected}
+            isActive={currentTab === DAppTabs.connected}
+            onPress={() => onTabChange(DAppTabs.connected)}
+          />
+
+          <DAppExplorerTabItem
+            name={strings.recommended}
+            isActive={currentTab === DAppTabs.recommended}
+            onPress={() => onTabChange(DAppTabs.recommended)}
+          />
+        </View>
+      )}
+
+      {(!hasConnectedDapps || currentTab === DAppTabs.recommended) && (
+        <View style={styles.containerHeader}>
+          <DAppTypes types={filters} onToggle={onCategoryToggle} selectedTypes={selectedCategories} />
+
+          <CountDAppsAvailable total={count} />
+
+          <Spacer style={styles.dAppsBox} />
+        </View>
+      )}
+    </>
+  )
+}
+
+const useFilteredDappList = (tab: TDAppTabs, categoriesSelected: string[]) => {
+  const {search, visible} = useSearch()
+  const {data: list} = useDappList({suspense: true})
+  const {data: connectedOrigins = []} = useDAppsConnected({refetchOnMount: true, refetchInterval: 500})
+  const hasConnectedDapps = connectedOrigins.length > 0
+  const isSearching = visible
+
+  const isDappConnected = (dappOrigins: string[]) => {
+    return dappOrigins.some((dappOrigin) => connectedOrigins.includes(dappOrigin))
+  }
+
+  const dAppOriginsThatAreConnectedButNotInList = connectedOrigins.filter((connectedOrigin) => {
+    return !list?.dapps.some((dapp) => dapp.origins.includes(connectedOrigin))
+  })
+
+  const getDAppsConnectedButNotInList = () => {
+    return dAppOriginsThatAreConnectedButNotInList.map((origin) => {
+      return {
+        id: origin,
+        name: origin.replace(/^https?:\/\//, ''),
+        description: origin,
+        category: 'Other',
+        logo: '',
+        uri: origin,
+        origins: [origin],
+      }
+    })
+  }
+
+  if (!list?.dapps) return []
+
+  const allDapps = tab === 'connected' ? [...list.dapps, ...getDAppsConnectedButNotInList()] : list.dapps
+
+  if (isSearching) {
+    if (search?.length > 0) {
+      return allDapps
+        .filter((dApp) => dApp.name.toLowerCase().includes(search.toLowerCase()))
+        .sort((dAppFirst, dAppSecond) => dAppFirst.name.localeCompare(dAppSecond.name))
+        .concat(getGoogleSearchItem(search))
+    }
+
+    return allDapps
+  }
+
+  if (hasConnectedDapps && tab === DAppTabs.connected) {
+    return allDapps
+      .filter((dApp) => isDappConnected(dApp.origins))
+      .sort((dAppFirst, dAppSecond) => dAppFirst.name.localeCompare(dAppSecond.name))
+  }
+
+  if (categoriesSelected.length > 0) {
+    return allDapps
+      .filter((dApp) => categoriesSelected.some((filter) => list.filters[filter].includes(dApp.category)))
+      .sort((dAppFirst, dAppSecond) => dAppFirst.name.localeCompare(dAppSecond.name))
+  }
+
+  return allDapps.sort((dAppFirst, dAppSecond) => dAppFirst.name.localeCompare(dAppSecond.name))
+}
diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json
index 0625cfab52..56d63be63d 100644
--- a/apps/wallet-mobile/src/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/i18n/locales/en-US.json
@@ -1052,5 +1052,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/api/api.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/api/api.ts
index 51ee2bc26f..5c99e9151f 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/api/api.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/api/api.ts
@@ -56,7 +56,7 @@ export const filterUsedAddresses = async (addresses: Addresses, config: BackendC
   return copy.filter((addr) => used.includes(addr))
 }
 
-export const submitTransaction = async (signedTx: string, config: BackendConfig) => {
+export const submitTransaction = async (signedTx: string, config: BackendConfig): Promise<void> => {
   try {
     await fetchDefault('txs/signed', {signedTx}, config)
   } catch (e) {
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/byron/ByronWallet.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/byron/ByronWallet.ts
index 833648e850..46427e0328 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/byron/ByronWallet.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/byron/ByronWallet.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import {PrivateKey} from '@emurgo/cross-csl-core'
-import {signRawTransaction} from '@emurgo/yoroi-lib'
-import {Datum} from '@emurgo/yoroi-lib/dist/internals/models'
+import * as CSL from '@emurgo/cross-csl-core'
+import {Datum, signRawTransaction} from '@emurgo/yoroi-lib'
 import {AppApi, CardanoApi} from '@yoroi/api'
 import {isNonNullable, parseSafe} from '@yoroi/common'
 import {Api, App, Balance, Chain, Portfolio} from '@yoroi/types'
@@ -22,8 +21,7 @@ import LocalizableError from '../../../i18n/LocalizableError'
 import {HWDeviceInfo} from '../../hw'
 import {Logger} from '../../logging'
 import {makeMemosManager, MemosManager} from '../../memos'
-import {makeWalletEncryptedStorage, WalletEncryptedStorage} from '../../storage'
-import {Keychain} from '../../storage/Keychain'
+import {Keychain, makeWalletEncryptedStorage, WalletEncryptedStorage} from '../../storage'
 import {
   AccountStateResponse,
   BackendConfig,
@@ -46,9 +44,7 @@ import {
   YoroiSignedTx,
   YoroiUnsignedTx,
 } from '../../types'
-import {asQuantity, isMainnetNetworkId, Quantities} from '../../utils'
-import {genTimeToSlot} from '../../utils/timeUtils'
-import {validatePassword} from '../../utils/validators'
+import {asQuantity, genTimeToSlot, isMainnetNetworkId, Quantities, validatePassword} from '../../utils'
 import {Cardano, CardanoMobile} from '../../wallets'
 import * as legacyApi from '../api'
 import {calcLockedDeposit} from '../assetUtils'
@@ -542,7 +538,7 @@ export class ByronWallet implements YoroiWallet {
   }
 
   // returns the address in bech32 (Shelley) or base58 (Byron) format
-  private getChangeAddress(): string {
+  getChangeAddress(): string {
     const candidateAddresses = this.internalChain.addresses
     const unseen = candidateAddresses.filter((addr) => !this.isUsedAddress(addr))
     assert(unseen.length > 0, 'Cannot find change address')
@@ -1232,7 +1228,7 @@ export class ByronWallet implements YoroiWallet {
     return legacyApi.getPoolInfo(request, this.getBackendConfig())
   }
 
-  public async signRawTx(txHex: string, pKeys: PrivateKey[]) {
+  public async signRawTx(txHex: string, pKeys: CSL.PrivateKey[]) {
     return signRawTransaction(CardanoMobile, txHex, pKeys)
   }
 
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30.test.ts
new file mode 100644
index 0000000000..0610a492d5
--- /dev/null
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30.test.ts
@@ -0,0 +1,91 @@
+import {mocks} from '../mocks'
+import {getMasterKeyFromMnemonic} from './byron/util'
+import {cip30ExtensionMaker} from './cip30'
+import {YoroiWallet} from './types'
+
+describe('cip30ExtensionMaker', () => {
+  it('should support submitTx', async () => {
+    const mockWallet: YoroiWallet = {
+      ...mocks.wallet,
+      submitTransaction: jest.fn(),
+    }
+
+    const cip30 = cip30ExtensionMaker(mockWallet)
+    const result = await cip30.submitTx(txCbor)
+    expect(mockWallet.submitTransaction).toHaveBeenCalled()
+    expect(result).toBe('1a6205dc7a5a0493ef64487ca7033d12ba8f85a7d4a6e62d3c8eaa570d74eb53')
+  })
+
+  it('should support getUtxos', async () => {
+    const cip30 = cip30ExtensionMaker(mocks.wallet)
+    const result = await cip30.getUtxos(undefined, undefined)
+    expect(result).toHaveLength(mocks.wallet.utxos.length)
+  })
+
+  it('should support getBalance', async () => {
+    const cip30 = cip30ExtensionMaker(mocks.wallet)
+    const result = await cip30.getBalance()
+    expect(result).toBeDefined()
+    expect(await (await result.coin()).toStr()).toBe('2282543724')
+  })
+
+  it('should support getUnusedAddresses', async () => {
+    const cip30 = cip30ExtensionMaker(mocks.wallet)
+    const result = await cip30.getUnusedAddresses()
+    expect(result).toEqual([])
+  })
+
+  it('should support getUsedAddresses', async () => {
+    const cip30 = cip30ExtensionMaker(mocks.wallet)
+    const result = await cip30.getUsedAddresses()
+    expect(result).toEqual([])
+  })
+
+  it('should support getChangeAddress', async () => {
+    const cip30 = cip30ExtensionMaker(mocks.wallet)
+    const result = await cip30.getChangeAddress()
+    const bech32 = await result.toBech32(undefined)
+    const expectedAddress =
+      'addr1qxy9yjhvxh700xeluhvdpwlauuvnzav42edveyggy8fusqvg2f9wcd0u77dnlewc6zalmecex96e24j6ejgssgwneqqs762af9'
+    expect(bech32).toBe(expectedAddress)
+  })
+
+  it('should support getRewardAddresses', async () => {
+    const cip30 = cip30ExtensionMaker({
+      ...mocks.wallet,
+      rewardAddressHex:
+        '0188524aec35fcf79b3fe5d8d0bbfde719317595565acc910821d3c80188524aec35fcf79b3fe5d8d0bbfde719317595565acc910821d3c801',
+    })
+    const result = await cip30.getRewardAddresses()
+    expect(result).toHaveLength(1)
+    const [address] = result
+    expect(await address.toBech32(undefined)).toBe(
+      'addr1qxy9yjhvxh700xeluhvdpwlauuvnzav42edveyggy8fusqvg2f9wcd0u77dnlewc6zalmecex96e24j6ejgssgwneqqs762af9',
+    )
+  })
+
+  it('should support getCollateral', async () => {
+    const cip30 = cip30ExtensionMaker(mocks.wallet)
+    const result = await cip30.getCollateral()
+    expect(result).toHaveLength(1)
+    const [utxo] = result ?? []
+    expect(await utxo.toHex()).toBe(
+      '8282582022d391c7a97559cb4784bd975214919618acce75cde573a7150a176700e761810282583900d0f356065392d8fd5a1021aa1f876110700aad101cf15b35a7c247b2c3892366f174a76af9252f78368f5747d3055ab3568ea3b6bf40b01e1a0053274d',
+    )
+  })
+
+  it('should support signTx', async () => {
+    const cip30 = cip30ExtensionMaker(mocks.wallet)
+    const result = await cip30.signTx(await getMasterKeyFromMnemonic(mnemonic), txCbor, true)
+    expect(result).toBeDefined()
+  })
+})
+
+const mnemonic = [
+  'dry balcony arctic what garbage sort',
+  'cart shine egg lamp manual bottom',
+  'slide assault bus',
+].join(' ')
+
+const txCbor =
+  '84a30081825820ab67cc8cfc2904a49066255bbfb3893894e777387ff5389f01e86e3fdd91702900018282583901627e29d0e433daf833d8e80c97c575992cc3abadffd5ac2f64086b5dfd1c740673b5b8840a12cfbbd4e6c5c243bf08bbece4c8b3258194b21a001e848082583901fef19c26a68374e0d32be6b3870e611bf1d34d5e26e95ef2812008d1fd1c740673b5b8840a12cfbbd4e6c5c243bf08bbece4c8b3258194b2821a0761679ba4581c1d7f33bd23d85e1a25d87d86fac4f199c3197a2f7afeb662a0f34e1ea150776f726c646d6f62696c65746f6b656e1a005ec5a8581c279c909f348e533da5808898f87f9a14bb2c3dfbbacccd631d927a3fa144534e454b1901bc581c8654e8b350e298c80d2451beb5ed80fc9eee9f38ce6b039fb8706bc3a1474c4f42535445521a2d5448dd581ca0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235a145484f534b591a0203a048021a0002af65a0f5f6'
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30.ts
new file mode 100644
index 0000000000..63d3aa4827
--- /dev/null
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/cip30.ts
@@ -0,0 +1,363 @@
+import * as CSL from '@emurgo/cross-csl-core'
+import {WasmModuleProxy} from '@emurgo/cross-csl-core'
+import {RemoteUnspentOutput, signRawTransaction, UtxoAsset} from '@emurgo/yoroi-lib'
+import {normalizeToAddress} from '@emurgo/yoroi-lib/dist/internals/utils/addresses'
+import {parseTokenList} from '@emurgo/yoroi-lib/dist/internals/utils/assets'
+import {Balance} from '@yoroi/types'
+import {BalanceAmounts} from '@yoroi/types/src/balance/token'
+import {BigNumber} from 'bignumber.js'
+import {Buffer} from 'buffer'
+import _ from 'lodash'
+
+import {RawUtxo, YoroiUnsignedTx} from '../types'
+import {asQuantity, Utxos} from '../utils'
+import {Cardano, CardanoMobile} from '../wallets'
+import {toAssetNameHex, toPolicyId} from './api'
+import {getTransactionSigners} from './common/signatureUtils'
+import {Pagination, YoroiWallet} from './types'
+import {createRawTxSigningKey, identifierToCardanoAsset} from './utils'
+import {collateralConfig, findCollateralCandidates, utxosMaker} from './utxoManager/utxos'
+import {wrappedCsl} from './wrappedCsl'
+
+export const cip30ExtensionMaker = (wallet: YoroiWallet) => {
+  return new CIP30Extension(wallet)
+}
+
+const getCSL = () => wrappedCsl()
+
+const recreateValue = async (value: CSL.Value) => {
+  return CardanoMobile.Value.fromHex(await value.toHex())
+}
+
+const recreateMultiple = async <T>(items: T[], recreate: (item: T) => Promise<T>) => {
+  return Promise.all(items.map(recreate))
+}
+
+const recreateTransactionUnspentOutput = async (utxo: CSL.TransactionUnspentOutput) => {
+  return CardanoMobile.TransactionUnspentOutput.fromHex(await utxo.toHex())
+}
+
+const recreateWitnessSet = async (witnessSet: CSL.TransactionWitnessSet) => {
+  return CardanoMobile.TransactionWitnessSet.fromHex(await witnessSet.toHex())
+}
+
+class CIP30Extension {
+  constructor(private wallet: YoroiWallet) {}
+
+  async getBalance(tokenId = '*'): Promise<CSL.Value> {
+    const {csl, release} = getCSL()
+    try {
+      const value = await _getBalance(csl, tokenId, this.wallet.utxos, this.wallet.primaryTokenInfo.id)
+      return recreateValue(value)
+    } finally {
+      release()
+    }
+  }
+
+  async getUnusedAddresses(): Promise<CSL.Address[]> {
+    const bech32Addresses = this.wallet.receiveAddresses.filter((address) => !this.wallet.isUsedAddressIndex[address])
+    return Promise.all(bech32Addresses.map((addr) => CardanoMobile.Address.fromBech32(addr)))
+  }
+
+  getUsedAddresses(pagination?: Pagination): Promise<CSL.Address[]> {
+    const allAddresses = this.wallet.externalAddresses
+    const selectedAddresses = paginate(allAddresses, pagination)
+    return Promise.all(selectedAddresses.map((addr) => CardanoMobile.Address.fromBech32(addr)))
+  }
+
+  getChangeAddress(): Promise<CSL.Address> {
+    const changeAddr = this.wallet.getChangeAddress()
+    return CardanoMobile.Address.fromBech32(changeAddr)
+  }
+
+  async getRewardAddresses(): Promise<CSL.Address[]> {
+    const address = await CardanoMobile.Address.fromHex(this.wallet.rewardAddressHex)
+    return [address]
+  }
+
+  async getUtxos(value?: string, pagination?: Pagination): Promise<CSL.TransactionUnspentOutput[] | null> {
+    const {csl, release} = getCSL()
+    try {
+      const utxos = await _getUtxos(csl, this.wallet, value, pagination)
+      if (utxos === null) return null
+      return Promise.all(utxos.map(async (u) => CardanoMobile.TransactionUnspentOutput.fromHex(await u.toHex())))
+    } finally {
+      release()
+    }
+  }
+
+  async getCollateral(value?: string): Promise<CSL.TransactionUnspentOutput[] | null> {
+    const {csl, release} = getCSL()
+    try {
+      const valueStr = value?.trim() ?? collateralConfig.minLovelace.toString()
+      const valueNum = new BigNumber(valueStr)
+
+      if (valueNum.gte(collateralConfig.maxLovelace)) {
+        throw new Error('Collateral value is too high')
+      }
+
+      const currentCollateral = this.wallet.getCollateralInfo()
+      const canUseCurrentCollateral = currentCollateral.utxo && valueNum.lte(currentCollateral.utxo.amount)
+
+      if (canUseCurrentCollateral && currentCollateral.utxo) {
+        const utxo = await cardanoUtxoFromRemoteFormat(rawUtxoToRemoteUnspentOutput(currentCollateral.utxo))
+        return [await recreateTransactionUnspentOutput(utxo)]
+      }
+
+      const oneUtxoCollateral = await _drawCollateralInOneUtxo(this.wallet, asQuantity(valueNum))
+      if (oneUtxoCollateral) {
+        return [await recreateTransactionUnspentOutput(oneUtxoCollateral)]
+      }
+
+      const multipleUtxosCollateral = await _drawCollateralInMultipleUtxos(csl, this.wallet, asQuantity(valueNum))
+      if (multipleUtxosCollateral && multipleUtxosCollateral.length > 0) {
+        return recreateMultiple(multipleUtxosCollateral, recreateTransactionUnspentOutput)
+      }
+
+      return null
+    } finally {
+      release()
+    }
+  }
+
+  async submitTx(cbor: string): Promise<string> {
+    const base64 = Buffer.from(cbor, 'hex').toString('base64')
+    const txId = await Cardano.calculateTxId(base64, 'base64')
+    await this.wallet.submitTransaction(base64)
+    return txId
+  }
+
+  async signData(_rootKey: string, address: string, _payload: string): Promise<{signature: string; key: string}> {
+    const {csl, release} = getCSL()
+    try {
+      const normalisedAddress = await normalizeToAddress(csl, address)
+      const bech32Address = await normalisedAddress?.toBech32(undefined)
+      if (!bech32Address) throw new Error('Invalid wallet state')
+      throw new Error('Not implemented')
+    } finally {
+      release()
+    }
+  }
+
+  async signTx(rootKey: string, cbor: string, partial = false): Promise<CSL.TransactionWitnessSet> {
+    const {csl, release} = getCSL()
+    try {
+      const signers = await getTransactionSigners(cbor, this.wallet, partial)
+      const keys = await Promise.all(signers.map(async (signer) => createRawTxSigningKey(rootKey, signer)))
+      const signedTxBytes = await signRawTransaction(csl, cbor, keys)
+      const signedTx = await csl.Transaction.fromBytes(signedTxBytes)
+      return recreateWitnessSet(await signedTx.witnessSet())
+    } finally {
+      release()
+    }
+  }
+}
+
+const remoteAssetToMultiasset = async (csl: WasmModuleProxy, remoteAssets: UtxoAsset[]): Promise<CSL.MultiAsset> => {
+  const groupedAssets = remoteAssets.reduce((res, a) => {
+    ;(res[toPolicyId(a.assetId)] = res[toPolicyId(a.assetId)] || []).push(a)
+    return res
+  }, {} as Record<string, UtxoAsset[]>)
+  const multiasset = await csl.MultiAsset.new()
+  for (const policyHex of Object.keys(groupedAssets)) {
+    const assetGroup = groupedAssets[policyHex]
+    const policyId = await csl.ScriptHash.fromBytes(Buffer.from(policyHex, 'hex'))
+    const assets = await csl.Assets.new()
+    for (const asset of assetGroup) {
+      await assets.insert(
+        await csl.AssetName.new(Buffer.from(toAssetNameHex(asset.assetId), 'hex')),
+        await csl.BigNum.fromStr(asset.amount),
+      )
+    }
+    await multiasset.insert(policyId, assets)
+  }
+  return multiasset
+}
+const cardanoUtxoFromRemoteFormat = async (u: RemoteUnspentOutput): Promise<CSL.TransactionUnspentOutput> => {
+  const {csl, release} = getCSL()
+  try {
+    const input = await csl.TransactionInput.new(await csl.TransactionHash.fromHex(u.txHash), u.txIndex)
+    const value = await csl.Value.new(await csl.BigNum.fromStr(u.amount))
+    if ((u.assets || []).length > 0) {
+      await value.setMultiasset(await remoteAssetToMultiasset(csl, [...u.assets]))
+    }
+    const receiver = await csl.Address.fromBech32(u.receiver)
+    if (!receiver) throw new Error('Invalid receiver')
+    const output = await csl.TransactionOutput.new(receiver, value)
+    return csl.TransactionUnspentOutput.new(input, output)
+  } finally {
+    release()
+  }
+}
+
+const _getBalance = async (csl: WasmModuleProxy, tokenId = '*', utxos: RawUtxo[], primaryTokenId: string) => {
+  if (tokenId === 'TADA' || tokenId === 'ADA') tokenId = '.'
+  const amounts = Utxos.toAmounts(utxos, primaryTokenId)
+  const value = await csl.Value.new(await csl.BigNum.fromStr(amounts[primaryTokenId]))
+  const normalizedInHex = await Promise.all(
+    Object.keys(amounts)
+      .filter((t) => {
+        if (tokenId === '*') return true
+        return t === tokenId
+      })
+      .map(async (tokenId) => {
+        if (tokenId === '.' || tokenId === '' || tokenId === primaryTokenId) return null
+        const {policyId, name} = await identifierToCardanoAsset(tokenId)
+        const amount = amounts[tokenId]
+        return {policyIdHex: await policyId.toHex(), nameHex: await name.toHex(), amount}
+      }),
+  )
+
+  const groupedByPolicyId = _.groupBy(normalizedInHex.filter(Boolean), 'policyIdHex')
+
+  const multiAsset = await csl.MultiAsset.new()
+  for (const policyIdHex of Object.keys(groupedByPolicyId)) {
+    const assetValue = groupedByPolicyId[policyIdHex]
+    if (!assetValue) continue
+    const policyId = await csl.ScriptHash.fromHex(policyIdHex)
+    const assets = await csl.Assets.new()
+    for (const asset of assetValue) {
+      if (!asset) continue
+      const assetName = await csl.AssetName.fromHex(asset.nameHex)
+      const assetValue = await csl.BigNum.fromStr(asset.amount)
+      await assets.insert(assetName, assetValue)
+    }
+    await multiAsset.insert(policyId, assets)
+  }
+  await value.setMultiasset(multiAsset)
+  return value
+}
+
+export const _getUtxos = async (csl: WasmModuleProxy, wallet: YoroiWallet, value?: string, pagination?: Pagination) => {
+  const valueStr = value?.trim() ?? ''
+
+  if (valueStr.length === 0) {
+    const validUtxos = await Promise.all(
+      wallet.utxos.map((o) => cardanoUtxoFromRemoteFormat(rawUtxoToRemoteUnspentOutput(o))),
+    )
+    return paginate(validUtxos, pagination)
+  }
+
+  const amounts: BalanceAmounts = {}
+
+  const isValueNumber = !isNaN(Number(valueStr))
+
+  if (isValueNumber) {
+    amounts[wallet.primaryTokenInfo.id] = asQuantity(valueStr)
+  } else {
+    try {
+      Object.assign(amounts, getAmountsFromValue(csl, valueStr, wallet.primaryTokenInfo.id))
+    } catch (e) {
+      //
+    }
+  }
+
+  const validUtxos = await _getRequiredUtxos(csl, wallet, amounts, wallet.utxos)
+  if (validUtxos === null) return null
+  return paginate(validUtxos, pagination)
+}
+
+const _getRequiredUtxos = async (
+  csl: WasmModuleProxy,
+  wallet: YoroiWallet,
+  amounts: Balance.Amounts,
+  allUtxos: RawUtxo[],
+): Promise<CSL.TransactionUnspentOutput[] | null> => {
+  const remoteUnspentOutputs: RemoteUnspentOutput[] = allUtxos.map((utxo) => rawUtxoToRemoteUnspentOutput(utxo))
+  const rewardAddress = await (await normalizeToAddress(csl, wallet.rewardAddressHex))?.toBech32(undefined)
+  if (!rewardAddress) throw new Error('Invalid wallet state')
+
+  try {
+    const unsignedTx = await wallet.createUnsignedTx([{address: rewardAddress, amounts}])
+    const requiredUtxos = await findUtxosInUnsignedTx(unsignedTx, remoteUnspentOutputs)
+    return Promise.all(requiredUtxos.map((o) => cardanoUtxoFromRemoteFormat(o)))
+  } catch (e) {
+    return null
+  }
+}
+
+const rawUtxoToRemoteUnspentOutput = (utxo: RawUtxo): RemoteUnspentOutput => {
+  return {
+    txHash: utxo.tx_hash,
+    txIndex: utxo.tx_index,
+    receiver: utxo.receiver,
+    amount: utxo.amount,
+    assets: utxo.assets,
+    utxoId: utxo.utxo_id,
+  }
+}
+
+const findUtxosInUnsignedTx = async (unsignedTx: YoroiUnsignedTx, utxos: RemoteUnspentOutput[]) => {
+  const inputs = await unsignedTx.unsignedTx.txBody.inputs()
+  const filteredUtxos: RemoteUnspentOutput[] = []
+  for (let i = 0; i < (await inputs.len()); i++) {
+    const input = await inputs.get(i)
+    const inputTxHash = await (await input.transactionId()).toHex()
+    const inputIndex = await input.index()
+    const utxo = utxos.find((utxo) => utxo.txHash === inputTxHash && utxo.txIndex === inputIndex)
+    if (utxo) filteredUtxos.push(utxo)
+  }
+  return filteredUtxos
+}
+
+const paginate = <T>(items: T[], pagination?: {page: number; limit: number}) => {
+  return pagination ? items.slice(pagination.page * pagination.limit, (pagination.page + 1) * pagination.limit) : items
+}
+
+const _drawCollateralInOneUtxo = async (wallet: YoroiWallet, quantity: Balance.Quantity) => {
+  const utxos = utxosMaker(wallet.utxos, {
+    maxLovelace: collateralConfig.maxLovelace,
+    minLovelace: quantity,
+    maxUTxOs: collateralConfig.maxUTxOs,
+  })
+
+  const possibleCollateralId = utxos.drawnCollateral()
+  if (!possibleCollateralId) return null
+  const collateralUtxo = utxos.findById(possibleCollateralId)
+  if (!collateralUtxo) return null
+  return cardanoUtxoFromRemoteFormat(rawUtxoToRemoteUnspentOutput(collateralUtxo))
+}
+
+const _drawCollateralInMultipleUtxos = async (
+  csl: WasmModuleProxy,
+  wallet: YoroiWallet,
+  quantity: Balance.Quantity,
+) => {
+  const possibleUtxos = findCollateralCandidates(wallet.utxos, {
+    maxLovelace: collateralConfig.maxLovelace,
+    minLovelace: asQuantity('0'),
+    maxUTxOs: collateralConfig.maxUTxOs,
+  })
+
+  const sortedFromMaxToMin = possibleUtxos.sort((a, b) => {
+    const aAmount = new BigNumber(a.amount)
+    const bAmount = new BigNumber(b.amount)
+    return bAmount.comparedTo(aAmount)
+  })
+
+  const utxosWithLimitAccounted = sortedFromMaxToMin.slice(0, collateralConfig.maxUTxOs)
+
+  const utxos = await _getRequiredUtxos(csl, wallet, {[wallet.primaryTokenInfo.id]: quantity}, utxosWithLimitAccounted)
+
+  if (utxos !== null && utxos.length > 0) {
+    return utxos
+  }
+  return null
+}
+
+const getAmountsFromValue = async (csl: WasmModuleProxy, value: string, primaryTokenId: string) => {
+  const valueFromHex = await csl.Value.fromHex(value)
+  const amounts: BalanceAmounts = {}
+
+  if (valueFromHex.hasValue()) {
+    amounts[primaryTokenId] = asQuantity(await (await valueFromHex.coin()).toStr())
+  }
+  const ma = await valueFromHex.multiasset()
+  if (ma) {
+    for (const token of await parseTokenList(ma)) {
+      const {assetId, amount} = token
+      amounts[assetId] = asQuantity(amount)
+    }
+  }
+  return amounts
+}
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/common/signatureUtils.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/common/signatureUtils.ts
index 0eb2747b35..430a5abe34 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/common/signatureUtils.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/common/signatureUtils.ts
@@ -47,7 +47,11 @@ export const convertBech32ToHex = async (bech32Address: string) => {
 
 export const harden = (num: number) => HARD_DERIVATION_START + num
 
-export const getRequiredSigners = async (tx: CSL_TYPES.Transaction, wallet: YoroiWallet): Promise<number[][]> => {
+export const getRequiredSigners = async (
+  tx: CSL_TYPES.Transaction,
+  wallet: YoroiWallet,
+  partial = true,
+): Promise<number[][]> => {
   const stakeVKHash = await wallet.getStakingKey().then((key) => key.hash())
   const body = await tx.body()
 
@@ -60,11 +64,11 @@ export const getRequiredSigners = async (tx: CSL_TYPES.Transaction, wallet: Yoro
     receiver: utxo.receiver,
     utxoId: utxo.utxo_id,
     assets: utxo.assets,
-    addressing: {path: getDerivationPathForAddress(utxo.receiver, wallet), startLevel},
+    addressing: {path: getDerivationPathForAddress(utxo.receiver, wallet, partial), startLevel},
   }))
 
   const getAddressAddressing = (bech32Address: string) => {
-    const path = getDerivationPathForAddress(bech32Address, wallet)
+    const path = getDerivationPathForAddress(bech32Address, wallet, partial)
     return {path, startLevel}
   }
   const signers = await getAllSigners(
@@ -74,6 +78,7 @@ export const getRequiredSigners = async (tx: CSL_TYPES.Transaction, wallet: Yoro
     stakeVKHash,
     getAddressAddressing,
     addressedUtxos,
+    partial,
   )
 
   return getUniquePaths(signers.map((s) => s.path))
@@ -87,13 +92,16 @@ const arePathsEqual = (path1: number[], path2: number[]) => {
   return path1.every((value, index) => value === path2[index]) && path1.length === path2.length
 }
 
-const getDerivationPathForAddress = (address: string, wallet: YoroiWallet) => {
+const getDerivationPathForAddress = (address: string, wallet: YoroiWallet, partial = false) => {
   const internalIndex = wallet.internalAddresses.indexOf(address)
   const externalIndex = wallet.externalAddresses.indexOf(address)
   const purpose = isHaskellShelley(wallet.walletImplementationId)
     ? NUMBERS.WALLET_TYPE_PURPOSE.CIP1852
     : NUMBERS.WALLET_TYPE_PURPOSE.BIP44
-  if (internalIndex === -1 && externalIndex === -1) throw new Error('Could not find matching address')
+  if (internalIndex === -1 && externalIndex === -1) {
+    if (!partial) throw new Error('Could not find matching address')
+    return [purpose, harden(1815), harden(0), 0, 0]
+  }
 
   const role = internalIndex > -1 ? 1 : 0
   const index = Math.max(internalIndex, externalIndex)
@@ -101,7 +109,7 @@ const getDerivationPathForAddress = (address: string, wallet: YoroiWallet) => {
   return [purpose, harden(1815), harden(0), role, index]
 }
 
-export const getTransactionSigners = async (cbor: string, wallet: YoroiWallet) => {
+export const getTransactionSigners = async (cbor: string, wallet: YoroiWallet, partial = true) => {
   const tx = await CardanoMobile.Transaction.fromHex(cbor)
-  return getRequiredSigners(tx, wallet)
+  return getRequiredSigners(tx, wallet, partial)
 }
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/ShelleyWallet.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/ShelleyWallet.ts
index 78c34fcb25..4c5eb5bc5a 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/ShelleyWallet.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/shelley/ShelleyWallet.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import {PrivateKey} from '@emurgo/cross-csl-core'
+import * as CSL from '@emurgo/cross-csl-core'
 import {createSignedLedgerTxFromCbor, signRawTransaction} from '@emurgo/yoroi-lib'
 import {Datum} from '@emurgo/yoroi-lib/dist/internals/models'
 import {AppApi, CardanoApi} from '@yoroi/api'
@@ -7,6 +7,7 @@ import {isNonNullable, parseSafe} from '@yoroi/common'
 import {Api, App, Balance, Chain, Portfolio} from '@yoroi/types'
 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'
@@ -75,6 +76,7 @@ import {deriveRewardAddressHex, toRecipients} from '../utils'
 import {makeUtxoManager, UtxoManager} from '../utxoManager'
 import {utxosMaker} from '../utxoManager/utxos'
 import {makeKeys} from './makeKeys'
+
 type WalletState = {
   lastGeneratedAddressIndex: number
 }
@@ -481,13 +483,12 @@ export const makeShelleyWallet = (constants: typeof MAINNET | typeof TESTNET | t
 
     // =================== utils =================== //
     // returns the address in bech32 (Shelley) or base58 (Byron) format
-    private getChangeAddress(): string {
+    getChangeAddress(): string {
       const candidateAddresses = this.internalChain.addresses
       const unseen = candidateAddresses.filter((addr) => !this.isUsedAddress(addr))
       assert(unseen.length > 0, 'Cannot find change address')
       const changeAddress = _.first(unseen)
       if (!changeAddress) throw new Error('invalid wallet state')
-
       return changeAddress
     }
 
@@ -512,7 +513,7 @@ export const makeShelleyWallet = (constants: typeof MAINNET | typeof TESTNET | t
       return stakingKey
     }
 
-    public async signRawTx(txHex: string, pKeys: PrivateKey[]) {
+    public async signRawTx(txHex: string, pKeys: CSL.PrivateKey[]) {
       return signRawTransaction(CardanoMobile, txHex, pKeys)
     }
 
@@ -1067,9 +1068,8 @@ export const makeShelleyWallet = (constants: typeof MAINNET | typeof TESTNET | t
       return this.cardanoApi.getProtocolParams()
     }
 
-    async submitTransaction(signedTx: string) {
-      const response: any = await legacyApi.submitTransaction(signedTx, BACKEND)
-      return response as any
+    async submitTransaction(base64SignedTx: string) {
+      await legacyApi.submitTransaction(base64SignedTx, BACKEND)
     }
 
     private async syncUtxos({isForced = false}: {isForced?: boolean} = {}) {
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts
index 64849e7c20..d5d8e8086d 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/types.ts
@@ -1,6 +1,5 @@
 import {WalletChecksum as WalletChecksumType} from '@emurgo/cip4-js'
 import * as CoreTypes from '@emurgo/cross-csl-core'
-import {BaseAddress, PrivateKey} from '@emurgo/cross-csl-core'
 import {
   Addressing as AddressingType,
   CardanoAddressedUtxo as CardanoAddressedUtxoType,
@@ -83,6 +82,11 @@ export type SignedTxLegacy = {
   base64: string
 }
 
+export type Pagination = {
+  page: number
+  limit: number
+}
+
 export type YoroiWallet = {
   id: string
 
@@ -121,13 +125,13 @@ export type YoroiWallet = {
   // API
   api: App.Api
 
-  signRawTx(txHex: string, pKeys: PrivateKey[]): Promise<Uint8Array | undefined>
+  signRawTx(txHex: string, pKeys: CoreTypes.PrivateKey[]): Promise<Uint8Array | undefined>
 
   // Sending
   createUnsignedTx(entries: YoroiEntry[], metadata?: Array<CardanoTypes.TxMetadata>): Promise<YoroiUnsignedTx>
   signTxWithLedger(request: YoroiUnsignedTx, useUSB: boolean): Promise<YoroiSignedTx>
   signTx(signRequest: YoroiUnsignedTx, rootKey: string): Promise<YoroiSignedTx>
-  submitTransaction(signedTx: string): Promise<[]>
+  submitTransaction(signedTx: string): Promise<void>
 
   // Voting
   createVotingRegTx(
@@ -206,9 +210,11 @@ export type YoroiWallet = {
   checkServerStatus(): Promise<ServerStatus>
 
   // CIP36 Payment Address
-  getFirstPaymentAddress(): Promise<BaseAddress>
+  getFirstPaymentAddress(): Promise<CoreTypes.BaseAddress>
 
   getProtocolParams(): Promise<Api.Cardano.ProtocolParamsResult>
+
+  getChangeAddress(): string
 }
 
 export const isYoroiWallet = (wallet: unknown): wallet is YoroiWallet => {
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts
index 599f33ecd3..6c67870e36 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/utils.ts
@@ -63,7 +63,7 @@ export const deriveRewardAddressHex = async (accountPubKeyHex: string, networkId
 /**
  * Multi-asset related
  */
-const identifierToCardanoAsset = async (
+export const identifierToCardanoAsset = async (
   tokenId: string,
 ): Promise<{
   policyId: CardanoTypes.ScriptHash
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/utxoManager/types.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/utxoManager/types.ts
index 0870faa3b3..552d03513b 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/utxoManager/types.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/utxoManager/types.ts
@@ -3,4 +3,5 @@ import {Balance} from '@yoroi/types'
 export type CollateralConfig = {
   minLovelace: Balance.Quantity
   maxLovelace: Balance.Quantity
+  maxUTxOs: number
 }
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/utxoManager/utxos.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/utxoManager/utxos.test.ts
index b790c78d15..10ee42890c 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/utxoManager/utxos.test.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/utxoManager/utxos.test.ts
@@ -14,7 +14,7 @@ describe('UTXO utility functions', () => {
   })
 
   describe('isAmountInCollateralRange', () => {
-    const config: CollateralConfig = {minLovelace: '100', maxLovelace: '200'}
+    const config: CollateralConfig = {minLovelace: '100', maxLovelace: '200', maxUTxOs: 3}
 
     it('returns true if amount is within range', () => {
       expect(isAmountInCollateralRange('150', config)).toBe(true)
@@ -26,7 +26,7 @@ describe('UTXO utility functions', () => {
   })
 
   describe('utxosMaker', () => {
-    const config: CollateralConfig = {minLovelace: '50', maxLovelace: '200'}
+    const config: CollateralConfig = {minLovelace: '50', maxLovelace: '200', maxUTxOs: 3}
     const utils = utxosMaker(mockRawUtxos, config)
 
     it('findById returns the correct UTXO by id', () => {
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/utxoManager/utxos.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/utxoManager/utxos.ts
index 9bb32eb174..5ce962f448 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/utxoManager/utxos.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/utxoManager/utxos.ts
@@ -8,11 +8,17 @@ import {CollateralConfig} from './types'
 export const collateralConfig: CollateralConfig = {
   minLovelace: asQuantity(2_000_000),
   maxLovelace: asQuantity(5_000_000),
+  maxUTxOs: 3,
 }
 
 export function isPureUtxo(utxo: RawUtxo) {
   return utxo.assets.length === 0
 }
+
+export const hasValue = (utxo: RawUtxo) => {
+  return new BigNumber(asQuantity(utxo.amount)).gte(0)
+}
+
 export function isAmountInCollateralRange(amount: RawUtxo['amount'], {maxLovelace, minLovelace}: CollateralConfig) {
   const value = new BigNumber(asQuantity(amount))
   const min = new BigNumber(minLovelace)
@@ -20,9 +26,20 @@ export function isAmountInCollateralRange(amount: RawUtxo['amount'], {maxLovelac
   return value.gte(min) && value.lte(max)
 }
 
+export const findCollateralCandidates = (
+  utxos: ReadonlyArray<RawUtxo>,
+  {maxLovelace, minLovelace, maxUTxOs}: CollateralConfig,
+) => {
+  return utxos
+    .filter(isPureUtxo)
+    .filter(hasValue)
+    .filter((utxo) => isAmountInCollateralRange(utxo.amount, {maxLovelace, minLovelace, maxUTxOs}))
+    .sort((a, b) => new BigNumber(asQuantity(a.amount)).comparedTo(asQuantity(b.amount)))
+}
+
 export function utxosMaker(
   utxos: ReadonlyArray<RawUtxo>,
-  {maxLovelace, minLovelace}: CollateralConfig = collateralConfig,
+  {maxLovelace, minLovelace, maxUTxOs}: CollateralConfig = collateralConfig,
 ) {
   const findById = (id: RawUtxo['utxo_id']) => {
     return utxos.find((utxo) => utxo.utxo_id === id)
@@ -31,14 +48,8 @@ export function utxosMaker(
     return findById(id) !== undefined
   }
 
-  const findCollateralCandidates = () => {
-    return utxos
-      .filter(isPureUtxo)
-      .filter((utxo) => isAmountInCollateralRange(utxo.amount, {maxLovelace, minLovelace}))
-      .sort((a, b) => new BigNumber(asQuantity(a.amount)).comparedTo(asQuantity(b.amount)))
-  }
   const drawnCollateral = () => {
-    const candidates = findCollateralCandidates()
+    const candidates = findCollateralCandidates(utxos, {maxLovelace, minLovelace, maxUTxOs})
     const collateral = candidates.find(first)
     return collateral?.utxo_id
   }
@@ -46,7 +57,7 @@ export function utxosMaker(
   return {
     findById,
     isAmountInCollateralRange,
-    findCollateralCandidates,
+    findCollateralCandidates: () => findCollateralCandidates(utxos, {maxLovelace, minLovelace, maxUTxOs}),
     drawnCollateral,
     exists,
   } as const
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/wrappedCsl.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/wrappedCsl.ts
new file mode 100644
index 0000000000..34b1692229
--- /dev/null
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/wrappedCsl.ts
@@ -0,0 +1,62 @@
+import {WasmModuleProxy} from '@emurgo/cross-csl-core'
+import {init} from '@emurgo/cross-csl-mobile'
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+const cardano = init('wrappedCSL')
+
+export type CslPointer = {ptr: number; free: () => void}
+
+export const wrappedCsl = (): {csl: WasmModuleProxy; release: VoidFunction} => {
+  let pointers: CslPointer[] = []
+  const track = (p: CslPointer) => pointers.push(p)
+  const release = () => {
+    pointers.forEach((p) => {
+      if (p?.ptr !== 0) {
+        try {
+          p.free()
+        } catch (e) {
+          //
+        }
+      }
+    })
+    pointers = []
+  }
+
+  const trackIfNeeded = <T>(obj: T): T => {
+    if (typeof (obj as any)?.free === 'function') track(obj as any)
+    if (obj instanceof Promise) {
+      return obj.then((result) => trackIfNeeded(result)) as any
+    }
+    if (Array.isArray(obj)) return obj.map((o) => trackIfNeeded(o) as any) as any
+    return obj
+  }
+
+  const proxy = new Proxy(cardano, {
+    get(target: WasmModuleProxy, p: string | symbol, receiver: any): any {
+      const prop = Reflect.get(target, p, receiver)
+      if (!isClass(prop)) {
+        return prop
+      }
+
+      return new Proxy(prop, {
+        get: (target: any, name: string) => {
+          if (name === 'prototype') return target[name]
+          const isFunc = typeof target[name] === 'function'
+          if (!isFunc) return target[name]
+          return (...args: any[]) => {
+            const result = target[name](...args)
+            return trackIfNeeded(result)
+          }
+        },
+      })
+    },
+  })
+
+  return {csl: proxy, release}
+}
+
+const isClass = (func: any) => {
+  return (
+    typeof func === 'function' && (/^\s*class\s+/.test(func.toString()) || func.name[0] === func.name[0].toUpperCase())
+  )
+}
diff --git a/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts b/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts
index 40ab0ba794..a0d2e4ff7f 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/mocks/wallet.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/require-await */
 /* eslint-disable @typescript-eslint/no-explicit-any */
+
 import {action} from '@storybook/addon-actions'
 import {AppApi, CardanoApi} from '@yoroi/api'
 import {createPrimaryTokenInfo} from '@yoroi/portfolio'
@@ -123,6 +124,7 @@ const wallet: YoroiWallet = {
   ledgerSupportsCIP36: async () => {
     return true
   },
+
   getCollateralInfo: () => {
     return {
       utxo: {
@@ -299,6 +301,9 @@ const wallet: YoroiWallet = {
   createUnsignedGovernanceTx: () => {
     throw new Error('not implemented: createUnsignedGovernanceTx')
   },
+  getChangeAddress(): string {
+    return 'addr1qxy9yjhvxh700xeluhvdpwlauuvnzav42edveyggy8fusqvg2f9wcd0u77dnlewc6zalmecex96e24j6ejgssgwneqqs762af9'
+  },
 }
 
 const hwWallet: YoroiWallet = {
@@ -573,7 +578,6 @@ const signTxWithLedger = {
 const submitTransaction = {
   success: async (...args: unknown[]) => {
     action('submitTransaction')(...args)
-    return [] as unknown as []
   },
   error: async (...args: unknown[]) => {
     action('submitTransaction')(...args)
@@ -581,7 +585,7 @@ const submitTransaction = {
   },
   loading: async (...args: unknown[]) => {
     action('submitTransaction')(...args)
-    return new Promise(() => null) as unknown as []
+    return new Promise<void>(() => null)
   },
 }
 
diff --git a/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json b/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json
index 8d11a13fff..bb2317b902 100644
--- a/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json
+++ b/apps/wallet-mobile/translations/messages/src/Dashboard/Dashboard.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 240,
       "column": 23,
-      "index": 7948
+      "index": 7928
     },
     "end": {
       "line": 243,
       "column": 3,
-      "index": 8081
+      "index": 8061
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Discover/common/useStrings.json b/apps/wallet-mobile/translations/messages/src/features/Discover/common/useStrings.json
index 4a0fdfee02..abb178f8b6 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Discover/common/useStrings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Discover/common/useStrings.json
@@ -1,17 +1,32 @@
 [
+  {
+    "id": "global.confirmationTransaction",
+    "defaultMessage": "!!!Confirm transaction",
+    "file": "src/features/Discover/common/useStrings.tsx",
+    "start": {
+      "line": 32,
+      "column": 15,
+      "index": 1709
+    },
+    "end": {
+      "line": 35,
+      "column": 5,
+      "index": 1808
+    }
+  },
   {
     "id": "discover.discoverList.discoverTitle",
     "defaultMessage": "!!!Discover Cardano",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 25,
+      "line": 36,
       "column": 19,
-      "index": 1056
+      "index": 1829
     },
     "end": {
-      "line": 28,
+      "line": 39,
       "column": 5,
-      "index": 1157
+      "index": 1930
     }
   },
   {
@@ -19,14 +34,14 @@
     "defaultMessage": "!!!Search DApps",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 29,
+      "line": 40,
       "column": 17,
-      "index": 1176
+      "index": 1949
     },
     "end": {
-      "line": 32,
+      "line": 43,
       "column": 5,
-      "index": 1271
+      "index": 2044
     }
   },
   {
@@ -34,14 +49,14 @@
     "defaultMessage": "!!!Welcome to Yoroi DApp Explorer",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 33,
+      "line": 44,
       "column": 32,
-      "index": 1305
+      "index": 2078
     },
     "end": {
-      "line": 36,
+      "line": 47,
       "column": 5,
-      "index": 1433
+      "index": 2206
     }
   },
   {
@@ -49,14 +64,14 @@
     "defaultMessage": "!!!Discover, inspect, and connect to Cardano decentralized applications (DApps) with ease. Our solution helps to interact with DApps and their smart contracts, seamlessly enhancing your Cardano experience",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 37,
+      "line": 48,
       "column": 43,
-      "index": 1478
+      "index": 2251
     },
     "end": {
-      "line": 41,
+      "line": 52,
       "column": 5,
-      "index": 1796
+      "index": 2569
     }
   },
   {
@@ -64,14 +79,14 @@
     "defaultMessage": "!!!Next",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 42,
+      "line": 53,
       "column": 10,
-      "index": 1808
+      "index": 2581
     },
     "end": {
-      "line": 45,
+      "line": 56,
       "column": 5,
-      "index": 1873
+      "index": 2646
     }
   },
   {
@@ -79,14 +94,14 @@
     "defaultMessage": "!!!DApp(s) available",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 46,
+      "line": 57,
       "column": 24,
-      "index": 1899
+      "index": 2672
     },
     "end": {
-      "line": 49,
+      "line": 60,
       "column": 5,
-      "index": 2001
+      "index": 2774
     }
   },
   {
@@ -94,14 +109,14 @@
     "defaultMessage": "!!!Connected",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 50,
+      "line": 61,
       "column": 15,
-      "index": 2018
+      "index": 2791
     },
     "end": {
-      "line": 53,
+      "line": 64,
       "column": 5,
-      "index": 2108
+      "index": 2881
     }
   },
   {
@@ -109,14 +124,14 @@
     "defaultMessage": "!!!Recommended",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 54,
+      "line": 65,
       "column": 17,
-      "index": 2127
+      "index": 2900
     },
     "end": {
-      "line": 57,
+      "line": 68,
       "column": 5,
-      "index": 2221
+      "index": 2994
     }
   },
   {
@@ -124,14 +139,14 @@
     "defaultMessage": "!!!DONE",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 58,
+      "line": 69,
       "column": 10,
-      "index": 2233
+      "index": 3006
     },
     "end": {
-      "line": 61,
+      "line": 72,
       "column": 5,
-      "index": 2313
+      "index": 3086
     }
   },
   {
@@ -139,14 +154,14 @@
     "defaultMessage": "!!!Open DApp",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 62,
+      "line": 73,
       "column": 14,
-      "index": 2329
+      "index": 3102
     },
     "end": {
-      "line": 65,
+      "line": 76,
       "column": 5,
-      "index": 2418
+      "index": 3191
     }
   },
   {
@@ -154,14 +169,14 @@
     "defaultMessage": "!!!Disconnect wallet from DApp",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 66,
+      "line": 77,
       "column": 30,
-      "index": 2450
+      "index": 3223
     },
     "end": {
-      "line": 69,
+      "line": 80,
       "column": 5,
-      "index": 2573
+      "index": 3346
     }
   },
   {
@@ -169,14 +184,104 @@
     "defaultMessage": "!!!DApp actions",
     "file": "src/features/Discover/common/useStrings.tsx",
     "start": {
-      "line": 70,
+      "line": 81,
       "column": 17,
-      "index": 2592
+      "index": 3365
     },
     "end": {
-      "line": 73,
+      "line": 84,
+      "column": 5,
+      "index": 3460
+    }
+  },
+  {
+    "id": "discover.confirmConnectionModal.title",
+    "defaultMessage": "!!!Confirm connection",
+    "file": "src/features/Discover/common/useStrings.tsx",
+    "start": {
+      "line": 85,
+      "column": 33,
+      "index": 3495
+    },
+    "end": {
+      "line": 88,
+      "column": 5,
+      "index": 3600
+    }
+  },
+  {
+    "id": "discover.confirmConnectionModal.connectTo",
+    "defaultMessage": "!!!Connect to",
+    "file": "src/features/Discover/common/useStrings.tsx",
+    "start": {
+      "line": 89,
+      "column": 37,
+      "index": 3639
+    },
+    "end": {
+      "line": 92,
+      "column": 5,
+      "index": 3740
+    }
+  },
+  {
+    "id": "discover.confirmConnectionModal.connect",
+    "defaultMessage": "!!!Connect",
+    "file": "src/features/Discover/common/useStrings.tsx",
+    "start": {
+      "line": 93,
+      "column": 35,
+      "index": 3777
+    },
+    "end": {
+      "line": 96,
+      "column": 5,
+      "index": 3873
+    }
+  },
+  {
+    "id": "discover.confirmConnectionModal.allowThisDAppTo",
+    "defaultMessage": "!!!Allow this DApp to:",
+    "file": "src/features/Discover/common/useStrings.tsx",
+    "start": {
+      "line": 97,
+      "column": 43,
+      "index": 3918
+    },
+    "end": {
+      "line": 100,
+      "column": 5,
+      "index": 4034
+    }
+  },
+  {
+    "id": "discover.confirmConnectionModal.permission1",
+    "defaultMessage": "!!!View addresses, account balance, activity",
+    "file": "src/features/Discover/common/useStrings.tsx",
+    "start": {
+      "line": 101,
+      "column": 39,
+      "index": 4075
+    },
+    "end": {
+      "line": 104,
+      "column": 5,
+      "index": 4209
+    }
+  },
+  {
+    "id": "discover.confirmConnectionModal.permission2",
+    "defaultMessage": "!!!Request approval for transactions",
+    "file": "src/features/Discover/common/useStrings.tsx",
+    "start": {
+      "line": 105,
+      "column": 39,
+      "index": 4250
+    },
+    "end": {
+      "line": 108,
       "column": 5,
-      "index": 2687
+      "index": 4376
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/legacy/WalletForm.json b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/legacy/WalletForm.json
new file mode 100644
index 0000000000..f9e6dc2acd
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/legacy/WalletForm.json
@@ -0,0 +1,92 @@
+[
+  {
+    "id": "components.walletinit.walletform.walletNameInputLabel",
+    "defaultMessage": "!!!Wallet name",
+    "file": "src/features/SetupWallet/legacy/WalletForm.tsx",
+    "start": {
+      "line": 142,
+      "column": 24,
+      "index": 5315
+    },
+    "end": {
+      "line": 145,
+      "column": 3,
+      "index": 5423
+    }
+  },
+  {
+    "id": "components.walletinit.walletform.newPasswordInput",
+    "defaultMessage": "!!!Spending password",
+    "file": "src/features/SetupWallet/legacy/WalletForm.tsx",
+    "start": {
+      "line": 146,
+      "column": 20,
+      "index": 5445
+    },
+    "end": {
+      "line": 149,
+      "column": 3,
+      "index": 5555
+    }
+  },
+  {
+    "id": "components.walletinit.walletform.continueButton",
+    "defaultMessage": "!!!Continue",
+    "file": "src/features/SetupWallet/legacy/WalletForm.tsx",
+    "start": {
+      "line": 150,
+      "column": 18,
+      "index": 5575
+    },
+    "end": {
+      "line": 153,
+      "column": 3,
+      "index": 5674
+    }
+  },
+  {
+    "id": "components.walletinit.createwallet.createwalletscreen.passwordLengthRequirement",
+    "defaultMessage": "!!!Minimum characters",
+    "file": "src/features/SetupWallet/legacy/WalletForm.tsx",
+    "start": {
+      "line": 154,
+      "column": 31,
+      "index": 5707
+    },
+    "end": {
+      "line": 157,
+      "column": 3,
+      "index": 5848
+    }
+  },
+  {
+    "id": "components.walletinit.walletform.repeatPasswordInputLabel",
+    "defaultMessage": "!!!Repeat password",
+    "file": "src/features/SetupWallet/legacy/WalletForm.tsx",
+    "start": {
+      "line": 158,
+      "column": 28,
+      "index": 5878
+    },
+    "end": {
+      "line": 161,
+      "column": 3,
+      "index": 5994
+    }
+  },
+  {
+    "id": "components.walletinit.walletform.repeatPasswordInputError",
+    "defaultMessage": "!!!Passwords do not match",
+    "file": "src/features/SetupWallet/legacy/WalletForm.tsx",
+    "start": {
+      "line": 162,
+      "column": 28,
+      "index": 6024
+    },
+    "end": {
+      "line": 165,
+      "column": 3,
+      "index": 6147
+    }
+  }
+]
\ No newline at end of file
diff --git a/packages/dapp-connector/src/connector.js b/packages/dapp-connector/src/connector.js
index 5a002efdaa..63ee52c486 100644
--- a/packages/dapp-connector/src/connector.js
+++ b/packages/dapp-connector/src/connector.js
@@ -6,6 +6,13 @@
  * @Property {(...args: any[]) => Promise} getNetworkId Function to get network ID.
  * @Property {(...args: any[]) => Promise} getRewardAddresses Function to get reward addresses.
  * @Property {(...args: any[]) => Promise} getUsedAddresses Function to get used addresses.
+ * @Property {(...args: any[]) => Promise} getUnusedAddresses Function to get unused addresses.
+ * @Property {(...args: any[]) => Promise} getUtxos Function to get UTXOs.
+ * @Property {(...args: any[]) => Promise} signData Function to sign data.
+ * @Property {(...args: any[]) => Promise} signTx Function to sign transaction.
+ * @Property {(...args: any[]) => Promise} submitTx Function to submit transaction.
+ * @Property {(...args: any[]) => Promise} getCollateral Function to get collateral.
+ * @Property {(...args: any[]) => Promise} getExtensions Function to get extensions.
  */
 
 /**
@@ -100,7 +107,7 @@ const initWallet = ({iconUrl, apiVersion, walletName, supportedExtensions, sessi
   }
 
   window.addEventListener('message', (event) => {
-    logMessage('Received message' + JSON.stringify(event.data))
+    logMessage('Received message ' + JSON.stringify(event.data))
     const {id, result, error} = event.data
     const promise = promisesMap.get(id)
     if (!promise) return
@@ -125,11 +132,18 @@ const initWallet = ({iconUrl, apiVersion, walletName, supportedExtensions, sessi
     enabling = false
 
     return {
+      getExtensions: (...args) => callExternalMethod('api.getExtensions', args),
+      getNetworkId: (...args) => callExternalMethod('api.getNetworkId', args),
+      getUtxos: (...args) => callExternalMethod('api.getUtxos', args),
+      getCollateral: (...args) => callExternalMethod('api.getCollateral', args),
       getBalance: (...args) => callExternalMethod('api.getBalance', args),
+      getUsedAddresses: (...args) => callExternalMethod('api.getUsedAddresses', args),
+      getUnusedAddresses: (...args) => callExternalMethod('api.getUnusedAddresses', args),
       getChangeAddress: (...args) => callExternalMethod('api.getChangeAddress', args),
-      getNetworkId: (...args) => callExternalMethod('api.getNetworkId', args),
       getRewardAddresses: (...args) => callExternalMethod('api.getRewardAddresses', args),
-      getUsedAddresses: (...args) => callExternalMethod('api.getUsedAddresses', args),
+      signTx: (...args) => callExternalMethod('api.signTx', args),
+      signData: (...args) => callExternalMethod('api.signData', args),
+      submitTx: (...args) => callExternalMethod('api.submitTx', args),
     }
   }
 
diff --git a/packages/dapp-connector/src/dapp-connector.test.ts b/packages/dapp-connector/src/dapp-connector.test.ts
index aa8c24fdc1..f27d4704eb 100644
--- a/packages/dapp-connector/src/dapp-connector.test.ts
+++ b/packages/dapp-connector/src/dapp-connector.test.ts
@@ -4,6 +4,8 @@ import {connectionStorageMaker} from './adapters/async-storage'
 import {dappConnectorMaker} from './dapp-connector'
 import {Api, dappConnectorApiMaker} from './adapters/api'
 import {mockedDAppList} from './manager.mocks'
+import {ResolverWallet} from './resolver'
+import {init} from '@emurgo/cross-csl-nodejs'
 
 const getDappConnector = (wallet = mockWallet) => {
   const storage = connectionStorageMaker({storage: storageMock})
@@ -94,7 +96,9 @@ describe('DappConnector', () => {
       expect(sendMessage).toHaveBeenCalledWith(
         '1',
         null,
-        new Error(`Unknown method 'unknown' with params {"browserContext":{"origin":"https://yoroi-wallet.com"}}`),
+        new Error(
+          `Unknown method 'unknown' with params {"args":[],"browserContext":{"origin":"https://yoroi-wallet.com"}}`,
+        ),
       )
     })
 
@@ -128,6 +132,13 @@ describe('DappConnector', () => {
       await dappConnector.handleEvent(createEvent('log_message'), trustedUrl, sendMessage)
     })
 
+    it('should ignore log_message event if it has no arguments', async () => {
+      const dappConnector = getDappConnector()
+      const sendMessage = jest.fn()
+      await dappConnector.handleEvent(createEvent('log_message', {args: undefined}), trustedUrl, sendMessage)
+      expect(sendMessage).not.toHaveBeenCalledWith(sendMessage)
+    })
+
     it('should handle cardano_enable event with true if the user confirms connection', async () => {
       const dappConnector = getDappConnector({...mockWallet, confirmConnection: () => Promise.resolve(true)})
       const event = createEvent('cardano_enable')
@@ -230,12 +241,20 @@ describe('DappConnector', () => {
       expect(sendMessage).toHaveBeenCalledWith('1', mockedData[walletId].balance)
     })
 
-    it('should resolve getChangeAddresses with mocked data', async () => {
+    it('should throw in getBalance with when incorrect arguments are presented', async () => {
+      const dappConnector = getDappConnector()
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(createEvent('api.getBalance', {args: [1]}), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', null, new Error(`Invalid params`))
+    })
+
+    it('should resolve getChangeAddress with mocked data', async () => {
       const dappConnector = getDappConnector()
       const sendMessage = jest.fn()
       await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
-      await dappConnector.handleEvent(createEvent('api.getChangeAddresses'), trustedUrl, sendMessage)
-      expect(sendMessage).toHaveBeenCalledWith('1', mockedData[walletId].changeAddresses)
+      await dappConnector.handleEvent(createEvent('api.getChangeAddress'), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', mockedData[walletId].changeAddresses[0])
     })
 
     it('should resolve getRewardAddresses with mocked data', async () => {
@@ -247,11 +266,170 @@ describe('DappConnector', () => {
     })
 
     it('should resolve getUsedAddresses with mocked data', async () => {
-      const dappConnector = getDappConnector()
+      const dappConnector = getDappConnector({
+        ...mockWallet,
+        getUsedAddresses: () => Promise.resolve([{toHex: () => '00'}] as any),
+      })
       const sendMessage = jest.fn()
       await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
       await dappConnector.handleEvent(createEvent('api.getUsedAddresses'), trustedUrl, sendMessage)
-      expect(sendMessage).toHaveBeenCalledWith('1', mockedData[walletId].usedAddresses)
+      expect(sendMessage).toHaveBeenCalledWith('1', ['00'])
+    })
+
+    it('should resolve getUsedAddresses with mocked data also when pagination is provided', async () => {
+      const dappConnector = getDappConnector({
+        ...mockWallet,
+        getUsedAddresses: () => Promise.resolve([{toHex: () => '00'}] as any),
+      })
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(
+        createEvent('api.getUsedAddresses', {
+          args: [{page: 1, limit: 1}],
+        }),
+        trustedUrl,
+        sendMessage,
+      )
+      expect(sendMessage).toHaveBeenCalledWith('1', ['00'])
+    })
+
+    it('should resolve signTx with mocked data if partial sign is unknown', async () => {
+      const dappConnector = getDappConnector()
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(createEvent('api.signTx', {args: ['CBOR']}), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', 'a0')
+    })
+
+    it('should resolve signTx with mocked data if partial sign is known', async () => {
+      const dappConnector = getDappConnector()
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(createEvent('api.signTx', {args: ['CBOR', true]}), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', 'a0')
+    })
+
+    it('should throw in signTx with when incorrect arguments are presented', async () => {
+      const dappConnector = getDappConnector()
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(createEvent('api.signTx', {args: []}), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', null, new Error(`Invalid params`))
+    })
+
+    it('should resolve signData with mocked data', async () => {
+      const dappConnector = getDappConnector()
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(
+        createEvent('api.signData', {
+          args: [
+            'addr1qxxvt9rzpdxxysmqp50d7f5a3gdescgrejsu7zsdxqjy8yun4cngaq46gr8c9qyz4td9ddajzqhjnrqvfh0gspzv9xnsmq6nqx',
+            'CBOR',
+          ],
+        }),
+        trustedUrl,
+        sendMessage,
+      )
+      expect(sendMessage).toHaveBeenCalledWith('1', {key: '', signature: ''})
+    })
+
+    it('should throw in signData with when incorrect arguments are presented', async () => {
+      const dappConnector = getDappConnector()
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(createEvent('api.signData', {args: []}), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', null, new Error(`Invalid params`))
+    })
+
+    it('should resolve submitTx with mocked data', async () => {
+      const dappConnector = getDappConnector()
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(createEvent('api.submitTx', {args: ['CBOR']}), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', 'tx-id')
+    })
+
+    it('should throw in submitTx with when incorrect arguments are presented', async () => {
+      const dappConnector = getDappConnector()
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(createEvent('api.submitTx', {args: []}), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', null, new Error(`Invalid params`))
+    })
+
+    it('should resolve getCollateral with mocked data', async () => {
+      const dappConnector = getDappConnector({
+        ...mockWallet,
+        getCollateral: () => Promise.resolve([{toHex: () => '00'}] as any),
+      })
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(createEvent('api.getCollateral'), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', ['00'])
+    })
+
+    it('should resolve getCollateral with null if not enough funds', async () => {
+      const dappConnector = getDappConnector()
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(createEvent('api.getCollateral', {args: ['100000000']}), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', null)
+    })
+
+    it('should resolve getUnusedAddresses with mocked data', async () => {
+      const dappConnector = getDappConnector({
+        ...mockWallet,
+        getUnusedAddresses: () => Promise.resolve([{toHex: () => '00'}] as any),
+      })
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(createEvent('api.getUnusedAddresses'), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', ['00'])
+    })
+
+    it('should resolve getExtensions with CIP30', async () => {
+      const dappConnector = getDappConnector()
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(createEvent('api.getExtensions'), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', [{cip: 30}])
+    })
+
+    it('should resolve getUtxos with mocked data', async () => {
+      const dappConnector = getDappConnector({
+        ...mockWallet,
+        getUtxos: () => Promise.resolve([{toHex: () => '00'}] as any),
+      })
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(createEvent('api.getUtxos'), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', ['00'])
+    })
+
+    it('should resolve getUtxos with mocked data also when pagination is provided', async () => {
+      const dappConnector = getDappConnector({
+        ...mockWallet,
+        getUtxos: () => Promise.resolve([{toHex: () => '00'}] as any),
+      })
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(
+        createEvent('api.getUtxos', {
+          args: ['100000000', {page: 1, limit: 1}],
+        }),
+        trustedUrl,
+        sendMessage,
+      )
+      expect(sendMessage).toHaveBeenCalledWith('1', ['00'])
+    })
+
+    it('should resolve getUtxos with null if not enough funds', async () => {
+      const dappConnector = getDappConnector()
+      const sendMessage = jest.fn()
+      await dappConnector.addConnection({walletId, dappOrigin: 'https://yoroi-wallet.com'})
+      await dappConnector.handleEvent(createEvent('api.getUtxos', {args: ['100000000']}), trustedUrl, sendMessage)
+      expect(sendMessage).toHaveBeenCalledWith('1', null)
     })
   })
 
@@ -264,9 +442,33 @@ describe('DappConnector', () => {
 })
 
 const createEvent = (method: string, params?: object) => {
-  return JSON.stringify({id: '1', method, params: {...params, browserContext: {origin: 'https://yoroi-wallet.com'}}})
+  return JSON.stringify({
+    id: '1',
+    method,
+    params: {args: [], ...params, browserContext: {origin: 'https://yoroi-wallet.com'}},
+  })
 }
 
 const walletId = 'b5d94758-26c5-48b0-af2b-6e68c3ef2dbf'
-const mockWallet = {id: walletId, networkId: 1, confirmConnection: async () => true}
+
+const CSL = init('test')
+const mockWallet: ResolverWallet = {
+  signTx: () => Promise.resolve(CSL.TransactionWitnessSet.new()),
+  signData: () => Promise.resolve({key: '', signature: ''}),
+  id: walletId,
+  networkId: 1,
+  confirmConnection: async () => true,
+  getBalance: () => CSL.Value.fromHex('1a062ea8a0'),
+  getUnusedAddresses: () => Promise.resolve([]),
+  getUsedAddresses: () => Promise.resolve([]),
+  getChangeAddress: () =>
+    CSL.Address.fromHex(
+      '017ef00ee3672330155382a2857573868af466b88aa8c4081f45583e1784d958399bcce03402fd853d43a4e7366f2018932e5aff4eea904693',
+    ),
+  getRewardAddresses: () =>
+    Promise.all([CSL.Address.fromHex('e184d958399bcce03402fd853d43a4e7366f2018932e5aff4eea904693')]),
+  getUtxos: () => Promise.resolve([]),
+  getCollateral: () => Promise.resolve([]),
+  submitTx: () => Promise.resolve('tx-id'),
+}
 const trustedUrl = 'https://yoroi-wallet.com/'
diff --git a/packages/dapp-connector/src/dapp-connector.ts b/packages/dapp-connector/src/dapp-connector.ts
index e25e1ae16e..6a88ec7c57 100644
--- a/packages/dapp-connector/src/dapp-connector.ts
+++ b/packages/dapp-connector/src/dapp-connector.ts
@@ -1,4 +1,4 @@
-import {resolverHandleEvent} from './resolver'
+import {resolverHandleEvent, ResolverWallet} from './resolver'
 // @ts-ignore-next-line
 import {connectWallet} from './connector'
 import {DappConnection, Storage} from './adapters/async-storage'
@@ -17,12 +17,12 @@ export type DappConnectorManager = {
   ): Promise<void>
 }
 
-export const dappConnectorMaker = (storage: Storage, wallet: Wallet, api: Api): DappConnector => {
+export const dappConnectorMaker = (storage: Storage, wallet: ResolverWallet, api: Api): DappConnector => {
   return new DappConnector(storage, wallet, api)
 }
 
 export class DappConnector implements DappConnectorManager {
-  constructor(private storage: Storage, private wallet: Wallet, private api: Api) {}
+  constructor(private storage: Storage, private wallet: ResolverWallet, private api: Api) {}
 
   async getDAppList() {
     return this.api.getDApps()
@@ -51,7 +51,7 @@ export class DappConnector implements DappConnectorManager {
     trustedUrl: string,
     sendMessage: (id: string, result: unknown, error?: Error) => void,
   ) {
-    return await resolverHandleEvent(eventData, trustedUrl, this.wallet, sendMessage, this.storage)
+    return await resolverHandleEvent(eventData, trustedUrl, this.wallet, sendMessage, this.storage, supportedExtensions)
   }
 }
 
@@ -59,10 +59,4 @@ type SupportedExtension = {
   cip: number
 }
 
-const supportedExtensions: SupportedExtension[] = []
-
-type Wallet = {
-  id: string
-  networkId: number
-  confirmConnection: (dappOrigin: string) => Promise<boolean>
-}
+const supportedExtensions: SupportedExtension[] = [{cip: 30}]
diff --git a/packages/dapp-connector/src/index.ts b/packages/dapp-connector/src/index.ts
index ab39444d66..bfe8b0f1cc 100644
--- a/packages/dapp-connector/src/index.ts
+++ b/packages/dapp-connector/src/index.ts
@@ -1,5 +1,6 @@
-export {connectionStorageMaker, type Storage} from './adapters/async-storage'
-export {type DappConnector, dappConnectorMaker} from './dapp-connector'
+export {connectionStorageMaker, type Storage, type DappConnection} from './adapters/async-storage'
+export {type DappConnector, dappConnectorMaker, type DappConnectorManager} from './dapp-connector'
 export * from './translators/reactjs/DappConnectorProvider'
 export {useDappList} from './translators/reactjs/useDappList'
 export {type DappListResponse, dappConnectorApiMaker} from './adapters/api'
+export {ResolverWallet} from './resolver'
diff --git a/packages/dapp-connector/src/resolver.ts b/packages/dapp-connector/src/resolver.ts
index a8b3599e1e..1bd34665ed 100644
--- a/packages/dapp-connector/src/resolver.ts
+++ b/packages/dapp-connector/src/resolver.ts
@@ -1,12 +1,14 @@
-import {isKeyOf, isRecord} from '@yoroi/common'
-import {mockedData, mockWalletId1} from './mocks'
+import {isKeyOf, isRecord, createTypeGuardFromSchema} from '@yoroi/common'
 import {Storage} from './adapters/async-storage'
+import {z} from 'zod'
+import {Address, TransactionUnspentOutput, TransactionWitnessSet, Value} from '@emurgo/cross-csl-core'
 
 type Context = {
   browserOrigin: string
-  wallet: Wallet
+  wallet: ResolverWallet
   trustedOrigin: string
   storage: Storage
+  supportedExtensions: Array<{cip: number}>
 }
 
 type ResolvableMethod<T> = (params: unknown, context: Context) => Promise<T>
@@ -17,10 +19,17 @@ type Resolver = {
   isEnabled: ResolvableMethod<boolean>
   api: {
     getBalance: ResolvableMethod<string>
-    getChangeAddresses: ResolvableMethod<string[]>
+    getChangeAddress: ResolvableMethod<string>
     getNetworkId: ResolvableMethod<number>
     getRewardAddresses: ResolvableMethod<string[]>
     getUsedAddresses: ResolvableMethod<string[]>
+    getExtensions: ResolvableMethod<Array<{cip: number}>>
+    getUnusedAddresses: ResolvableMethod<string[]>
+    getUtxos: ResolvableMethod<string[] | null>
+    getCollateral: ResolvableMethod<string[] | null>
+    submitTx: ResolvableMethod<string>
+    signTx: ResolvableMethod<string>
+    signData: ResolvableMethod<{signature: string; key: string}>
   }
 }
 
@@ -43,15 +52,86 @@ export const resolver: Resolver = {
     return hasWalletAcceptedConnection(context)
   },
   api: {
-    getBalance: async (_params: unknown, context: Context) => {
+    signTx: async (params: unknown, context: Context) => {
       assertOriginsMatch(context)
       await assertWalletAcceptedConnection(context)
-      return mockedData[mockWalletId1].balance
+      const tx =
+        isRecord(params) && isKeyOf('args', params) && Array.isArray(params.args) && typeof params.args[0] === 'string'
+          ? params.args[0]
+          : undefined
+      const partialSign =
+        isRecord(params) && isKeyOf('args', params) && Array.isArray(params.args) && typeof params.args[1] === 'boolean'
+          ? params.args[1]
+          : undefined
+      if (tx === undefined) throw new Error('Invalid params')
+      const result = await context.wallet.signTx(tx, partialSign ?? false)
+      return result.toHex()
     },
-    getChangeAddresses: async (_params: unknown, context: Context) => {
+    signData: async (params: unknown, context: Context) => {
       assertOriginsMatch(context)
       await assertWalletAcceptedConnection(context)
-      return mockedData[mockWalletId1].changeAddresses
+      const address =
+        isRecord(params) && isKeyOf('args', params) && Array.isArray(params.args) && typeof params.args[0] === 'string'
+          ? params.args[0]
+          : undefined
+      const payload =
+        isRecord(params) && isKeyOf('args', params) && Array.isArray(params.args) && typeof params.args[1] === 'string'
+          ? params.args[1]
+          : undefined
+      if (address === undefined || payload === undefined) throw new Error('Invalid params')
+      return context.wallet.signData(address, payload)
+    },
+    submitTx: async (params: unknown, context: Context) => {
+      assertOriginsMatch(context)
+      await assertWalletAcceptedConnection(context)
+      if (
+        !isRecord(params) ||
+        !isKeyOf('args', params) ||
+        !Array.isArray(params.args) ||
+        typeof params.args[0] !== 'string'
+      ) {
+        throw new Error('Invalid params')
+      }
+      return context.wallet.submitTx(params.args[0])
+    },
+    getCollateral: async (params: unknown, context: Context) => {
+      assertOriginsMatch(context)
+      await assertWalletAcceptedConnection(context)
+      const value =
+        isRecord(params) && Array.isArray(params.args) && typeof params.args[0] === 'string'
+          ? params.args[0]
+          : undefined
+      const result = await context.wallet.getCollateral(value)
+
+      if (result === null || (result.length === 0 && typeof value === 'string')) return null
+
+      return Promise.all(result.map((u) => u.toHex()))
+    },
+
+    getUnusedAddresses: async (_params: unknown, context: Context) => {
+      assertOriginsMatch(context)
+      await assertWalletAcceptedConnection(context)
+      const addresses = await context.wallet.getUnusedAddresses()
+      return Promise.all(addresses.map((a) => a.toHex()))
+    },
+    getExtensions: async (_params: unknown, context: Context) => {
+      assertOriginsMatch(context)
+      await assertWalletAcceptedConnection(context)
+      return context.supportedExtensions
+    },
+    getBalance: async (params: unknown, context: Context) => {
+      assertOriginsMatch(context)
+      await assertWalletAcceptedConnection(context)
+      if (!isGetBalanceParams(params)) throw new Error('Invalid params')
+      const [tokenId = '*'] = params.args
+      const balance = await context.wallet.getBalance(tokenId)
+      return balance.toHex()
+    },
+    getChangeAddress: async (_params: unknown, context: Context) => {
+      assertOriginsMatch(context)
+      await assertWalletAcceptedConnection(context)
+      const address = await context.wallet.getChangeAddress()
+      return address.toHex()
     },
     getNetworkId: async (_params: unknown, context: Context) => {
       assertOriginsMatch(context)
@@ -61,16 +141,42 @@ export const resolver: Resolver = {
     getRewardAddresses: async (_params: unknown, context: Context) => {
       assertOriginsMatch(context)
       await assertWalletAcceptedConnection(context)
-      return mockedData[mockWalletId1].rewardAddresses
+      const addresses = await context.wallet.getRewardAddresses()
+      return Promise.all(addresses.map((a) => a.toHex()))
     },
-    getUsedAddresses: async (_params: unknown, context: Context) => {
+    getUtxos: async (params: unknown, context: Context) => {
       assertOriginsMatch(context)
       await assertWalletAcceptedConnection(context)
-      return mockedData[mockWalletId1].usedAddresses
+      const value =
+        isRecord(params) && Array.isArray(params.args) && typeof params.args[0] === 'string'
+          ? params.args[0]
+          : undefined
+      const pagination =
+        isRecord(params) && Array.isArray(params.args) && isPaginationParams(params.args[1])
+          ? params.args[1]
+          : undefined
+      const utxos = await context.wallet.getUtxos(value, pagination)
+      if (utxos === null || (utxos.length === 0 && typeof value === 'string')) return null
+      return Promise.all(utxos.map((u) => u.toHex()))
+    },
+    getUsedAddresses: async (params: unknown, context: Context) => {
+      assertOriginsMatch(context)
+      await assertWalletAcceptedConnection(context)
+      const pagination =
+        isRecord(params) && Array.isArray(params.args) && isPaginationParams(params.args[0])
+          ? params.args[0]
+          : undefined
+      const addresses = await context.wallet.getUsedAddresses(pagination)
+      return Promise.all(addresses.map((a) => a.toHex()))
     },
   },
 } as const
 
+const paginationSchema = z.object({page: z.number(), limit: z.number()})
+const getBalanceSchema = z.object({args: z.array(z.string().optional())})
+const isGetBalanceParams = createTypeGuardFromSchema(getBalanceSchema)
+const isPaginationParams = createTypeGuardFromSchema(paginationSchema)
+
 const assertOriginsMatch = (context: Context) => {
   if (context.browserOrigin !== context.trustedOrigin) {
     throw new Error(`Origins do not match: ${context.browserOrigin} !== ${context.trustedOrigin}`)
@@ -94,7 +200,7 @@ const hasWalletAcceptedConnection = async (context: Context) => {
 const handleMethod = async (
   method: string,
   params: {browserContext?: {origin?: unknown}},
-  trustedContext: {wallet: Wallet; origin: string; storage: Storage},
+  trustedContext: {wallet: ResolverWallet; origin: string; storage: Storage; supportedExtensions: Array<{cip: number}>},
 ) => {
   const browserOrigin = String(params?.browserContext?.origin || '')
 
@@ -103,6 +209,7 @@ const handleMethod = async (
     wallet: trustedContext.wallet,
     trustedOrigin: trustedContext.origin,
     storage: trustedContext.storage,
+    supportedExtensions: trustedContext.supportedExtensions,
   }
 
   if (method === 'cardano_enable') {
@@ -131,24 +238,40 @@ const handleMethod = async (
 export const resolverHandleEvent = async (
   eventData: string,
   trustedUrl: string,
-  wallet: Wallet,
+  wallet: ResolverWallet,
   sendMessage: (id: string, result: unknown, error?: Error) => void,
   storage: Storage,
+  supportedExtensions: Array<{cip: number}>,
 ) => {
   const trustedOrigin = new URL(trustedUrl).origin
   const {id, method, params} = JSON.parse(eventData)
   try {
-    const result = await handleMethod(method, params, {origin: trustedOrigin, wallet, storage})
+    const result = await handleMethod(method, params, {origin: trustedOrigin, wallet, storage, supportedExtensions})
     if (method !== LOG_MESSAGE_EVENT) sendMessage(id, result)
   } catch (error) {
     sendMessage(id, null, error as Error)
   }
 }
 
-type Wallet = {
+export type ResolverWallet = {
   id: string
   networkId: number
   confirmConnection: (dappOrigin: string) => Promise<boolean>
+  getBalance: (tokenId?: string) => Promise<Value>
+  getUnusedAddresses: () => Promise<Address[]>
+  getUsedAddresses: (pagination?: Pagination) => Promise<Address[]>
+  getChangeAddress: () => Promise<Address>
+  getRewardAddresses: () => Promise<Address[]>
+  getUtxos: (value?: string, pagination?: Pagination) => Promise<TransactionUnspentOutput[] | null>
+  getCollateral: (value?: string) => Promise<TransactionUnspentOutput[] | null>
+  submitTx: (cbor: string) => Promise<string>
+  signTx: (txHex: string, partialSign?: boolean) => Promise<TransactionWitnessSet>
+  signData: (address: string, payload: string) => Promise<{signature: string; key: string}>
+}
+
+type Pagination = {
+  page: number
+  limit: number
 }
 
 const LOG_MESSAGE_EVENT = 'log_message'
diff --git a/yarn.lock b/yarn.lock
index 6ce31e9ce1..f4535a9742 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2156,10 +2156,10 @@
     bignumber.js "^9.0.1"
     easy-crc "1.1.0"
 
-"@emurgo/yoroi-lib@0.15.4-alpha.6":
-  version "0.15.4-alpha.6"
-  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.4-alpha.6.tgz#2287b75a00ee0a20f24a670b48aba051cae705cc"
-  integrity sha512-fKO+fKOz7WaBtEeTVw5TL06PJanDsYdSyb/WPGNA5xiS4BaOXCzJj2cgh39cjwuI8pvChYtyA+7JlSgWuFehpQ==
+"@emurgo/yoroi-lib@0.15.4-alpha.7":
+  version "0.15.4-alpha.7"
+  resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.4-alpha.7.tgz#a964beaee14163feb0ef50e914de744aea3aea7d"
+  integrity sha512-5huN9m73+XbIfQQILY4eHsT719M1HF+yOXKXxBZH2hrgNR3JfSGQtE2Ihc7ZK+4F/II39yR8XLC7lxcrq/7BLg==
   dependencies:
     "@cardano-foundation/ledgerjs-hw-app-cardano" "^6.0.0"
     "@emurgo/cross-csl-core" "4.4.0"
@@ -21044,16 +21044,7 @@ string-natural-compare@^3.0.1:
   resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
   integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -21166,7 +21157,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -21194,13 +21185,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -22813,7 +22797,7 @@ workerpool@6.2.1:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
   integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -22849,15 +22833,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"

From 5043e6860f77142740e132b470a9d73e4595d306 Mon Sep 17 00:00:00 2001
From: Ruslan Dudin <vantuz-subhuman@yandex.ru>
Date: Wed, 22 May 2024 22:52:09 +0300
Subject: [PATCH 2/2] chore(wallet-mobile): Translations updated (#3268)

---
 apps/wallet-mobile/src/i18n/locales/bn-BD.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/cs-CZ.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/de-DE.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/el-GR.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/es-ES.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/fil-PH.json  | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/fr-FR.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/hr-HR.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/hu-HU.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/id-ID.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/it-IT.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/ja-JP.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/ko-KR.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/nl-NL.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/pl-PL.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/pt-BR.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/ru-RU.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/sk-SK.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/sl-SI.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/sv-SE.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/sw-KE.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/tr-TR.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/uk-UA.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/vi-VN.json   | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/zh-Hans.json | 8 +++++++-
 apps/wallet-mobile/src/i18n/locales/zh-Hant.json | 8 +++++++-
 26 files changed, 182 insertions(+), 26 deletions(-)

diff --git a/apps/wallet-mobile/src/i18n/locales/bn-BD.json b/apps/wallet-mobile/src/i18n/locales/bn-BD.json
index 1afe59f77b..45daa81bbc 100644
--- a/apps/wallet-mobile/src/i18n/locales/bn-BD.json
+++ b/apps/wallet-mobile/src/i18n/locales/bn-BD.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/cs-CZ.json b/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
index 83aed783d7..fc51ebbcb9 100644
--- a/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
+++ b/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/de-DE.json b/apps/wallet-mobile/src/i18n/locales/de-DE.json
index 365a6a26a2..04c9f12d16 100644
--- a/apps/wallet-mobile/src/i18n/locales/de-DE.json
+++ b/apps/wallet-mobile/src/i18n/locales/de-DE.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/el-GR.json b/apps/wallet-mobile/src/i18n/locales/el-GR.json
index de92dc567c..e912458851 100644
--- a/apps/wallet-mobile/src/i18n/locales/el-GR.json
+++ b/apps/wallet-mobile/src/i18n/locales/el-GR.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/es-ES.json b/apps/wallet-mobile/src/i18n/locales/es-ES.json
index 2ea2e090e1..ca6090ec72 100644
--- a/apps/wallet-mobile/src/i18n/locales/es-ES.json
+++ b/apps/wallet-mobile/src/i18n/locales/es-ES.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/fil-PH.json b/apps/wallet-mobile/src/i18n/locales/fil-PH.json
index 1afe59f77b..45daa81bbc 100644
--- a/apps/wallet-mobile/src/i18n/locales/fil-PH.json
+++ b/apps/wallet-mobile/src/i18n/locales/fil-PH.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/fr-FR.json b/apps/wallet-mobile/src/i18n/locales/fr-FR.json
index 88177f49ba..077e13281a 100644
--- a/apps/wallet-mobile/src/i18n/locales/fr-FR.json
+++ b/apps/wallet-mobile/src/i18n/locales/fr-FR.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/hr-HR.json b/apps/wallet-mobile/src/i18n/locales/hr-HR.json
index 8f3725dfc1..fd93259383 100644
--- a/apps/wallet-mobile/src/i18n/locales/hr-HR.json
+++ b/apps/wallet-mobile/src/i18n/locales/hr-HR.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/hu-HU.json b/apps/wallet-mobile/src/i18n/locales/hu-HU.json
index 0b07154445..f8b063e5ec 100644
--- a/apps/wallet-mobile/src/i18n/locales/hu-HU.json
+++ b/apps/wallet-mobile/src/i18n/locales/hu-HU.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/id-ID.json b/apps/wallet-mobile/src/i18n/locales/id-ID.json
index a5a9b861d0..6d8111bf6b 100644
--- a/apps/wallet-mobile/src/i18n/locales/id-ID.json
+++ b/apps/wallet-mobile/src/i18n/locales/id-ID.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/it-IT.json b/apps/wallet-mobile/src/i18n/locales/it-IT.json
index a0aa801183..d9a81ce865 100644
--- a/apps/wallet-mobile/src/i18n/locales/it-IT.json
+++ b/apps/wallet-mobile/src/i18n/locales/it-IT.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/ja-JP.json b/apps/wallet-mobile/src/i18n/locales/ja-JP.json
index 64925c9734..e73efbb1a5 100644
--- a/apps/wallet-mobile/src/i18n/locales/ja-JP.json
+++ b/apps/wallet-mobile/src/i18n/locales/ja-JP.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/ko-KR.json b/apps/wallet-mobile/src/i18n/locales/ko-KR.json
index 77001ef16f..fdda9b81cc 100644
--- a/apps/wallet-mobile/src/i18n/locales/ko-KR.json
+++ b/apps/wallet-mobile/src/i18n/locales/ko-KR.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/nl-NL.json b/apps/wallet-mobile/src/i18n/locales/nl-NL.json
index 7a5616e899..a687c48d8b 100644
--- a/apps/wallet-mobile/src/i18n/locales/nl-NL.json
+++ b/apps/wallet-mobile/src/i18n/locales/nl-NL.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/pl-PL.json b/apps/wallet-mobile/src/i18n/locales/pl-PL.json
index 1afe59f77b..45daa81bbc 100644
--- a/apps/wallet-mobile/src/i18n/locales/pl-PL.json
+++ b/apps/wallet-mobile/src/i18n/locales/pl-PL.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/pt-BR.json b/apps/wallet-mobile/src/i18n/locales/pt-BR.json
index 88c7dc8d21..bbe94c2122 100644
--- a/apps/wallet-mobile/src/i18n/locales/pt-BR.json
+++ b/apps/wallet-mobile/src/i18n/locales/pt-BR.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/ru-RU.json b/apps/wallet-mobile/src/i18n/locales/ru-RU.json
index 4f9c73a89f..65c82c95e8 100644
--- a/apps/wallet-mobile/src/i18n/locales/ru-RU.json
+++ b/apps/wallet-mobile/src/i18n/locales/ru-RU.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/sk-SK.json b/apps/wallet-mobile/src/i18n/locales/sk-SK.json
index ecac80019e..20899031ee 100644
--- a/apps/wallet-mobile/src/i18n/locales/sk-SK.json
+++ b/apps/wallet-mobile/src/i18n/locales/sk-SK.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/sl-SI.json b/apps/wallet-mobile/src/i18n/locales/sl-SI.json
index 1afe59f77b..45daa81bbc 100644
--- a/apps/wallet-mobile/src/i18n/locales/sl-SI.json
+++ b/apps/wallet-mobile/src/i18n/locales/sl-SI.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/sv-SE.json b/apps/wallet-mobile/src/i18n/locales/sv-SE.json
index 1afe59f77b..45daa81bbc 100644
--- a/apps/wallet-mobile/src/i18n/locales/sv-SE.json
+++ b/apps/wallet-mobile/src/i18n/locales/sv-SE.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/sw-KE.json b/apps/wallet-mobile/src/i18n/locales/sw-KE.json
index 1afe59f77b..45daa81bbc 100644
--- a/apps/wallet-mobile/src/i18n/locales/sw-KE.json
+++ b/apps/wallet-mobile/src/i18n/locales/sw-KE.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/tr-TR.json b/apps/wallet-mobile/src/i18n/locales/tr-TR.json
index 294ea28b93..d59349f8ae 100644
--- a/apps/wallet-mobile/src/i18n/locales/tr-TR.json
+++ b/apps/wallet-mobile/src/i18n/locales/tr-TR.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/uk-UA.json b/apps/wallet-mobile/src/i18n/locales/uk-UA.json
index 1afe59f77b..45daa81bbc 100644
--- a/apps/wallet-mobile/src/i18n/locales/uk-UA.json
+++ b/apps/wallet-mobile/src/i18n/locales/uk-UA.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/vi-VN.json b/apps/wallet-mobile/src/i18n/locales/vi-VN.json
index 23eb7a9a1e..9bf165a222 100644
--- a/apps/wallet-mobile/src/i18n/locales/vi-VN.json
+++ b/apps/wallet-mobile/src/i18n/locales/vi-VN.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/zh-Hans.json b/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
index 12a9c7842a..596591270b 100644
--- a/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
+++ b/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }
diff --git a/apps/wallet-mobile/src/i18n/locales/zh-Hant.json b/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
index c597224590..dce5638847 100644
--- a/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
+++ b/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
@@ -1050,5 +1050,11 @@
   "discover.discoverList.dAppActions": "DApp actions",
   "walletinit.theme.tryDarkTheme": "Try Yoroi dark theme",
   "walletinit.theme.description": "Press the theme switcher and dive into the new stylish theme crafted to enhance your Cardano wallet experience",
-  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings"
+  "walletinit.theme.chanageTheme": "You can always change your theme later in the App settings",
+  "discover.confirmConnectionModal.title": "Confirm connection",
+  "discover.confirmConnectionModal.connectTo": "Connect to",
+  "discover.confirmConnectionModal.connect": "Connect",
+  "discover.confirmConnectionModal.allowThisDAppTo": "Allow this DApp to:",
+  "discover.confirmConnectionModal.permission1": "View addresses, account balance, activity",
+  "discover.confirmConnectionModal.permission2": "Request approval for transactions"
 }