From 94f6bfef65d890790c118fbb469cae700182116c Mon Sep 17 00:00:00 2001
From: Michal S <miso.szorad@gmail.com>
Date: Wed, 30 Oct 2024 20:25:25 +0000
Subject: [PATCH 1/4] feat(wallet-mobile): Rewards updated notification (#3715)

---
 .../Notifications/useCases/common/hooks.ts    |   2 +
 .../useCases/common/notification-manager.ts   |   2 +
 .../useCases/common/notifications.ts          |   8 ++
 .../common/rewards-updated-notification.ts    | 120 ++++++++++++++++++
 .../Notifications/useCases/common/storage.ts  |  11 ++
 .../transaction-received-notification.ts      |   4 +-
 packages/types/src/notifications/manager.ts   |   1 +
 7 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 apps/wallet-mobile/src/features/Notifications/useCases/common/rewards-updated-notification.ts

diff --git a/apps/wallet-mobile/src/features/Notifications/useCases/common/hooks.ts b/apps/wallet-mobile/src/features/Notifications/useCases/common/hooks.ts
index 21e427fe42..b47fc503a9 100644
--- a/apps/wallet-mobile/src/features/Notifications/useCases/common/hooks.ts
+++ b/apps/wallet-mobile/src/features/Notifications/useCases/common/hooks.ts
@@ -6,6 +6,7 @@ import {PermissionsAndroid} from 'react-native'
 import {notificationManager} from './notification-manager'
 import {parseNotificationId} from './notifications'
 import {usePrimaryTokenPriceChangedNotification} from './primary-token-price-changed-notification'
+import {useRewardsUpdatedNotifications} from './rewards-updated-notification'
 import {useTransactionReceivedNotifications} from './transaction-received-notification'
 
 let initialized = false
@@ -41,4 +42,5 @@ export const useInitNotifications = ({enabled}: {enabled: boolean}) => {
   React.useEffect(() => (enabled ? init() : undefined), [enabled])
   useTransactionReceivedNotifications({enabled})
   usePrimaryTokenPriceChangedNotification({enabled})
+  useRewardsUpdatedNotifications({enabled})
 }
diff --git a/apps/wallet-mobile/src/features/Notifications/useCases/common/notification-manager.ts b/apps/wallet-mobile/src/features/Notifications/useCases/common/notification-manager.ts
index c18f248e2c..2bcc1937d8 100644
--- a/apps/wallet-mobile/src/features/Notifications/useCases/common/notification-manager.ts
+++ b/apps/wallet-mobile/src/features/Notifications/useCases/common/notification-manager.ts
@@ -4,6 +4,7 @@ import {Notifications} from '@yoroi/types'
 
 import {displayNotificationEvent} from './notifications'
 import {primaryTokenPriceChangedSubject} from './primary-token-price-changed-notification'
+import {rewardsUpdatedSubject} from './rewards-updated-notification'
 import {transactionReceivedSubject} from './transaction-received-notification'
 
 const appStorage = mountAsyncStorage({path: '/'})
@@ -16,5 +17,6 @@ export const notificationManager = notificationManagerMaker({
   subscriptions: {
     [Notifications.Trigger.TransactionReceived]: transactionReceivedSubject,
     [Notifications.Trigger.PrimaryTokenPriceChanged]: primaryTokenPriceChangedSubject,
+    [Notifications.Trigger.RewardsUpdated]: rewardsUpdatedSubject,
   },
 })
diff --git a/apps/wallet-mobile/src/features/Notifications/useCases/common/notifications.ts b/apps/wallet-mobile/src/features/Notifications/useCases/common/notifications.ts
index 11356dba56..5ddca12e36 100644
--- a/apps/wallet-mobile/src/features/Notifications/useCases/common/notifications.ts
+++ b/apps/wallet-mobile/src/features/Notifications/useCases/common/notifications.ts
@@ -36,6 +36,14 @@ export const displayNotificationEvent = async (notificationEvent: NotificationTy
       id: notificationEvent.id,
     })
   }
+
+  if (notificationEvent.trigger === NotificationTypes.Trigger.RewardsUpdated) {
+    sendNotification({
+      title: 'Rewards updated',
+      body: 'Your rewards have been updated',
+      id: notificationEvent.id,
+    })
+  }
 }
 
 const sendNotification = (options: {title: string; body: string; id: number}) => {
diff --git a/apps/wallet-mobile/src/features/Notifications/useCases/common/rewards-updated-notification.ts b/apps/wallet-mobile/src/features/Notifications/useCases/common/rewards-updated-notification.ts
new file mode 100644
index 0000000000..b4d58eaa34
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Notifications/useCases/common/rewards-updated-notification.ts
@@ -0,0 +1,120 @@
+import {mountAsyncStorage, useAsyncStorage} from '@yoroi/common'
+import {App, Notifications as NotificationTypes} from '@yoroi/types'
+import * as BackgroundFetch from 'expo-background-fetch'
+import * as TaskManager from 'expo-task-manager'
+import * as React from 'react'
+import {Subject} from 'rxjs'
+
+import {useWalletManager} from '../../../WalletManager/context/WalletManagerProvider'
+import {walletManager} from '../../../WalletManager/wallet-manager'
+import {notificationManager} from './notification-manager'
+import {generateNotificationId} from './notifications'
+import {buildProcessedNotificationsStorage} from './storage'
+
+const backgroundTaskId = 'yoroi-rewards-updated-notifications-background-fetch'
+const storageKey = 'rewards-updated-notification-history'
+const backgroundSyncInMinutes = 60 * 10
+
+// Check is needed for hot reloading, as task can not be defined twice
+if (!TaskManager.isTaskDefined(backgroundTaskId)) {
+  const appStorage = mountAsyncStorage({path: '/'})
+  TaskManager.defineTask(backgroundTaskId, async () => {
+    await syncAllWallets()
+    const notifications = await buildNotifications(appStorage)
+    notifications.forEach((notification) => notificationManager.events.push(notification))
+    const hasNewData = notifications.length > 0
+    return hasNewData ? BackgroundFetch.BackgroundFetchResult.NewData : BackgroundFetch.BackgroundFetchResult.NoData
+  })
+}
+
+export const rewardsUpdatedSubject = new Subject<NotificationTypes.RewardsUpdatedEvent>()
+
+const registerBackgroundFetchAsync = () => {
+  return BackgroundFetch.registerTaskAsync(backgroundTaskId, {
+    minimumInterval: backgroundSyncInMinutes,
+    stopOnTerminate: false,
+    startOnBoot: true,
+  })
+}
+
+const buildNotifications = async (appStorage: App.Storage) => {
+  const walletIds = [...walletManager.walletMetas.keys()]
+  const notifications: NotificationTypes.RewardsUpdatedEvent[] = []
+
+  for (const walletId of walletIds) {
+    const wallet = walletManager.getWalletById(walletId)
+    if (!wallet) continue
+
+    const fullStorageKey = `wallet/${walletId}/${wallet.networkManager.network}/${storageKey}/` as const
+    const storage = buildProcessedNotificationsStorage(appStorage.join(fullStorageKey))
+    const stakingInfo = await wallet.getStakingInfo()
+    if (stakingInfo.status !== 'staked') continue
+
+    const {rewards} = stakingInfo
+
+    if (await storage.isEmpty()) {
+      await storage.setValues([rewards])
+    }
+
+    const [latestReward] = await storage.getValues()
+
+    if (latestReward === rewards) continue
+
+    await storage.setValues([rewards])
+    notifications.push(createRewardsUpdatedNotification())
+  }
+
+  return notifications
+}
+
+const unregisterBackgroundFetchAsync = () => {
+  return BackgroundFetch.unregisterTaskAsync(backgroundTaskId)
+}
+
+const syncAllWallets = async () => {
+  const ids = [...walletManager.walletMetas.keys()]
+  for (const id of ids) {
+    const wallet = walletManager.getWalletById(id)
+    if (!wallet) continue
+    await wallet.sync({})
+  }
+}
+
+const createRewardsUpdatedNotification = () => {
+  return {
+    id: generateNotificationId(),
+    date: new Date().toISOString(),
+    isRead: false,
+    trigger: NotificationTypes.Trigger.RewardsUpdated,
+  } as const
+}
+
+export const useRewardsUpdatedNotifications = ({enabled}: {enabled: boolean}) => {
+  const {walletManager} = useWalletManager()
+  const asyncStorage = useAsyncStorage()
+
+  React.useEffect(() => {
+    if (!enabled) return
+    registerBackgroundFetchAsync()
+    return () => {
+      unregisterBackgroundFetchAsync()
+    }
+  }, [enabled])
+
+  React.useEffect(() => {
+    if (!enabled) return
+    const subscription = walletManager.syncWalletInfos$.subscribe(async (status) => {
+      const walletInfos = Array.from(status.values())
+      const walletsDoneSyncing = walletInfos.filter((info) => info.status === 'done')
+      const areAllDone = walletsDoneSyncing.length === walletInfos.length
+      if (!areAllDone) return
+
+      const notifications = await buildNotifications(asyncStorage)
+      notifications.forEach((notification) => rewardsUpdatedSubject.next(notification))
+    })
+
+    return () => {
+      subscription.unsubscribe()
+    }
+  }, [walletManager, asyncStorage, enabled])
+}
diff --git a/apps/wallet-mobile/src/features/Notifications/useCases/common/storage.ts b/apps/wallet-mobile/src/features/Notifications/useCases/common/storage.ts
index 3cfee7308a..c880a05400 100644
--- a/apps/wallet-mobile/src/features/Notifications/useCases/common/storage.ts
+++ b/apps/wallet-mobile/src/features/Notifications/useCases/common/storage.ts
@@ -11,6 +11,10 @@ export const buildProcessedNotificationsStorage = (storage: App.Storage) => {
     await storage.setItem('processed', newProcessed)
   }
 
+  const setValues = async (values: string[]) => {
+    await storage.setItem('processed', values)
+  }
+
   const includes = async (value: string) => {
     const processed = await getValues()
     return processed.includes(value)
@@ -20,10 +24,17 @@ export const buildProcessedNotificationsStorage = (storage: App.Storage) => {
     await storage.setItem('processed', [])
   }
 
+  const isEmpty = async () => {
+    const processed = await getValues()
+    return processed.length === 0
+  }
+
   return {
     getValues,
     addValues,
     includes,
     clear,
+    setValues,
+    isEmpty,
   }
 }
diff --git a/apps/wallet-mobile/src/features/Notifications/useCases/common/transaction-received-notification.ts b/apps/wallet-mobile/src/features/Notifications/useCases/common/transaction-received-notification.ts
index dcd4bab540..08bc87a206 100644
--- a/apps/wallet-mobile/src/features/Notifications/useCases/common/transaction-received-notification.ts
+++ b/apps/wallet-mobile/src/features/Notifications/useCases/common/transaction-received-notification.ts
@@ -57,7 +57,9 @@ const buildNotifications = async (appStorage: App.Storage) => {
   for (const walletId of walletIds) {
     const wallet = walletManager.getWalletById(walletId)
     if (!wallet) continue
-    const storage = buildProcessedNotificationsStorage(appStorage.join(`wallet/${walletId}/${storageKey}/`))
+
+    const fullStorageKey = `wallet/${walletId}/${wallet.networkManager.network}/${storageKey}/` as const
+    const storage = buildProcessedNotificationsStorage(appStorage.join(fullStorageKey))
     const processed = await storage.getValues()
     const allTxIds = getTxIds(wallet)
 
diff --git a/packages/types/src/notifications/manager.ts b/packages/types/src/notifications/manager.ts
index 21766d7be0..2f5669a51b 100644
--- a/packages/types/src/notifications/manager.ts
+++ b/packages/types/src/notifications/manager.ts
@@ -48,6 +48,7 @@ export type NotificationGroup = 'transaction-history' | 'portfolio'
 export type NotificationEvent =
   | NotificationTransactionReceivedEvent
   | NotificationPrimaryTokenPriceChangedEvent
+  | NotificationRewardsUpdatedEvent
 
 type NotificationEventId = number
 

From 705ba78f5fddc4557031d7f117c74c51da807811 Mon Sep 17 00:00:00 2001
From: banklesss <105349292+banklesss@users.noreply.github.com>
Date: Thu, 31 Oct 2024 16:36:29 +0100
Subject: [PATCH 2/4] feature(wallet-mobile): new transaction for discovery
 (dapps) (#3717)

---
 .../features/Discover/DiscoverNavigator.tsx   |   7 -
 .../Discover/common/useNavigateTo.tsx         |   2 -
 .../ReviewTransaction.stories.tsx             |  28 -
 .../ReviewTransaction/ReviewTransaction.tsx   | 494 ------------------
 .../Discover/useDappConnectorManager.ts       | 118 ++++-
 .../common/hooks/useFormattedMetadata.tsx     |  62 ++-
 .../ReviewTx/common/hooks/useOnConfirm.tsx    |  10 +-
 .../ReviewTx/common/hooks/useSignTx.tsx       |  69 ---
 .../ReviewTx/common/hooks/useTxBody.tsx       |  12 +-
 .../ReviewTxScreen/ReviewTxScreen.tsx         |  33 +-
 apps/wallet-mobile/src/kernel/navigation.tsx  |   3 +-
 11 files changed, 199 insertions(+), 639 deletions(-)
 delete mode 100644 apps/wallet-mobile/src/features/Discover/useCases/ReviewTransaction/ReviewTransaction.stories.tsx
 delete mode 100644 apps/wallet-mobile/src/features/Discover/useCases/ReviewTransaction/ReviewTransaction.tsx
 delete mode 100644 apps/wallet-mobile/src/features/ReviewTx/common/hooks/useSignTx.tsx

diff --git a/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx b/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx
index 1b16ebd52f..478fee15f2 100644
--- a/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Discover/DiscoverNavigator.tsx
@@ -10,7 +10,6 @@ import {defaultStackNavigationOptions, DiscoverRoutes} from '../../kernel/naviga
 import {NetworkTag} from '../Settings/useCases/changeAppSettings/ChangeNetwork/NetworkTag'
 import {BrowserNavigator} from './BrowserNavigator'
 import {useStrings} from './common/useStrings'
-import {ReviewTransaction} from './useCases/ReviewTransaction/ReviewTransaction'
 import {ListSkeleton} from './useCases/SelectDappFromList/ListSkeleton'
 import {SelectDappFromListScreen} from './useCases/SelectDappFromList/SelectDappFromListScreen'
 import {useDappConnectorManager} from './useDappConnectorManager'
@@ -45,12 +44,6 @@ export const DiscoverNavigator = () => {
         </Stack.Screen>
 
         <Stack.Screen name="discover-browser" component={BrowserNavigator} options={{headerShown: false}} />
-
-        <Stack.Screen
-          name="discover-review-tx"
-          component={ReviewTransaction}
-          options={{...defaultStackNavigationOptions(atoms, color), title: strings.transactionReview}}
-        />
       </Stack.Navigator>
     </DappConnectorProvider>
   )
diff --git a/apps/wallet-mobile/src/features/Discover/common/useNavigateTo.tsx b/apps/wallet-mobile/src/features/Discover/common/useNavigateTo.tsx
index 3542dbc6cd..7d978861fb 100644
--- a/apps/wallet-mobile/src/features/Discover/common/useNavigateTo.tsx
+++ b/apps/wallet-mobile/src/features/Discover/common/useNavigateTo.tsx
@@ -2,7 +2,6 @@ import {NavigationProp, useNavigation} from '@react-navigation/native'
 import * as React from 'react'
 
 import {DiscoverRoutes} from '../../../kernel/navigation'
-import {ReviewTransactionParams} from '../useCases/ReviewTransaction/ReviewTransaction'
 
 export const useNavigateTo = () => {
   const navigation = useNavigation<NavigationProp<DiscoverRoutes>>()
@@ -12,6 +11,5 @@ export const useNavigateTo = () => {
     searchDappInBrowser: () => navigation.navigate('discover-browser', {screen: 'discover-search-dapp-in-browser'}),
     selectDappFromList: () => navigation.navigate('discover-select-dapp-from-list'),
     browseDapp: () => navigation.navigate('discover-browser', {screen: 'discover-browse-dapp'}),
-    reviewTransaction: (params: ReviewTransactionParams) => navigation.navigate('discover-review-tx', params),
   } as const).current
 }
diff --git a/apps/wallet-mobile/src/features/Discover/useCases/ReviewTransaction/ReviewTransaction.stories.tsx b/apps/wallet-mobile/src/features/Discover/useCases/ReviewTransaction/ReviewTransaction.stories.tsx
deleted file mode 100644
index d4f79e39b9..0000000000
--- a/apps/wallet-mobile/src/features/Discover/useCases/ReviewTransaction/ReviewTransaction.stories.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import {action} from '@storybook/addon-actions'
-import {storiesOf} from '@storybook/react-native'
-import * as React from 'react'
-
-import {RouteProvider} from '../../../../../.storybook'
-import {WalletManagerProviderMock} from '../../../../yoroi-wallets/mocks/WalletManagerProviderMock'
-import {BrowserProvider} from '../../common/BrowserProvider'
-import {ReviewTransaction, ReviewTransactionParams} from './ReviewTransaction'
-
-storiesOf('Discover ReviewTransaction', module)
-  .addDecorator((story) => (
-    <RouteProvider params={getParams()}>
-      <WalletManagerProviderMock>
-        <BrowserProvider>{story()}</BrowserProvider>
-      </WalletManagerProviderMock>
-    </RouteProvider>
-  ))
-  .add('initial', () => <ReviewTransaction />)
-
-const getParams = (): ReviewTransactionParams => ({
-  cbor,
-  isHW: false,
-  onCancel: action('onCancel'),
-  onConfirm: action('onConfirm'),
-})
-
-const cbor =
-  '84a60081825820cda06bbb18f65cf41b882bb5540a90c9b50b83ba6cbea0661b4845bb95bbb6f6020181825839017ef00ee3672330155382a2857573868af466b88aa8c4081f45583e1784d958399bcce03402fd853d43a4e7366f2018932e5aff4eea904693821a0026918ba1581ca0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235a145484f534b591a01036640021a0007de900b5820d6ce04742d48d98691d07d67707c2d53a714d113dde67fdc259224a931f31e270d81825820caec92c836b10281c35a3a9b13f732686cf8ddccb4c75c9aef42a1324da21975010e81581c7ef00ee3672330155382a2857573868af466b88aa8c4081f45583e17a3038159152d59152a010000323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323223232323232322232323232323232323232533355333573460d000226464646424446600200a0086eb4d5d09aba2003355333573460d060da0022660a06eb4d5d098360009bad357426ae88c1b000458c1b88894ccd5cd18358008b0a999ab9a337100029000099801983500118350008991982a19b8400300133708004002660ce0040026ea8d5d080098350010a999ab9a306700113212223002004375a6ae84c1a800854ccd5cd18330008220b099180e1a9a805030911111111111299a999aa983583601892999ab9a3371e01c002260c80020c400840d20c2a020426038660946010002660946603a666aa60b40c06a0340c26a0340c4666aa60b40c044a66a6a0044444a66a6605060a4030008260ba0060b642660c200200420020ba60546a0140c2660366660486a01e0c26a01e0c460460246660486a01e0c26a01e0c466604c6a0120886a01e0c26a01e0c4660946008a0226020a00a4426464646464646046660a2601e00e660a2603e032660a2602ea018660a26016a030660a26a01044666ae68cdc499b8200248008cdc1240000020be0cc660a26a0104426ae68cdc419b8200248008cdc1011000998289982899814982980c98298029982899827981d00c981d0029982899827981700c98170029982899827980e00c980e0029982899827980e80c980e802a99a980f80c88020a99a80202e031998289a9980f1a804111919191982d99b8400300133708004002660dc00400266e0808c008cdc099b8202200133704004044660ac60540329001112999ab9a3370e00a0042660760440020bc66048660446a00c0d26660560040026a6a6603c010660ac66605a6a0200960040029001111982c19b84002001330583370a0040020020d0660446a0200966660566a02c0d06a02c0d26a6603c660ac6054032900100438435014068350130663027002301b00135001063533553353500b22350022222222222223333500d206620662066233355306f070035235001225335330470020041306a00306800d2135001223500122223501222350022222222222223335530700762235002222253353303e01800413307a006005100507300a16162215335001133052300a00235002204a2216306a00137540144666aa60b80ba604a04c400266aa60b00ba46a00244446a0084466a0044a666ae68cdc78048008a999a80282d102d90a99a9981a0009a80803390a99a9999999aba40012325333573460e060ea0022646666aae7c00481848cccd55cf9aba2002253353039357420064260c82460020040c240c40d60d460e80020bc6ea8008817881788178817819c84cc140d4004800522010f4d7565736c69537761705f76322e320005c05b061206230273500705e13306822533500105922132533553353035303735003062215335007213304a00200105615335006205605c15335333049034350030613500922200113305e30073500306200110011001300400130313500505c30513500304025333535001203f16216215335330290013500505c21533533333335748002464a666ae68c194c1a80044c8cccd55cf800902b11999aab9f35744004464a66a6666666ae900048c94ccd5cd183598380008991999aab9f001205c23233335573e00240bc4646666aae7c00481808c8cccd55cf80090311191999aab9f001206423233335573e00240cc4646666aae7c00481a08c8cccd55cf800903511999aab9f35744004464a66aa66aa66aa66aa66aa66aa66aa66a6666666ae900048c94ccd5cd183f9842008008991999aab9f001207023233335573e00240e446666aae7cd5d10011299a98241aba1005213253353333333574800246464a666ae68c224040044cccd55cf984680801103c91999aab9f35744611c02006464a66a6666666ae900048c8c94ccd5cd18480080089999aab9f309301002207f23233335573e0024102024646666aae7c004820c048cccd55cf9aba200225335305a3574261320201042a66a60b66ae84018854cd4c170d5d0802909844009998410080180100084280842008418090420084680846009aba200208a0135744612802006110022a666ae68c23c040044cccd55cf984980801103f91999aab9f357446128020064a66a60aa6ae84c2540401084c20804c208040041fc82000422404220041f4c24c04004dd5001103e103e103e103e0428090983e983e80083d1aba1308f01004207a083010820115333573461140200226666aae7cc234040088c1e81e481e4208041dcc23404004dd5001103b103b103b103b03f90983b9983780180083a1aba1004072207307c07b357440040f26106020020da6ea800881b481b481b481b41d884c1b8c1bc0041ac854cd4c110d5d0808909837980100083603590a99a98221aba100f21306f300200106c06b21533530443574201a4260de60040020d80d642a66a60886ae8402c84c1bcc0080041b01ac854cd4c10cd5d080490983798010008360359099299a9999999aba4001232325333573461060200226666aae7cc218040088c1cc1e481c81ec54ccd5cd18410080089999aab9f30860100223073072207207b070308601001375400440de40de40de40de0f04260e060060020da6ae8401c1ac854cd4c10cd5d080290983798010008360359aba1011206b074073357440040e26ae880081bcd5d10010369aba200206b357440040d26ae8800819cd5d1001032983780082c9baa002205920592059205906221305a305c0010573574200640ae0c00be60d20020a66ea8008814c814c814c814c17084d4004800458588c8d4d4d401016c888818888d40048c894ccd54ccd4018854ccd4010854ccd402084c0140c44c0100c054ccd401484c0140c44c0100c011810c54ccd401c84c0100c04c00c0bc54ccd401084c0100c04c00c0bc11454ccd400c810811010454ccd400c854ccd401c84c0100c04c00c0bc54ccd401084c0100c04c00c0bc11410854ccd401884c00c0bc4c0080b854ccd400c84c00c0bc4c0080b811054cd400415016c16c15094ccd4008854ccd4018854ccd401084ccc0d00c400800458585810854ccd4014854ccd400c84ccc0cc0c0008004585858104100c100ccc198888c94ccd5cd19b87003371a002200426600866e0000d20023370066e080092080043371c002006a66a660d244a66a0020a64426a00444a666ae68cdc78012451c5817c34e5702473304f3cf676299176d3824e55b8c0bfa94830429fd001305900113006003353533533069221225333573466e2000520001615335002162215333573460d20062004266a600c0c400266e0400d200205c30323500605d00405e204321533500116221350022253350031002221616480012000350012233335001262626232533530303032001213212333001003002005350022043163330672225335002162213500222533533035002005100113300700300530303500405b0015333573460ba60c400226464642466002006004606c6ae84d5d11831801a999ab9a305e3063001132323232323232323232323232323232323232323232321233333333333300101801601401201000e00c009007005003002304e357426ae88008ccc121d710009aba10013574400466608c09040026ae84004d5d100119822bae357420026ae8800d4ccd5cd1836983900089919191909198008020012999ab9a307030750011330583304175a6ae84c1d0004c158d5d09aba230740011637546ae84d5d11839801a999ab9a306e30730011323212330010030023055357426ae88c1cc008cc0fdd69aba130720011637546ae84c1c400458dd51aba10013574400466607e0a6eb4d5d08009aba20023303e040357420026ae88008ccc0edd701d1aba100135744004666072eb80e0d5d08009aba200233038035357420026ae88008cc0d80c8d5d08009aba23063002330340303574260c40022c6ea8d5d098308008b1baa00133041300700430080043304030240033018003305d22533500104e2213303e33303d03c303f3040002500530040011303a303b001355333573460aa60b40022646090a666ae68c158c16c0044c8c8c8c8c8c8cccccccc134c10cd5d098300039bae3574200c6eb8d5d08029bae357420086eb8d5d08019bad3574200460846ae84004dd69aba1357440026ae88004d5d10009aba2001357440026ae88004d5d1182d0008b1baa3574260b20022c40026ea80048d40041408d4004814488d400888d400c88c8c8c8cc104cdc200100099b84003001330540010023370400a00666e0800c0048d4004888880c9200233035001043223355304204723500122330390023355304504a235001223303c0023335001370090003802337000029000000998028010009299a8008890008b11199aa9822022980680711a80091199aa9823824180800891a80091199a80091980ea400000203846603a0029000000998018010009119aa981f82211a800911981b001199a800919aa982182411a800911981d001181900080091199804018801000919aa982182411a800911981d0011806000800999801816001000911199aa981f02202119aa981f82211a800911981b0011817000999aa981f022111a80111299a999aa98238241981b91199805025801000980402511a8009119805001002803080189982300200182080099aa981f82211a800911981b0011982a11299a800898050019109a80111299a9980600100408911198010050020980300180200111980091299a80101f880081b909111800802111a801111a801911919a802919a80212999ab9a3371e004002006078407a466a008407a4a666ae68cdc780100080181e0a99a80190a99a8011099a801119a801119a801119a8011198190010009020119a801102011981900100091102011119a80210201112999ab9a3370e00c0062a666ae68cdc380280109980f00200082082081d0a99a800901d02011a800911110149111981e998170019981e9981700100081e01e1981511299a801108018800818911198251119a800a4000446a00444a666ae68cdc78010040998281119a800a4000446a00444a666ae68cdc78010068800898030018008980300180191a8009111111100311981411199a80181e0010009a80081d891980081101a91a80091111111111100511999999aba40012323253335734608200226666aae7cc11000880c08cccd55cf9aba2304500325335300835742608c008426066605e00206040620740722a666ae68c1000044cccd55cf9822001101811999aab9f35744608a0064a66a60106ae84c11801084c0ccc0cc0040c080c40e80e40b8c110004dd5001101690169016901681b11999999aba4001202c202c202c2302d375a004405806a46666666ae9000480ac80ac80ac80ac8c0b0dd700101a111a8009111111111111982691299a80081b9109a801112999ab9a3371e0040282607a0022600c006004930919999999800801912999ab9a3370e0040020302a666ae68cdc480100080a80b1109ab9a337100040024426ae68cdc480100091199ab9a3371200400205206000444a666ae68cdc480100088008801112999ab9a337120040022004200244666ae68cdc40010008138171109ab9a3370e00400246a0024444444400e44a666ae68cdc79a8010179a800817889ab9a3370e6a0040606a00206004646a0024466a004404a04a46a00244444444444401846a0024444008446464a666ae68c0d400403854ccd5cd181a0008980998021aba13037002153335734606600201e2c606e0026ea80048c94ccd5cd1818181a80089919091980080180118021aba135744606a00460126ae84c0d000458dd50009192999ab9a302f3034001132323232323232321233330010090070030023302375c6ae84d5d10022999ab9a3037001132122230020043574260720042a666ae68c0d80044c84888c004010dd71aba13039002153335734606a0020262c60720026ea8d5d08009aba200233300675c00a6ae84004d5d1181a001180b1aba1303300116375400266002eb9d69111981a111999aab9f0012027232330293301a30073037001300630360013004357440066ae840080a4dd58009119819111999aab9f001202523302630053574200460066ae8800809cdd6000919192999ab9a302f00113212222300400530043574260600042a666ae68c0b80044c848888c008014c054d5d098180010a999ab9a302d00113212222300100530053574260600042a666ae68c0b00044c848888c00c014dd71aba13030002163030001375400246464a666ae68cdc3a401800222444401c2a666ae68cdc3a4014002220522a666ae68cdc3a40100022646424444444660020120106eb4d5d09aba23030003375c6ae84c0bc00854ccd5cd18170008991909111111198010048041bae357426ae88c0c000cdd71aba1302f002153335734605a00226464244444446600c0120106eb8d5d09aba23030003301435742605e0042a666ae68c0b00044c848888888c01c020c050d5d098178010a999ab9a302b001132122222223005008301435742605e0042c605e0026ea80048c94ccd5cd181498170008991909198008018011bad357426ae88c0b8008c00cd5d098168008b1baa001232533357346050605a00226eb8d5d098160008b1baa0011122200111001222002110012220032122230030042213573466e3c0080048894cd4cc00c00800403c058894cd400840040348d400488cd40088004988d4004888888880208c94ccd5cd180e8008088a999ab9a301c00100a1630203754002464a666ae68c06cc0800044cc00cc018d5d0980f800998040021aba135744603e0022c6ea80048848cc00400c0088c8c94ccd5cd180d8008991998029bad35742603e0066eb4d5d08009bad357426ae88004d5d1180f0010a999ab9a301a0011300a300535742603c0042c603c0026ea8004888488ccc00401401000c8c8c94ccd5cd180c800898021bae3574260380042a666ae68c0600044c020dd71aba1301c00216301c001375400242446002006446464a666ae68c05c0044c01cc010d5d0980d8010a999ab9a301800100516301b0013754002200220184244600400644444444246666666600201201000e00c00a008006004424600200460264422444a66a00220044426600a004666aa600e01a00a0080026024442244a66a00200a44266012600800466aa600c016008002200220084424466002008006601c4422444a66a00226a006010442666a00a0126008004666aa600e01000a0080022400244004440026014444a666ae68c01c00440084cc00c004cdc30010009111111100291111110021b8148000dc3a40006e1d2002370e90021b874801955cf2ab9d23230010012233003300200200101049fd8799fd8799fd8799fd8799f581c7ef00ee3672330155382a2857573868af466b88aa8c4081f45583e17ffd8799fd8799fd8799f581c84d958399bcce03402fd853d43a4e7366f2018932e5aff4eea904693ffffffff581ca0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c23545484f534b5940401a023e6a08d879801a002e701bffffff0581840000d87980821a000f42401a1dcd6500f5f6'
diff --git a/apps/wallet-mobile/src/features/Discover/useCases/ReviewTransaction/ReviewTransaction.tsx b/apps/wallet-mobile/src/features/Discover/useCases/ReviewTransaction/ReviewTransaction.tsx
deleted file mode 100644
index 4b189642db..0000000000
--- a/apps/wallet-mobile/src/features/Discover/useCases/ReviewTransaction/ReviewTransaction.tsx
+++ /dev/null
@@ -1,494 +0,0 @@
-import {Transaction} from '@emurgo/cross-csl-core'
-import {createTypeGuardFromSchema, isNonNullable, truncateString} from '@yoroi/common'
-import {useTheme} from '@yoroi/theme'
-import {Portfolio} from '@yoroi/types'
-import {uniq} from 'lodash'
-import * as React from 'react'
-import {useEffect} from 'react'
-import {StyleSheet, View} from 'react-native'
-import {TouchableOpacity} from 'react-native-gesture-handler'
-import {SafeAreaView} from 'react-native-safe-area-context'
-import {useMutation, useQuery} from 'react-query'
-import {z} from 'zod'
-
-import {Button} from '../../../../components/Button/Button'
-import {CopyButton} from '../../../../components/CopyButton'
-import {Icon} from '../../../../components/Icon'
-import {ScrollView} from '../../../../components/ScrollView/ScrollView'
-import {Spacer} from '../../../../components/Spacer/Spacer'
-import {Text} from '../../../../components/Text'
-import {logger} from '../../../../kernel/logger/logger'
-import {useParams} from '../../../../kernel/navigation'
-import {cip30LedgerExtensionMaker} from '../../../../yoroi-wallets/cardano/cip30/cip30-ledger'
-import {wrappedCsl} from '../../../../yoroi-wallets/cardano/wrappedCsl'
-import {formatAdaWithText, formatTokenWithText} from '../../../../yoroi-wallets/utils/format'
-import {asQuantity} from '../../../../yoroi-wallets/utils/utils'
-import {usePortfolioTokenInfos} from '../../../Portfolio/common/hooks/usePortfolioTokenInfos'
-import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
-import {useConfirmHWConnectionModal} from '../../common/ConfirmHWConnectionModal'
-import {isUserRejectedError, userRejectedError} from '../../common/errors'
-import {usePromptRootKey} from '../../common/hooks'
-import {useStrings} from '../../common/useStrings'
-
-export type ReviewTransactionParams =
-  | {
-      isHW: false
-      cbor: string
-      onConfirm: (rootKey: string) => void
-      onCancel: () => void
-    }
-  | {
-      isHW: true
-      cbor: string
-      partial?: boolean
-      onConfirm: (transaction: Transaction) => void
-      onCancel: () => void
-    }
-
-export const ReviewTransaction = () => {
-  const params = useParams<ReviewTransactionParams>(isParams)
-  const promptRootKey = useConnectorPromptRootKey()
-  const [inputsOpen, setInputsOpen] = React.useState(true)
-  const [outputsOpen, setOutputsOpen] = React.useState(true)
-  const [scrollbarShown, setScrollbarShown] = React.useState(false)
-  const strings = useStrings()
-  const formattedTX = useFormattedTransaction(params.cbor)
-
-  const {styles} = useStyles()
-
-  const {sign: signTxWithHW} = useSignTxWithHW()
-
-  const handleOnConfirm = async () => {
-    if (!params.isHW) {
-      const rootKey = await promptRootKey()
-      params.onConfirm(rootKey)
-      return
-    }
-
-    signTxWithHW(
-      {cbor: params.cbor, partial: params.partial},
-      {
-        onSuccess: (signature) => params.onConfirm(signature),
-        onError: (error) => logger.error('ReviewTransaction::handleOnConfirm', {error}),
-      },
-    )
-  }
-
-  useEffect(() => {
-    return () => {
-      params.onCancel()
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
-  return (
-    <SafeAreaView edges={['top', 'bottom', 'left', 'right']} style={styles.root}>
-      <ScrollView bounces={false} style={styles.scrollView} onScrollBarChange={setScrollbarShown}>
-        <Dropdown open={inputsOpen} onPress={() => setInputsOpen((o) => !o)}>
-          <Text style={styles.dropdownText}>{`${strings.inputs} (${formattedTX.inputs.length})`}</Text>
-        </Dropdown>
-
-        {inputsOpen && <Spacer height={16} />}
-
-        {inputsOpen &&
-          formattedTX.inputs.map((input, index) => {
-            return (
-              <InputOutputRow
-                key={index}
-                assets={input.assets}
-                txIndex={input.txIndex}
-                txHash={input.txHash}
-                isOwnAddress={input.ownAddress}
-                address={input.address}
-              />
-            )
-          })}
-
-        <Spacer height={16} />
-
-        <View style={styles.divider} />
-
-        <Spacer height={16} />
-
-        <View style={styles.feeArea}>
-          <FeeChip />
-
-          <Text>{formattedTX.fee}</Text>
-        </View>
-
-        <Spacer height={16} />
-
-        <Dropdown open={outputsOpen} onPress={() => setOutputsOpen((o) => !o)}>
-          <Text style={styles.dropdownText}>{`${strings.outputs} (${formattedTX.outputs.length})`}</Text>
-        </Dropdown>
-
-        {outputsOpen && <Spacer height={16} />}
-
-        {outputsOpen &&
-          formattedTX.outputs.map((output, index) => {
-            return (
-              <InputOutputRow
-                key={index}
-                assets={output.assets}
-                isOwnAddress={output.ownAddress}
-                address={output.address}
-              />
-            )
-          })}
-      </ScrollView>
-
-      <View style={[styles.buttonArea, {borderTopWidth: scrollbarShown ? 1 : 0}]}>
-        <Button title={strings.confirm} onPress={handleOnConfirm} />
-      </View>
-    </SafeAreaView>
-  )
-}
-
-const Dropdown = ({children, open, onPress}: {children: React.ReactNode; open: boolean; onPress?: () => void}) => {
-  const {styles, colors} = useStyles()
-  return (
-    <TouchableOpacity style={styles.dropdown} onPress={onPress}>
-      <View>{children}</View>
-
-      <View>
-        <Icon.Chevron size={24} color={colors.dropdownIcon} direction={open ? 'up' : 'down'} />
-      </View>
-    </TouchableOpacity>
-  )
-}
-
-const paramsSchema = z.union([
-  z.object({
-    isHW: z.literal(false),
-    cbor: z.string(),
-    onConfirm: z.function(),
-    onCancel: z.function(),
-  }),
-  z.object({
-    isHW: z.literal(true),
-    cbor: z.string(),
-    partial: z.boolean().optional(),
-    onConfirm: z.function(),
-    onCancel: z.function(),
-  }),
-])
-
-const isParams = createTypeGuardFromSchema(paramsSchema)
-
-type TxDetails = {
-  body: {
-    inputs: Array<{transaction_id: string; index: number}>
-    outputs: Array<{address: string; amount: {coin: number; multiasset: null | Record<string, Record<string, string>>}}>
-    fee: string
-    ttl: string
-  }
-}
-
-const getTxDetails = async (cbor: string): Promise<TxDetails> => {
-  const {csl, release} = wrappedCsl()
-  try {
-    const tx = await csl.Transaction.fromHex(cbor)
-    const jsonString = await tx.toJson()
-    return JSON.parse(jsonString)
-  } finally {
-    release()
-  }
-}
-
-const useTxDetails = (cbor: string) => {
-  return useQuery({queryFn: () => getTxDetails(cbor), useErrorBoundary: true, queryKey: ['useTxDetails', cbor]})
-}
-
-const useFormattedTransaction = (cbor: string) => {
-  const {wallet} = useSelectedWallet()
-  const {data} = useTxDetails(cbor)
-
-  const inputs = data?.body.inputs ?? []
-  const outputs = data?.body.outputs ?? []
-
-  const getUtxoByTxIdAndIndex = (txId: string, index: number) => {
-    return wallet.utxos.find((u) => u.tx_hash === txId && u.tx_index === index)
-  }
-
-  const isOwnedAddress = (bech32Address: string) => {
-    return wallet.internalAddresses.includes(bech32Address) || wallet.externalAddresses.includes(bech32Address)
-  }
-
-  const inputTokenIds = inputs.flatMap((i) => {
-    const receiveUTxO = getUtxoByTxIdAndIndex(i.transaction_id, i.index)
-    return receiveUTxO?.assets.map((a) => `${a.policyId}.${a.assetId}` as Portfolio.Token.Id) ?? []
-  })
-
-  const outputTokenIds = outputs.flatMap((o) => {
-    if (!o.amount.multiasset) return []
-    const policyIds = Object.keys(o.amount.multiasset)
-    const tokenIds = policyIds.flatMap((policyId) => {
-      const assetIds = Object.keys(o.amount.multiasset?.[policyId] ?? {})
-      return assetIds.map((assetId) => `${policyId}.${assetId}` as Portfolio.Token.Id)
-    })
-    return tokenIds
-  })
-
-  const tokenIds = uniq<Portfolio.Token.Id>([...inputTokenIds, ...outputTokenIds])
-  const {tokenInfos} = usePortfolioTokenInfos({wallet, tokenIds}, {suspense: true})
-
-  const formattedInputs = inputs.map((input) => {
-    const receiveUTxO = getUtxoByTxIdAndIndex(input.transaction_id, input.index)
-    const address = receiveUTxO?.receiver
-    const coin = receiveUTxO?.amount != null ? asQuantity(receiveUTxO.amount) : null
-    const coinText = coin != null ? formatAdaWithText(coin, wallet.portfolioPrimaryTokenInfo) : null
-    const primaryAssets = coinText != null ? [coinText] : []
-    const multiAssets =
-      receiveUTxO?.assets
-        .map((a) => {
-          const tokenInfo = tokenInfos?.get(a.assetId as Portfolio.Token.Id)
-          if (!tokenInfo) return null
-          const quantity = asQuantity(a.amount)
-          return formatTokenWithText(quantity, tokenInfo)
-        })
-        .filter(Boolean) ?? []
-
-    return {
-      assets: [...primaryAssets, ...multiAssets].filter(isNonNullable),
-      address,
-      ownAddress: address != null && isOwnedAddress(address),
-      txIndex: input.index,
-      txHash: input.transaction_id,
-    }
-  })
-
-  const formattedOutputs = outputs.map((output) => {
-    const address = output.address
-    const coin = asQuantity(output.amount.coin)
-    const coinText = formatAdaWithText(coin, wallet.portfolioPrimaryTokenInfo)
-    const primaryAssets = coinText != null ? [coinText] : []
-    const multiAssets = output.amount.multiasset
-      ? Object.entries(output.amount.multiasset).map(([policyId, assets]) => {
-          return Object.entries(assets).map(([assetId, amount]) => {
-            const tokenInfo = tokenInfos?.get(`${policyId}.${assetId}`)
-            if (tokenInfo == null) return null
-            const quantity = asQuantity(amount)
-            return formatTokenWithText(quantity, tokenInfo)
-          })
-        })
-      : []
-
-    const assets = [...primaryAssets, ...multiAssets.flat()].filter(isNonNullable)
-    return {assets, address, ownAddress: address != null && isOwnedAddress(address)}
-  })
-
-  const formattedFee = formatAdaWithText(asQuantity(data?.body?.fee ?? '0'), wallet.portfolioPrimaryTokenInfo)
-
-  return {inputs: formattedInputs, outputs: formattedOutputs, fee: formattedFee}
-}
-
-const useStyles = () => {
-  const {color, atoms} = useTheme()
-  const styles = StyleSheet.create({
-    root: {
-      backgroundColor: color.bg_color_max,
-      flex: 1,
-    },
-    dropdown: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      alignItems: 'center',
-      height: 24,
-    },
-    scrollView: {
-      flex: 1,
-      ...atoms.px_lg,
-    },
-    buttonArea: {
-      ...atoms.p_lg,
-      borderColor: color.gray_200,
-    },
-    divider: {
-      height: 1,
-      backgroundColor: color.gray_200,
-    },
-    dropdownText: {
-      ...atoms.font_semibold,
-      ...atoms.body_1_lg_medium,
-    },
-    chip: {
-      flexWrap: 'wrap',
-    },
-    row: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-      alignItems: 'center',
-    },
-    chipText: {
-      color: color.gray_min,
-      paddingRight: 8,
-      paddingLeft: 8,
-      borderRadius: 12,
-      overflow: 'hidden',
-      height: 24,
-    },
-    feeArea: {
-      flexDirection: 'row',
-      justifyContent: 'space-between',
-    },
-    asset: {
-      textAlign: 'right',
-    },
-  })
-  const colors = {
-    dropdownIcon: color.gray_900,
-    ownAddress: color.primary_500,
-    foreignAddress: color.gray_900,
-    fee: color.sys_magenta_500,
-  }
-  return {styles, colors}
-}
-
-const InputOutputRow = ({
-  address,
-  txHash,
-  txIndex,
-  isOwnAddress,
-  assets,
-}: {
-  address?: string
-  txHash?: string
-  txIndex?: number
-  isOwnAddress: boolean
-  assets: string[]
-}) => {
-  const strings = useStrings()
-  const {styles} = useStyles()
-  const shortAddress = address != null ? truncateString({value: address, maxLength: 30}) : null
-  const shortTxHash = txHash != null ? truncateString({value: txHash, maxLength: 30}) : null
-  return (
-    <View>
-      <View>{isOwnAddress ? <OwnAddressChip /> : <ForeignAddressChip />}</View>
-
-      <Spacer height={8} />
-
-      {shortAddress !== null && (
-        <View style={styles.row}>
-          <Text>{shortAddress}</Text>
-
-          <CopyButton value={address ?? ''} message={strings.addressCopied} />
-        </View>
-      )}
-
-      {shortTxHash !== null && (
-        <View style={styles.row}>
-          <Text>{`${shortTxHash}#${txIndex}`}</Text>
-
-          <CopyButton value={`${txHash}#${txIndex}`} message={strings.transactionIdCopied} />
-        </View>
-      )}
-
-      <Spacer height={4} />
-
-      {assets.map((asset, index) => {
-        return (
-          <View key={index}>
-            <Text style={styles.asset}>{asset}</Text>
-          </View>
-        )
-      })}
-    </View>
-  )
-}
-
-const OwnAddressChip = () => {
-  const {styles, colors} = useStyles()
-  const strings = useStrings()
-  const backgroundColor = colors.ownAddress
-  return (
-    <View style={styles.chip}>
-      <Text style={[styles.chipText, {backgroundColor}]}>{strings.yourAddress}</Text>
-    </View>
-  )
-}
-
-const ForeignAddressChip = () => {
-  const {styles, colors} = useStyles()
-  const strings = useStrings()
-  const backgroundColor = colors.foreignAddress
-  return (
-    <View style={styles.chip}>
-      <Text style={[styles.chipText, {backgroundColor}]}>{strings.externalAddress}</Text>
-    </View>
-  )
-}
-
-const FeeChip = () => {
-  const {styles, colors} = useStyles()
-  const strings = useStrings()
-  const backgroundColor = colors.fee
-  return (
-    <View style={styles.chip}>
-      <Text style={[styles.chipText, {backgroundColor}]}>{strings.fee}</Text>
-    </View>
-  )
-}
-
-const useConnectorPromptRootKey = () => {
-  const promptRootKey = usePromptRootKey()
-
-  return React.useCallback(() => {
-    return new Promise<string>((resolve, reject) => {
-      let shouldResolveOnClose = true
-
-      try {
-        promptRootKey({
-          onConfirm: (rootKey) => {
-            resolve(rootKey)
-            shouldResolveOnClose = false
-            return Promise.resolve()
-          },
-          onClose: () => {
-            if (shouldResolveOnClose) reject(userRejectedError())
-          },
-        })
-      } catch (error) {
-        reject(error)
-      }
-    })
-  }, [promptRootKey])
-}
-
-export const useSignTxWithHW = () => {
-  const {confirmHWConnection, closeModal} = useConfirmHWConnectionModal()
-  const {wallet, meta} = useSelectedWallet()
-
-  const mutationFn = React.useCallback(
-    (options: {cbor: string; partial?: boolean}) => {
-      return new Promise<Transaction>((resolve, reject) => {
-        let shouldResolveOnClose = true
-        confirmHWConnection({
-          onConfirm: async ({transportType, deviceInfo}) => {
-            try {
-              const cip30 = cip30LedgerExtensionMaker(wallet, meta)
-              const tx = await cip30.signTx(options.cbor, options.partial ?? false, deviceInfo, transportType === 'USB')
-              shouldResolveOnClose = false
-              return resolve(tx)
-            } catch (error) {
-              reject(error)
-            } finally {
-              closeModal()
-            }
-          },
-          onClose: () => {
-            if (shouldResolveOnClose) reject(userRejectedError())
-          },
-        })
-      })
-    },
-    [confirmHWConnection, wallet, meta, closeModal],
-  )
-
-  const mutation = useMutation<Transaction, Error, {cbor: string; partial?: boolean}>({
-    mutationFn,
-    useErrorBoundary: (error) => !isUserRejectedError(error),
-    mutationKey: ['useSignTxWithHW'],
-  })
-
-  return {...mutation, sign: mutation.mutate}
-}
diff --git a/apps/wallet-mobile/src/features/Discover/useDappConnectorManager.ts b/apps/wallet-mobile/src/features/Discover/useDappConnectorManager.ts
index a0a0a3ad89..e6ef3a412c 100644
--- a/apps/wallet-mobile/src/features/Discover/useDappConnectorManager.ts
+++ b/apps/wallet-mobile/src/features/Discover/useDappConnectorManager.ts
@@ -3,10 +3,16 @@ import {useAsyncStorage} from '@yoroi/common'
 import {DappConnector} from '@yoroi/dapp-connector'
 import * as React from 'react'
 import {InteractionManager} from 'react-native'
+import {useMutation} from 'react-query'
 
+import {logger} from '../../kernel/logger/logger'
+import {useWalletNavigation} from '../../kernel/navigation'
+import {cip30LedgerExtensionMaker} from '../../yoroi-wallets/cardano/cip30/cip30-ledger'
+import {useReviewTx} from '../ReviewTx/common/ReviewTxProvider'
 import {useSelectedWallet} from '../WalletManager/common/hooks/useSelectedWallet'
 import {useOpenConfirmConnectionModal} from './common/ConfirmConnectionModal'
-import {userRejectedError} from './common/errors'
+import {useConfirmHWConnectionModal} from './common/ConfirmHWConnectionModal'
+import {isUserRejectedError, userRejectedError} from './common/errors'
 import {createDappConnector} from './common/helpers'
 import {usePromptRootKey} from './common/hooks'
 import {useShowHWNotSupportedModal} from './common/HWNotSupportedModal'
@@ -18,12 +24,17 @@ export const useDappConnectorManager = () => {
   const appStorage = useAsyncStorage()
   const navigateTo = useNavigateTo()
   const {wallet, meta} = useSelectedWallet()
+  const {navigateToTxReview} = useWalletNavigation()
+  const {cborChanged} = useReviewTx()
 
   const confirmConnection = useConfirmConnection()
 
   const signData = useSignData()
   const signDataWithHW = useSignDataWithHW()
 
+  const promptRootKey = useConnectorPromptRootKey()
+  const {sign: signTxWithHW} = useSignTxWithHW()
+
   return React.useMemo(
     () =>
       createDappConnector({
@@ -33,12 +44,12 @@ export const useDappConnectorManager = () => {
         signTx: (cbor) => {
           return new Promise<string>((resolve, reject) => {
             let shouldResolve = true
-            navigateTo.reviewTransaction({
-              cbor,
-              isHW: false,
-              onConfirm: (rootKey) => {
+            cborChanged(cbor)
+            navigateToTxReview({
+              onConfirm: async () => {
                 if (!shouldResolve) return
                 shouldResolve = false
+                const rootKey = await promptRootKey()
                 resolve(rootKey)
                 navigateTo.browseDapp()
               },
@@ -55,14 +66,21 @@ export const useDappConnectorManager = () => {
         signTxWithHW: (cbor, partial) => {
           return new Promise<Transaction>((resolve, reject) => {
             let shouldResolve = true
-            navigateTo.reviewTransaction({
-              cbor,
-              partial,
-              isHW: true,
-              onConfirm: (tx) => {
+            cborChanged(cbor)
+            navigateToTxReview({
+              onConfirm: () => {
                 if (!shouldResolve) return
                 shouldResolve = false
-                resolve(tx)
+                signTxWithHW(
+                  {cbor, partial},
+                  {
+                    onSuccess: (signature) => resolve(signature),
+                    onError: (error) => {
+                      logger.error('ReviewTransaction::handleOnConfirm', {error})
+                      reject(error)
+                    },
+                  },
+                )
                 navigateTo.browseDapp()
               },
               onCancel: () => {
@@ -75,7 +93,19 @@ export const useDappConnectorManager = () => {
         },
         signDataWithHW,
       }),
-    [appStorage, wallet, confirmConnection, signData, meta, navigateTo, signDataWithHW],
+    [
+      appStorage,
+      wallet,
+      confirmConnection,
+      signData,
+      meta,
+      signDataWithHW,
+      cborChanged,
+      navigateToTxReview,
+      promptRootKey,
+      navigateTo,
+      signTxWithHW,
+    ],
   )
 }
 
@@ -178,3 +208,67 @@ const useConfirmConnection = () => {
     [openConfirmConnectionModal, openUnverifiedDappModal, closeModal],
   )
 }
+
+const useConnectorPromptRootKey = () => {
+  const promptRootKey = usePromptRootKey()
+
+  return React.useCallback(() => {
+    return new Promise<string>((resolve, reject) => {
+      let shouldResolveOnClose = true
+
+      try {
+        promptRootKey({
+          onConfirm: (rootKey) => {
+            resolve(rootKey)
+            shouldResolveOnClose = false
+            return Promise.resolve()
+          },
+          onClose: () => {
+            if (shouldResolveOnClose) reject(userRejectedError())
+          },
+        })
+      } catch (error) {
+        reject(error)
+      }
+    })
+  }, [promptRootKey])
+}
+
+export const useSignTxWithHW = () => {
+  const {confirmHWConnection, closeModal} = useConfirmHWConnectionModal()
+  const {wallet, meta} = useSelectedWallet()
+
+  const mutationFn = React.useCallback(
+    (options: {cbor: string; partial?: boolean}) => {
+      return new Promise<Transaction>((resolve, reject) => {
+        let shouldResolveOnClose = true
+        confirmHWConnection({
+          onConfirm: async ({transportType, deviceInfo}) => {
+            try {
+              const cip30 = cip30LedgerExtensionMaker(wallet, meta)
+              const tx = await cip30.signTx(options.cbor, options.partial ?? false, deviceInfo, transportType === 'USB')
+              shouldResolveOnClose = false
+              return resolve(tx)
+            } catch (error) {
+              reject(error)
+            } finally {
+              closeModal()
+            }
+          },
+          onClose: () => {
+            if (shouldResolveOnClose) reject(userRejectedError())
+          },
+        })
+      })
+    },
+    [confirmHWConnection, wallet, meta, closeModal],
+  )
+
+  const mutation = useMutation<Transaction, Error, {cbor: string; partial?: boolean}>({
+    mutationFn,
+    useErrorBoundary: (error) => !isUserRejectedError(error),
+    mutationKey: ['useSignTxWithHW'],
+  })
+
+  return {...mutation, sign: mutation.mutate}
+}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx
index d84816e045..8478c7ca16 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useFormattedMetadata.tsx
@@ -1,18 +1,64 @@
+import {MetadataJsonSchema} from '@emurgo/cross-csl-core'
 import _ from 'lodash'
+import {useQuery} from 'react-query'
 
+import {wrappedCsl} from '../../../../yoroi-wallets/cardano/wrappedCsl'
 import {YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
 import {FormattedMetadata, TransactionBody} from '../types'
 
-export const formatMetadata = (unsignedTx: YoroiUnsignedTx, txBody: TransactionBody): FormattedMetadata => {
-  const hash = txBody.auxiliary_data_hash ?? null
+export const formatMetadata = async (
+  unsignedTx: YoroiUnsignedTx | null,
+  cbor: string | null,
+  txBody: TransactionBody,
+): Promise<FormattedMetadata> => {
+  const {csl, release} = wrappedCsl()
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const msg = unsignedTx.metadata?.['674']?.['msg' as any] ?? JSON.stringify({})
+  try {
+    const hash = txBody.auxiliary_data_hash ?? null
 
-  const metadata = hash != null && typeof msg == 'string' ? {msg: [JSON.parse(msg) as unknown]} : null
+    let metadata = null
 
-  return {
-    hash,
-    metadata,
+    if (unsignedTx != null) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const msg = unsignedTx.metadata?.['674']?.['msg' as any] ?? JSON.stringify({})
+      metadata = hash != null && typeof msg == 'string' ? {msg: [JSON.parse(msg) as unknown]} : null
+    } else if (cbor != null) {
+      const tx = await csl.Transaction.fromBytes(Buffer.from(cbor, 'hex'))
+      const auxiliaryData = await tx.auxiliaryData()
+      const generalTransactionMetadata = await auxiliaryData?.metadata()
+      const metadata674 = await generalTransactionMetadata?.get(await csl.BigNum.fromStr('674'))
+
+      if (metadata674) {
+        const decodedMetadata = await csl.decodeMetadatumToJsonStr(metadata674, MetadataJsonSchema.BasicConversions)
+        const msg = JSON.parse(decodedMetadata)?.msg ?? JSON.stringify({})
+        metadata = hash != null ? {msg: [msg]} : null
+      }
+    }
+
+    return {
+      hash,
+      metadata,
+    }
+  } finally {
+    release()
   }
 }
+
+export const useFormattedMetadata = ({
+  unsignedTx,
+  cbor,
+  txBody,
+}: {
+  unsignedTx: YoroiUnsignedTx | null
+  cbor: string | null
+  txBody: TransactionBody
+}) => {
+  const query = useQuery({
+    queryFn: () => formatMetadata(unsignedTx, cbor, txBody),
+    queryKey: ['useFormattedMetadata', cbor, unsignedTx, txBody],
+    useErrorBoundary: true,
+    suspense: true,
+  })
+
+  return query?.data
+}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useOnConfirm.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useOnConfirm.tsx
index 35e6a4bf9c..f2c01967e2 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useOnConfirm.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useOnConfirm.tsx
@@ -20,12 +20,10 @@ export const useOnConfirm = ({
   onSuccess?: ((txId: YoroiSignedTx) => void) | null
   onError?: (() => void) | null
   cbor?: string
-  unsignedTx?: YoroiUnsignedTx
+  unsignedTx?: YoroiUnsignedTx | null
   onNotSupportedCIP1694?: (() => void) | null
   onCIP36SupportChange?: ((isCIP36Supported: boolean) => void) | null
 }) => {
-  if (unsignedTx === undefined) throw new Error('useOnConfirm: unsignedTx missing')
-
   const {meta} = useSelectedWallet()
   const {openModal, closeModal} = useModal()
   const strings = useStrings()
@@ -41,7 +39,7 @@ export const useOnConfirm = ({
   }
 
   const onConfirm = () => {
-    if (meta.isHW) {
+    if (meta.isHW && unsignedTx) {
       openModal(
         strings.signTransaction,
         <ConfirmTxWithHwModal
@@ -61,7 +59,7 @@ export const useOnConfirm = ({
       return
     }
 
-    if (!meta.isHW && !meta.isEasyConfirmationEnabled) {
+    if (!meta.isHW && !meta.isEasyConfirmationEnabled && unsignedTx) {
       openModal(
         strings.signTransaction,
         <ConfirmTxWithSpendingPasswordModal
@@ -73,7 +71,7 @@ export const useOnConfirm = ({
       return
     }
 
-    if (!meta.isHW && meta.isEasyConfirmationEnabled) {
+    if (!meta.isHW && meta.isEasyConfirmationEnabled && unsignedTx) {
       openModal(
         strings.signTransaction,
         <ConfirmTxWithOsModal unsignedTx={unsignedTx} onSuccess={handleOnSuccess} onError={handleOnError} />,
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useSignTx.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useSignTx.tsx
deleted file mode 100644
index 87f0a7c15b..0000000000
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useSignTx.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import {TransactionWitnessSet} from '@emurgo/cross-csl-core'
-import {WalletMeta} from '@yoroi/types/lib/typescript/wallet/meta'
-import * as React from 'react'
-
-import {useModal} from '../../../../components/Modal/ModalContext'
-import {cip30ExtensionMaker} from '../../../../yoroi-wallets/cardano/cip30/cip30'
-import {YoroiWallet} from '../../../../yoroi-wallets/cardano/types'
-import {wrappedCsl} from '../../../../yoroi-wallets/cardano/wrappedCsl'
-import {useStrings} from '../../../Discover/common/useStrings'
-import {ConfirmRawTxWithOs} from '../../../Swap/common/ConfirmRawTx/ConfirmRawTxWithOs'
-import {ConfirmRawTxWithPassword} from '../../../Swap/common/ConfirmRawTx/ConfirmRawTxWithPassword'
-import {useSelectedWallet} from '../../../WalletManager/common/hooks/useSelectedWallet'
-
-export const useSignTx = () => {
-  const {openModal, closeModal} = useModal()
-  const {meta, wallet} = useSelectedWallet()
-  const strings = useStrings()
-  const modalHeight = 350
-
-  return React.useCallback(
-    (cbor: string) => {
-      const handleOnConfirm = async (rootKey: string) => {
-        console.log('signTx-123')
-        const witnesses = await signTx(Buffer.from(cbor).toString('hex'), rootKey, wallet, meta)
-
-        if (!witnesses) throw new Error('kdkdkdk')
-        await submitTx(cbor, witnesses, wallet)
-        closeModal()
-        return
-      }
-
-      if (meta.isHW) {
-        throw new Error('Not implemented yet')
-      }
-
-      if (meta.isEasyConfirmationEnabled) {
-        openModal(strings.confirmTx, <ConfirmRawTxWithOs onConfirm={handleOnConfirm} />, modalHeight)
-        return
-      }
-
-      openModal(strings.confirmTx, <ConfirmRawTxWithPassword onConfirm={handleOnConfirm} />, modalHeight)
-    },
-    [meta, openModal, strings.confirmTx, wallet, closeModal],
-  )
-}
-
-export const signTx = async (cbor: string, rootKey: string, wallet: YoroiWallet, meta: WalletMeta) => {
-  const cip30 = cip30ExtensionMaker(wallet, meta)
-  try {
-    return cip30.signTx(rootKey, cbor, false)
-  } catch {
-    console.log('smksksksksk')
-  }
-}
-
-export const submitTx = async (cbor: string, witnesses: TransactionWitnessSet, wallet: YoroiWallet) => {
-  const {csl, release} = wrappedCsl()
-
-  try {
-    const tx = await csl.Transaction.fromHex(cbor)
-    const txBody = await tx.body()
-    const signedTx = await csl.Transaction.new(txBody, witnesses, undefined)
-    const signedTxBytes = await signedTx.toBytes()
-
-    await wallet.submitTransaction(Buffer.from(signedTxBytes).toString('base64'))
-  } finally {
-    release()
-  }
-}
diff --git a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useTxBody.tsx b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useTxBody.tsx
index 75588bd47a..57994a9d79 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useTxBody.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/common/hooks/useTxBody.tsx
@@ -4,13 +4,19 @@ import {wrappedCsl} from '../../../../yoroi-wallets/cardano/wrappedCsl'
 import {YoroiUnsignedTx} from '../../../../yoroi-wallets/types/yoroi'
 import {TransactionBody} from '../types'
 
-export const useTxBody = ({cbor, unsignedTx}: {cbor?: string; unsignedTx?: YoroiUnsignedTx}): TransactionBody => {
+export const useTxBody = ({
+  cbor,
+  unsignedTx,
+}: {
+  cbor?: string | null
+  unsignedTx?: YoroiUnsignedTx | null
+}): TransactionBody => {
   const query = useQuery(
     ['useTxBody', cbor, unsignedTx],
     async () => {
-      if (cbor !== undefined) {
+      if (cbor != undefined) {
         return getCborTxBody(cbor)
-      } else if (unsignedTx !== undefined) {
+      } else if (unsignedTx != undefined) {
         return getUnsignedTxTxBody(unsignedTx)
       } else {
         throw new Error('useTxBody: missing cbor and unsignedTx')
diff --git a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx
index 1ab3d4d038..81698d75ab 100644
--- a/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/ReviewTx/useCases/ReviewTxScreen/ReviewTxScreen.tsx
@@ -17,7 +17,7 @@ import {SafeArea} from '../../../../components/SafeArea'
 import {ScrollView} from '../../../../components/ScrollView/ScrollView'
 import {ReviewTxRoutes, useUnsafeParams} from '../../../../kernel/navigation'
 import {isEmptyString} from '../../../../kernel/utils'
-import {formatMetadata} from '../../common/hooks/useFormattedMetadata'
+import {useFormattedMetadata} from '../../common/hooks/useFormattedMetadata'
 import {useFormattedTx} from '../../common/hooks/useFormattedTx'
 import {useOnConfirm} from '../../common/hooks/useOnConfirm'
 import {useStrings} from '../../common/hooks/useStrings'
@@ -32,10 +32,10 @@ const MaterialTab = createMaterialTopTabNavigator()
 export const ReviewTxScreen = () => {
   const {styles} = useStyles()
   const strings = useStrings()
-  const {unsignedTx, operations, details} = useReviewTx()
+  const {unsignedTx, operations, details, cbor} = useReviewTx()
   const params = useUnsafeParams<ReviewTxRoutes['review-tx']>()
 
-  if (unsignedTx === null) throw new Error('ReviewTxScreen: missing unsignedTx')
+  if (unsignedTx == null && cbor == null) throw new Error('ReviewTxScreen: missing cbor and unsignedTx')
 
   const {onConfirm} = useOnConfirm({
     unsignedTx,
@@ -45,19 +45,34 @@ export const ReviewTxScreen = () => {
     onCIP36SupportChange: params?.onCIP36SupportChange,
   })
 
-  // TODO: apply cbor
-  const txBody = useTxBody({unsignedTx})
+  const txBody = useTxBody({cbor, unsignedTx})
   const formatedTx = useFormattedTx(txBody)
-  const formattedMetadata = formatMetadata(unsignedTx, txBody)
+  const formattedMetadata = useFormattedMetadata({unsignedTx, cbor, txBody})
 
   const tabsData = [
     [strings.overviewTab, 'overview'],
     [strings.utxosTab, 'utxos'],
   ]
 
-  if (!isEmptyString(formattedMetadata.hash) && formattedMetadata.metadata != null)
+  if (!isEmptyString(formattedMetadata?.hash) && formattedMetadata?.metadata != null)
     tabsData.push([strings.metadataTab, 'metadata'])
 
+  React.useEffect(() => {
+    return () => {
+      params?.onCancel?.()
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+  const handleOnConfirm = () => {
+    if (params?.onConfirm) {
+      params?.onConfirm()
+      return
+    }
+
+    onConfirm()
+  }
+
   return (
     <SafeArea style={styles.root}>
       <MaterialTab.Navigator tabBar={(props) => <TabBar {...props} tabsData={tabsData} />}>
@@ -83,14 +98,14 @@ export const ReviewTxScreen = () => {
           {() => (
             /* TODO: make scrollview general to use button border */
             <ScrollView style={styles.root}>
-              <MetadataTab hash={formattedMetadata.hash} metadata={formattedMetadata.metadata} />
+              <MetadataTab hash={formattedMetadata?.hash ?? null} metadata={formattedMetadata?.metadata ?? null} />
             </ScrollView>
           )}
         </MaterialTab.Screen>
       </MaterialTab.Navigator>
 
       <Actions>
-        <Button title={strings.confirm} onPress={onConfirm} />
+        <Button title={strings.confirm} onPress={handleOnConfirm} />
       </Actions>
     </SafeArea>
   )
diff --git a/apps/wallet-mobile/src/kernel/navigation.tsx b/apps/wallet-mobile/src/kernel/navigation.tsx
index 8967784961..2c996ed22f 100644
--- a/apps/wallet-mobile/src/kernel/navigation.tsx
+++ b/apps/wallet-mobile/src/kernel/navigation.tsx
@@ -250,7 +250,6 @@ export type SettingsRouteNavigation = StackNavigationProp<SettingsStackRoutes>
 export type DiscoverRoutes = {
   'discover-browser': NavigatorScreenParams<BrowserRoutes>
   'discover-select-dapp-from-list': undefined
-  'discover-review-tx': {cbor: string}
 }
 
 export type BrowserRoutes = {
@@ -276,6 +275,8 @@ export type PortfolioRoutes = {
 
 export type ReviewTxRoutes = {
   'review-tx'?: {
+    onConfirm?: () => void
+    onCancel?: () => void
     onSuccess?: (signedTx: YoroiSignedTx) => void
     onError?: () => void
     onNotSupportedCIP1694?: () => void

From d4e9a2dcf2ab47e6adb6c1f09e213f9c5d8d3fd8 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Thu, 31 Oct 2024 15:36:47 +0000
Subject: [PATCH 3/4] refactor(wallet-mobile): dropped legacy assert things
 (#3719)

---
 apps/wallet-mobile/package.json               |  1 -
 .../src/features/Dev/DeveloperScreen.tsx      | 14 -----------
 .../src/kernel/encryption/encryption.ts       |  3 ---
 .../account-manager/account-manager.test.ts   | 10 --------
 .../account-manager/account-manager.ts        | 14 -----------
 .../src/yoroi-wallets/cardano/api/api.ts      |  4 ---
 .../bip44Validators/bip44Validators.ts        |  3 ---
 .../yoroi-wallets/cardano/cardano-wallet.ts   |  3 ---
 .../yoroi-wallets/cardano/cip8/cip8.test.ts   | 16 ++++++------
 .../yoroi-wallets/cardano/delegationUtils.ts  |  2 --
 .../processTransactions.ts                    |  2 --
 .../transactionManager/transactionManager.ts  |  2 --
 yarn.lock                                     | 25 +------------------
 13 files changed, 10 insertions(+), 89 deletions(-)

diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index d975df0da6..964897c439 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -141,7 +141,6 @@
     "@yoroi/theme": "^2.0.0",
     "@yoroi/transfer": "^1.0.1",
     "add": "2.0.6",
-    "assert": "^2.0.0",
     "axios": "^1.5.0",
     "base-64": "^1.0.0",
     "bignumber.js": "^9.0.1",
diff --git a/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx b/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
index 8accb4fd91..4edb1b5264 100644
--- a/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
+++ b/apps/wallet-mobile/src/features/Dev/DeveloperScreen.tsx
@@ -3,7 +3,6 @@ import AsyncStorage from '@react-native-async-storage/async-storage'
 import {useNavigation} from '@react-navigation/native'
 import {useTheme} from '@yoroi/theme'
 import {Api} from '@yoroi/types'
-import assert from 'assert'
 import _ from 'lodash'
 import React from 'react'
 import {useIntl} from 'react-intl'
@@ -267,13 +266,9 @@ const useStyles = () => {
 
 class StorageError extends Error {}
 
-const checkPathFormat = (path: string) => path.startsWith('/') && !path.endsWith('/')
-
 const parseJson = (json: string) => (json !== null ? JSON.parse(json) : undefined)
 
 const read = async (path: string) => {
-  assert(checkPathFormat(path), 'Wrong storage key path')
-
   try {
     const text = await AsyncStorage.getItem(path)
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -284,8 +279,6 @@ const read = async (path: string) => {
 }
 
 const readMany = async (paths: Array<string>) => {
-  assert(_.every(paths, checkPathFormat), 'Wrong storage key path')
-
   try {
     const items = await AsyncStorage.multiGet(paths)
 
@@ -297,10 +290,6 @@ const readMany = async (paths: Array<string>) => {
 }
 
 const write = async (path: string, data: any) => {
-  assert(path.startsWith('/'), 'Wrong storage key path')
-  assert(!path.endsWith('/'), 'Wrong storage key path')
-  assert(data !== undefined, 'Cannot store undefined')
-
   try {
     await AsyncStorage.setItem(path, JSON.stringify(data))
   } catch (error) {
@@ -309,9 +298,6 @@ const write = async (path: string, data: any) => {
 }
 
 const remove = async (path: string) => {
-  assert(path.startsWith('/'), 'Wrong storage key path')
-  assert(!path.endsWith('/'), 'Wrong storage key path')
-
   try {
     await AsyncStorage.removeItem(path)
   } catch (error) {
diff --git a/apps/wallet-mobile/src/kernel/encryption/encryption.ts b/apps/wallet-mobile/src/kernel/encryption/encryption.ts
index 587c136ec5..a66fb7c37d 100644
--- a/apps/wallet-mobile/src/kernel/encryption/encryption.ts
+++ b/apps/wallet-mobile/src/kernel/encryption/encryption.ts
@@ -1,12 +1,9 @@
 import {App} from '@yoroi/types'
-import assert from 'assert'
 import cryptoRandomString from 'crypto-random-string'
 
 import {Cardano} from '../../yoroi-wallets/wallets'
 
 export const encryptData = async (plaintextHex: string, secretKey: string): Promise<string> => {
-  assert(!!plaintextHex, 'encrypt:: !!plaintextHex')
-  assert(!!secretKey, 'encrypt:: !!secretKey')
   const secretKeyHex = Buffer.from(secretKey, 'utf8').toString('hex')
   const saltHex = cryptoRandomString({
     length: 2 * 32,
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/account-manager/account-manager.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/account-manager/account-manager.test.ts
index 1ecfa6ef5d..9dfb2bee88 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/account-manager/account-manager.test.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/account-manager/account-manager.test.ts
@@ -61,16 +61,6 @@ describe('AddressChain', () => {
     expect(chain?.getIndexOfAddress(getAddr(14))).toBe(14)
   })
 
-  it('throws on bad indexOf', async () => {
-    expect.assertions(1)
-
-    await chain?.initialize()
-    expect(() => {
-      // note: throws and logs error "Assertion failed: getIndexOfAddress:: is not my address"
-      chain?.getIndexOfAddress('wrong')
-    }).toThrow()
-  })
-
   it('can continue after rehydrating', async () => {
     const chainId = 1
     const pubKey44 =
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/account-manager/account-manager.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/account-manager/account-manager.ts
index a0cb8a935e..4c2b9a1511 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/account-manager/account-manager.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/account-manager/account-manager.ts
@@ -1,6 +1,5 @@
 import {parseSafe} from '@yoroi/common'
 import {App, Wallet} from '@yoroi/types'
-import assert from 'assert'
 import _ from 'lodash'
 import {defaultMemoize} from 'reselect'
 
@@ -132,8 +131,6 @@ export class AddressChain {
     lastUsedIndex = 0,
     lastUsedIndexVisual = lastUsedIndex,
   ) {
-    assert(blockSize > gapLimit, 'Block size needs to be > gap limit')
-
     this._addressGenerator = addressGenerator
     this._blockSize = blockSize
     this._gapLimit = gapLimit
@@ -177,7 +174,6 @@ export class AddressChain {
     // is initialized && addresses
     chain._extendAddresses(addresses)
     chain._isInitialized = true
-    chain._selfCheck()
     return chain
   }
 
@@ -194,7 +190,6 @@ export class AddressChain {
   }
 
   _extendAddresses(newAddresses: Array<string>) {
-    assert(_.intersection(this._addresses, newAddresses).length === 0, 'extendAddresses received an existing address')
     this._addresses = [...this._addresses, ...newAddresses]
     this._subscriptions.forEach((handler) => handler(newAddresses))
   }
@@ -214,9 +209,7 @@ export class AddressChain {
   }
 
   _getLastBlock() {
-    this._selfCheck()
     const block = _.takeRight(this.addresses, this._blockSize)
-    assert(block.length === this._blockSize, 'AddressChain::_getLastBlock(): block length')
     return block
   }
 
@@ -226,11 +219,6 @@ export class AddressChain {
     this._isInitialized = true
   }
 
-  _selfCheck() {
-    assert(this._isInitialized, 'AddressChain::_selfCheck(): isInitialized')
-    assert(this._addresses.length % this._blockSize === 0, 'AddressChain::_selfCheck(): lengths')
-  }
-
   async sync(filterFn: AsyncAddressFilter) {
     let keepSyncing = true
     while (keepSyncing) {
@@ -239,7 +227,6 @@ export class AddressChain {
   }
 
   async _syncStep(filterFn: AsyncAddressFilter) {
-    this._selfCheck()
     const block = this._getLastBlock()
     const used = await filterFn(block)
 
@@ -272,7 +259,6 @@ export class AddressChain {
   }
 
   getIndexOfAddress(address: string): number {
-    assert(this.isMyAddress(address), 'getIndexOfAddress:: is not my address')
     const idx = this.addressToIdxMap[address]
     return idx
   }
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 0fa64705d6..9c6263de53 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/api/api.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/api/api.ts
@@ -1,4 +1,3 @@
-import assert from 'assert'
 import _ from 'lodash'
 
 import type {
@@ -30,7 +29,6 @@ export const fetchNewTxHistory = async (
   request: TxHistoryRequest,
   baseApiUrl: string,
 ): Promise<{isLast: boolean; transactions: Array<RawTransaction>}> => {
-  assert(request.addresses.length <= limitApiRecords, 'fetchNewTxHistory: too many addresses')
   const transactions = await fetchDefault<Array<RawTransaction>>('v2/txs/history', request, baseApiUrl)
 
   return {
@@ -40,7 +38,6 @@ export const fetchNewTxHistory = async (
 }
 
 export const filterUsedAddresses = async (addresses: Addresses, baseApiUrl: string): Promise<Addresses> => {
-  assert(addresses.length <= limitApiRecords, 'filterUsedAddresses: too many addresses')
   // Take a copy in case underlying data mutates during await
   const copy = [...addresses]
   const used = await fetchDefault<Addresses>('v2/addresses/filterUsed', {addresses: copy}, baseApiUrl)
@@ -57,7 +54,6 @@ export const submitTransaction = async (signedTx: string, baseApiUrl: string): P
 }
 
 export const getAccountState = (request: AccountStateRequest, baseApiUrl: string): Promise<AccountStateResponse> => {
-  assert(request.addresses.length <= limitApiRecords, 'getAccountState: too many addresses')
   return fetchDefault('account/state', request, baseApiUrl)
 }
 
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/bip44Validators/bip44Validators.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/bip44Validators/bip44Validators.ts
index 2fd6642071..b1e799683f 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/bip44Validators/bip44Validators.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/bip44Validators/bip44Validators.ts
@@ -1,5 +1,3 @@
-import assert from 'assert'
-
 import {cardanoConfig} from '../../../features/WalletManager/common/adapters/cardano/cardano-config'
 import {CardanoMobile} from '../../wallets'
 
@@ -20,7 +18,6 @@ export const isValidPath = (path: unknown): boolean => {
 }
 
 export const isCIP1852AccountPath = (path: Array<number>): boolean => {
-  assert(isValidPath(path), 'invalid bip44 path')
   // note: allows non-zero accounts
   return (
     path.length === 3 &&
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts
index e4bf088e85..12cc268935 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts
@@ -6,7 +6,6 @@ import {Datum} from '@emurgo/yoroi-lib/dist/internals/models'
 import {AppApi} from '@yoroi/api'
 import {isNonNullable} from '@yoroi/common'
 import {Api, App, Balance, HW, Network, Portfolio, Wallet} from '@yoroi/types'
-import assert from 'assert'
 import {BigNumber} from 'bignumber.js'
 import {Buffer} from 'buffer'
 import {freeze} from 'immer'
@@ -252,7 +251,6 @@ export const makeCardanoWallet = (networkManager: Network.Manager, implementatio
 
       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) throwLoggedError('CardanoWallet: getChangeAddress unable to resolve change address')
       return changeAddress
@@ -1086,7 +1084,6 @@ export const makeCardanoWallet = (networkManager: Network.Manager, implementatio
 
     private _isUsedAddressIndexSelector = defaultMemoize((perAddressTxs) =>
       _.mapValues(perAddressTxs, (txs) => {
-        assert(!!txs, 'perAddressTxs cointains false-ish value')
         return txs.length > 0
       }),
     )
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/cip8/cip8.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/cip8/cip8.test.ts
index 12859f667a..258ebb0733 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/cip8/cip8.test.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/cip8/cip8.test.ts
@@ -1,5 +1,4 @@
 import {normalizeToAddress} from '@emurgo/yoroi-lib/dist/internals/utils/addresses'
-import assert from 'assert'
 import {Buffer} from 'buffer'
 
 import {harden} from '../common/signatureUtils'
@@ -20,12 +19,15 @@ describe('CIP8', () => {
 
     const payloadInBytes = Buffer.from(payload, 'hex')
     const normalisedAddress = await normalizeToAddress(csl, bech32)
-    assert(normalisedAddress != null)
-    const coseSign1 = await cip8.sign(Buffer.from(await normalisedAddress.toHex(), 'hex'), signingKey, payloadInBytes)
-    const signature = Buffer.from(await coseSign1.toBytes()).toString('hex')
-    expect(signature).toEqual(
-      '845846a201276761646472657373583901260c2a2b09aad0061a320042c15f8985449b9e8d5ced8a45e35b37dd42d6429c72c0dc1c873923e1afe475ad614cf6d3aec61ddbceeefe40a166686173686564f44548656c6c6f58400b6a6aac7a95656ab241bf4dedec8b5ca0d4893747093f3382223b1d2e869de1b6b9809f0b974536b1191b6e193cf4ec5dc506b21b52e6bc5d352f04c60bf30d',
-    )
+    if (normalisedAddress != null) {
+      const coseSign1 = await cip8.sign(Buffer.from(await normalisedAddress.toHex(), 'hex'), signingKey, payloadInBytes)
+      const signature = Buffer.from(await coseSign1.toBytes()).toString('hex')
+      expect(signature).toEqual(
+        '845846a201276761646472657373583901260c2a2b09aad0061a320042c15f8985449b9e8d5ced8a45e35b37dd42d6429c72c0dc1c873923e1afe475ad614cf6d3aec61ddbceeefe40a166686173686564f44548656c6c6f58400b6a6aac7a95656ab241bf4dedec8b5ca0d4893747093f3382223b1d2e869de1b6b9809f0b974536b1191b6e193cf4ec5dc506b21b52e6bc5d352f04c60bf30d',
+      )
+    } else {
+      fail()
+    }
   })
 })
 
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/delegationUtils.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/delegationUtils.ts
index cadc956a99..db58dfc5bc 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/delegationUtils.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/delegationUtils.ts
@@ -2,7 +2,6 @@
 
 import {CardanoAddressedUtxo} from '@emurgo/yoroi-lib'
 import {normalizeToAddress} from '@emurgo/yoroi-lib/dist/internals/utils/addresses'
-import assert from 'assert'
 import {sortBy} from 'lodash'
 
 import {StakingStatus} from '../types/staking'
@@ -65,7 +64,6 @@ export const getDelegationStatus = (
       if (cert.rewardAddress !== rewardAddress) continue
 
       if (cert.kind === 'StakeDelegation') {
-        assert(cert.poolKeyHash != null, 'getDelegationStatus:: StakeDelegation certificate without poolKeyHash')
         status = {
           poolKeyHash: cert.poolKeyHash,
           isRegistered: true,
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/processTransactions/processTransactions.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/processTransactions/processTransactions.ts
index 02eab0f826..ab8880e2a8 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/processTransactions/processTransactions.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/processTransactions/processTransactions.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import {isArray, isString} from '@yoroi/common'
 import {Portfolio} from '@yoroi/types'
-import assert from 'assert'
 import {BigNumber} from 'bignumber.js'
 
 import {
@@ -235,7 +234,6 @@ export const processTxHistoryData = (
     amount = brutto.joinSubtractMutable(totalFee)
     fee = remoteFee ?? totalFee
   } else {
-    assert(ownInputs.length === 0, 'This cannot be receiving transaction')
     direction = TRANSACTION_DIRECTION.RECEIVED
     amount = brutto
     fee = null
diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/transactionManager/transactionManager.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/transactionManager/transactionManager.ts
index 500739adb3..5abd977936 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/cardano/transactionManager/transactionManager.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/transactionManager/transactionManager.ts
@@ -2,7 +2,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import {isArray, parseSafe, PromiseAllLimited} from '@yoroi/common'
 import {App} from '@yoroi/types'
-import assert from 'assert'
 import {fromPairs, mapValues, max} from 'lodash'
 import DeviceInfo from 'react-native-device-info'
 import {defaultMemoize} from 'reselect'
@@ -478,7 +477,6 @@ const confirmationCountsSelector = (state: TransactionManagerState) => {
       ...tx.inputs.map(getBlockNum),
       ...tx.outputs.map(getBlockNum),
     ])
-    assert(tx.blockNum, 'Successfull tx should have blockNum')
 
     return bestBlockNum - (tx as any).blockNum
   })
diff --git a/yarn.lock b/yarn.lock
index 547d7e2113..7f60dbc4ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7054,16 +7054,6 @@ assert@^1.1.1:
     object-assign "^4.1.1"
     util "0.10.3"
 
-assert@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
-  integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==
-  dependencies:
-    es6-object-assign "^1.1.0"
-    is-nan "^1.2.1"
-    object-is "^1.0.1"
-    util "^0.12.0"
-
 assertion-error@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
@@ -10746,11 +10736,6 @@ es5-shim@^4.5.13:
   resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.6.7.tgz#bc67ae0fc3dd520636e0a1601cc73b450ad3e955"
   integrity sha512-jg21/dmlrNQI7JyyA2w7n+yifSxBng0ZralnSfVZjoCawgNTCnS+yBCyVM9DL5itm7SUnDGgv7hcq2XCZX4iRQ==
 
-es6-object-assign@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
-  integrity sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==
-
 es6-shim@^0.35.5:
   version "0.35.8"
   resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.8.tgz#89216f6fbf8bacba3f897c8c0e814d2a41c05fb7"
@@ -13728,14 +13713,6 @@ is-map@^2.0.1, is-map@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
   integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
 
-is-nan@^1.2.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
-  integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -22716,7 +22693,7 @@ util@^0.11.0:
   dependencies:
     inherits "2.0.3"
 
-util@^0.12.0, util@^0.12.4:
+util@^0.12.4:
   version "0.12.5"
   resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
   integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==

From 2a659ff17810fde4d09f1be18438d0242c3323ef Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Thu, 31 Oct 2024 16:07:52 +0000
Subject: [PATCH 4/4] chore(api): updated the protocol params endpoint with the
 new api response (#3720)

Signed-off-by: Evgenii Lisitskii <lisicky@inbox.ru>
Co-authored-by: Evgenii Lisitskii <lisicky@inbox.ru>
---
 apps/wallet-mobile/package.json               |   4 +-
 .../network-manager/network-manager.ts        | 128 +++++++++++++++-
 packages/api/package.json                     |   4 +-
 .../cardano/api/cardano-api-maker.mocks.ts    |   6 +-
 .../src/cardano/api/protocol-params.mocks.ts  | 137 +++++++++++++++++-
 .../src/cardano/api/protocol-params.test.ts   |  22 +--
 .../api/src/cardano/api/protocol-params.ts    |  81 ++++++++++-
 packages/claim/package.json                   |   2 +-
 packages/common/package.json                  |   2 +-
 packages/dapp-connector/package.json          |   2 +-
 packages/exchange/package.json                |   2 +-
 packages/explorers/package.json               |   2 +-
 packages/links/package.json                   |   2 +-
 packages/notifications/package.json           |   2 +-
 packages/portfolio/package.json               |   3 +-
 packages/resolver/package.json                |   6 +-
 packages/setup-wallet/package.json            |   4 +-
 packages/staking/package.json                 |   2 +-
 packages/swap/package.json                    |   8 +-
 packages/theme/package.json                   |   2 +-
 packages/transfer/package.json                |   2 +-
 packages/types/package.json                   |   2 +-
 packages/types/src/chain/cardano.ts           |  70 ++++++++-
 packages/types/src/index.ts                   |   2 +
 packages/types/src/numbers/ratio.ts           |   4 +
 25 files changed, 448 insertions(+), 53 deletions(-)
 create mode 100644 packages/types/src/numbers/ratio.ts

diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index 964897c439..607457be33 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -125,7 +125,7 @@
     "@shopify/flash-list": "^1.4.1",
     "@types/bip39": "^3.0.0",
     "@types/pbkdf2": "^3.1.2",
-    "@yoroi/api": "^1.5.2",
+    "@yoroi/api": "1.5.3",
     "@yoroi/claim": "1.0.0",
     "@yoroi/common": "^1.5.4",
     "@yoroi/exchange": "^2.1.1",
@@ -263,7 +263,7 @@
     "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.32.0",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^29.2.1",
     "babel-loader": "8.2.2",
diff --git a/apps/wallet-mobile/src/features/WalletManager/network-manager/network-manager.ts b/apps/wallet-mobile/src/features/WalletManager/network-manager/network-manager.ts
index da70dc1039..80e00708dc 100644
--- a/apps/wallet-mobile/src/features/WalletManager/network-manager/network-manager.ts
+++ b/apps/wallet-mobile/src/features/WalletManager/network-manager/network-manager.ts
@@ -72,10 +72,136 @@ export const protocolParamsPlaceholder: Chain.Cardano.ProtocolParams = freeze({
     constant: '155381',
     coefficient: '44',
   },
+  minFeeReferenceScript: {
+    coinsPerByte: {
+      numerator: '15',
+      denominator: '1',
+    },
+    tierStepBytes: '25600',
+    multiplier: '1.2',
+  },
   coinsPerUtxoByte: '4310',
   poolDeposit: '500000000',
   keyDeposit: '2000000',
-  epoch: 509,
+  epoch: 67,
+  maxBlockBodySize: '90112',
+  maxBlockHeaderSize: '1100',
+  maxTxSize: '16384',
+  maxReferenceScriptsSize: '204800',
+  stakePoolPledgeInfluence: {
+    numerator: '3',
+    denominator: '10',
+  },
+  monetaryExpansion: {
+    numerator: '3',
+    denominator: '1000',
+  },
+  treasuryExpansion: {
+    numerator: '1',
+    denominator: '5',
+  },
+  minPoolCost: '340000000',
+  maxExecutionUnits: {
+    perTransaction: {
+      memory: '14000000',
+      cpu: '10000000000',
+    },
+    perBlock: {
+      memory: '62000000',
+      cpu: '20000000000',
+    },
+  },
+  scriptExecutionPrices: {
+    memory: {
+      numerator: '577',
+      denominator: '10000',
+    },
+    cpu: {
+      numerator: '721',
+      denominator: '10000000',
+    },
+  },
+  maxCollateralInputs: '3',
+  collateralPercentage: '150',
+  maxValueSize: '5000',
+  version: {
+    major: '8',
+    minor: '0',
+  },
+  governanceActionDeposit: '100000000000',
+  delegateRepresentativeDeposit: '500000000',
+  constitutionalCommitteeMinSize: '7',
+  constitutionalCommitteeMaxTermLength: '146',
+  governanceActionLifetime: '6',
+  delegateRepresentativeMaxIdleTime: '20',
+  desiredNumberOfStakePools: '500',
+  stakePoolRetirementEpochBound: '18',
+  votingThresholds: {
+    stakePool: {
+      noConfidence: {
+        numerator: '51',
+        denominator: '100',
+      },
+      committeeNormal: {
+        numerator: '51',
+        denominator: '100',
+      },
+      committeeNoConfidence: {
+        numerator: '51',
+        denominator: '100',
+      },
+      hardFork: {
+        numerator: '51',
+        denominator: '100',
+      },
+      ppSecurity: {
+        numerator: '51',
+        denominator: '100',
+      },
+    },
+    delegateRep: {
+      noConfidence: {
+        numerator: '67',
+        denominator: '100',
+      },
+      committeeNormal: {
+        numerator: '67',
+        denominator: '100',
+      },
+      committeeNoConfidence: {
+        numerator: '3',
+        denominator: '5',
+      },
+      constitution: {
+        numerator: '3',
+        denominator: '5',
+      },
+      hardFork: {
+        numerator: '3',
+        denominator: '5',
+      },
+      ppNetwork: {
+        numerator: '67',
+        denominator: '100',
+      },
+      ppEconomic: {
+        numerator: '67',
+        denominator: '100',
+      },
+      ppTechnical: {
+        numerator: '67',
+        denominator: '100',
+      },
+      ppGovernance: {
+        numerator: '3',
+        denominator: '4',
+      },
+      treasury: {
+        numerator: '67',
+        denominator: '100',
+      },
+    },
+  },
 })
 
 export const networkConfigs: Readonly<Record<Chain.SupportedNetworks, Readonly<Network.Config>>> = freeze({
diff --git a/packages/api/package.json b/packages/api/package.json
index 0ab222dd75..ee3f675a42 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yoroi/api",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "The API package of Yoroi SDK",
   "keywords": [
     "yoroi",
@@ -148,7 +148,7 @@
     "@types/jest": "^29.5.12",
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "axios": "^1.5.0",
     "axios-mock-adapter": "^1.21.5",
     "commitlint": "^17.0.2",
diff --git a/packages/api/src/cardano/api/cardano-api-maker.mocks.ts b/packages/api/src/cardano/api/cardano-api-maker.mocks.ts
index c01d45d752..306b5679e7 100644
--- a/packages/api/src/cardano/api/cardano-api-maker.mocks.ts
+++ b/packages/api/src/cardano/api/cardano-api-maker.mocks.ts
@@ -1,6 +1,6 @@
 /* istanbul ignore file */
 import {Api} from '@yoroi/types'
-import {paramsMockResponse} from './protocol-params.mocks'
+import {protocolParamsMockResponse} from './protocol-params.mocks'
 import {bestBlockMockResponse} from './best-block.mocks'
 
 const loading = () => new Promise(() => {})
@@ -17,9 +17,9 @@ const delayedResponse = <T = never>({
   })
 
 const getProtocolParams = {
-  success: () => Promise.resolve(paramsMockResponse),
+  success: () => Promise.resolve(protocolParamsMockResponse),
   delayed: (timeout?: number) =>
-    delayedResponse({data: paramsMockResponse, timeout}),
+    delayedResponse({data: protocolParamsMockResponse, timeout}),
   empty: () => Promise.resolve({}),
   loading,
   error: {
diff --git a/packages/api/src/cardano/api/protocol-params.mocks.ts b/packages/api/src/cardano/api/protocol-params.mocks.ts
index d11036027f..c6525b032e 100644
--- a/packages/api/src/cardano/api/protocol-params.mocks.ts
+++ b/packages/api/src/cardano/api/protocol-params.mocks.ts
@@ -1,9 +1,138 @@
 import {Chain} from '@yoroi/types'
 
-export const paramsMockResponse: Chain.Cardano.ProtocolParams = {
+export const protocolParamsMockResponse: Chain.Cardano.ProtocolParams = {
+  linearFee: {
+    constant: '155381',
+    coefficient: '44',
+  },
+  minFeeReferenceScript: {
+    coinsPerByte: {
+      numerator: '15',
+      denominator: '1',
+    },
+    tierStepBytes: '25600',
+    multiplier: '1.2',
+  },
   coinsPerUtxoByte: '4310',
-  keyDeposit: '2000000',
-  linearFee: {coefficient: '44', constant: '155381'},
   poolDeposit: '500000000',
-  epoch: 509,
+  keyDeposit: '2000000',
+  epoch: 67,
+  maxBlockBodySize: '90112',
+  maxBlockHeaderSize: '1100',
+  maxTxSize: '16384',
+  maxReferenceScriptsSize: '204800',
+  stakePoolPledgeInfluence: {
+    numerator: '3',
+    denominator: '10',
+  },
+  monetaryExpansion: {
+    numerator: '3',
+    denominator: '1000',
+  },
+  treasuryExpansion: {
+    numerator: '1',
+    denominator: '5',
+  },
+  minPoolCost: '340000000',
+  maxExecutionUnits: {
+    perTransaction: {
+      memory: '14000000',
+      cpu: '10000000000',
+    },
+    perBlock: {
+      memory: '62000000',
+      cpu: '20000000000',
+    },
+  },
+  scriptExecutionPrices: {
+    memory: {
+      numerator: '577',
+      denominator: '10000',
+    },
+    cpu: {
+      numerator: '721',
+      denominator: '10000000',
+    },
+  },
+  maxCollateralInputs: '3',
+  collateralPercentage: '150',
+  maxValueSize: '5000',
+  version: {
+    major: '8',
+    minor: '0',
+  },
+  governanceActionDeposit: '100000000000',
+  delegateRepresentativeDeposit: '500000000',
+  constitutionalCommitteeMinSize: '7',
+  constitutionalCommitteeMaxTermLength: '146',
+  governanceActionLifetime: '6',
+  delegateRepresentativeMaxIdleTime: '20',
+  desiredNumberOfStakePools: '500',
+  stakePoolRetirementEpochBound: '18',
+  votingThresholds: {
+    stakePool: {
+      noConfidence: {
+        numerator: '51',
+        denominator: '100',
+      },
+      committeeNormal: {
+        numerator: '51',
+        denominator: '100',
+      },
+      committeeNoConfidence: {
+        numerator: '51',
+        denominator: '100',
+      },
+      hardFork: {
+        numerator: '51',
+        denominator: '100',
+      },
+      ppSecurity: {
+        numerator: '51',
+        denominator: '100',
+      },
+    },
+    delegateRep: {
+      noConfidence: {
+        numerator: '67',
+        denominator: '100',
+      },
+      committeeNormal: {
+        numerator: '67',
+        denominator: '100',
+      },
+      committeeNoConfidence: {
+        numerator: '3',
+        denominator: '5',
+      },
+      constitution: {
+        numerator: '3',
+        denominator: '5',
+      },
+      hardFork: {
+        numerator: '3',
+        denominator: '5',
+      },
+      ppNetwork: {
+        numerator: '67',
+        denominator: '100',
+      },
+      ppEconomic: {
+        numerator: '67',
+        denominator: '100',
+      },
+      ppTechnical: {
+        numerator: '67',
+        denominator: '100',
+      },
+      ppGovernance: {
+        numerator: '3',
+        denominator: '4',
+      },
+      treasury: {
+        numerator: '67',
+        denominator: '100',
+      },
+    },
+  },
 }
diff --git a/packages/api/src/cardano/api/protocol-params.test.ts b/packages/api/src/cardano/api/protocol-params.test.ts
index 3b2a652944..15c63496ec 100644
--- a/packages/api/src/cardano/api/protocol-params.test.ts
+++ b/packages/api/src/cardano/api/protocol-params.test.ts
@@ -1,5 +1,5 @@
 import {getProtocolParams, isProtocolParamsResponse} from './protocol-params'
-import {paramsMockResponse} from './protocol-params.mocks'
+import {protocolParamsMockResponse} from './protocol-params.mocks'
 import axios from 'axios'
 
 jest.mock('axios')
@@ -8,13 +8,17 @@ const mockedAxios = axios as jest.MockedFunction<typeof axios>
 describe('getProtocolParams', () => {
   const baseUrl = 'https://localhost'
   const mockFetch = jest.fn()
-  const customFetcher = jest.fn().mockResolvedValue(paramsMockResponse)
+  const customFetcher = jest.fn().mockResolvedValue(protocolParamsMockResponse)
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+  })
 
   it('returns parsed data when response is valid', async () => {
-    mockFetch.mockResolvedValue(paramsMockResponse)
+    mockFetch.mockResolvedValue(protocolParamsMockResponse)
     const protocolParams = getProtocolParams(baseUrl, mockFetch)
     const result = await protocolParams()
-    expect(result).toEqual(paramsMockResponse)
+    expect(result).toEqual(protocolParamsMockResponse)
   })
 
   it('throws an error if response is not valid', async () => {
@@ -39,16 +43,16 @@ describe('getProtocolParams', () => {
     const protocolParams = getProtocolParams(baseUrl, customFetcher)
     const result = await protocolParams()
     expect(customFetcher).toHaveBeenCalled()
-    expect(result).toEqual(paramsMockResponse)
+    expect(result).toEqual(protocolParamsMockResponse)
   })
   it('uses fetcher and returns data on successful fetch', async () => {
-    mockedAxios.mockResolvedValue({data: paramsMockResponse})
+    mockedAxios.mockResolvedValue({data: protocolParamsMockResponse})
 
     const protocolParams = getProtocolParams(baseUrl)
     const result = await protocolParams()
 
     expect(mockedAxios).toHaveBeenCalled()
-    expect(result).toEqual(paramsMockResponse)
+    expect(result).toEqual(protocolParamsMockResponse)
   })
 
   it('throws an error on network issues', async () => {
@@ -60,11 +64,11 @@ describe('getProtocolParams', () => {
 })
 describe('isProtocolParamsResponse', () => {
   it('returns true for a valid protocol parameters response', () => {
-    expect(isProtocolParamsResponse(paramsMockResponse)).toBe(true)
+    expect(isProtocolParamsResponse(protocolParamsMockResponse)).toBe(true)
   })
 
   it('returns false for an invalid protocol parameters response', () => {
-    const invalidResponse = {...paramsMockResponse, epoch: 'invalid'}
+    const invalidResponse = {...protocolParamsMockResponse, epoch: 'invalid'}
     expect(isProtocolParamsResponse(invalidResponse)).toBe(false)
   })
 
diff --git a/packages/api/src/cardano/api/protocol-params.ts b/packages/api/src/cardano/api/protocol-params.ts
index 7e6350172c..f0752e53e2 100644
--- a/packages/api/src/cardano/api/protocol-params.ts
+++ b/packages/api/src/cardano/api/protocol-params.ts
@@ -25,17 +25,84 @@ export const parseProtocolParamsResponse = (
   return isProtocolParamsResponse(data) ? data : undefined
 }
 
-const AppProtocolParamsSchema = z.object({
-  coinsPerUtxoByte: z.string(),
-  keyDeposit: z.string(),
+const RatioSchema = z.object({
+  numerator: z.string(),
+  denominator: z.string(),
+})
+
+const ProtocolParamsSchema = z.object({
   linearFee: z.object({
-    coefficient: z.string(),
     constant: z.string(),
+    coefficient: z.string(),
+  }),
+  minFeeReferenceScript: z.object({
+    coinsPerByte: RatioSchema,
+    tierStepBytes: z.string(),
+    multiplier: z.string(),
   }),
+  coinsPerUtxoByte: z.string(),
   poolDeposit: z.string(),
+  keyDeposit: z.string(),
   epoch: z.number().nonnegative(),
+  maxBlockBodySize: z.string(),
+  maxBlockHeaderSize: z.string(),
+  maxTxSize: z.string(),
+  maxReferenceScriptsSize: z.string(),
+  stakePoolPledgeInfluence: RatioSchema,
+  monetaryExpansion: RatioSchema,
+  treasuryExpansion: RatioSchema,
+  minPoolCost: z.string(),
+  maxExecutionUnits: z.object({
+    perTransaction: z.object({
+      memory: z.string(),
+      cpu: z.string(),
+    }),
+    perBlock: z.object({
+      memory: z.string(),
+      cpu: z.string(),
+    }),
+  }),
+  scriptExecutionPrices: z.object({
+    memory: RatioSchema,
+    cpu: RatioSchema,
+  }),
+  maxCollateralInputs: z.string(),
+  collateralPercentage: z.string(),
+  maxValueSize: z.string(),
+  version: z.object({
+    major: z.string(),
+    minor: z.string(),
+  }),
+  governanceActionDeposit: z.string(),
+  delegateRepresentativeDeposit: z.string(),
+  constitutionalCommitteeMinSize: z.string(),
+  constitutionalCommitteeMaxTermLength: z.string(),
+  governanceActionLifetime: z.string(),
+  delegateRepresentativeMaxIdleTime: z.string(),
+  desiredNumberOfStakePools: z.string(),
+  stakePoolRetirementEpochBound: z.string(),
+  votingThresholds: z.object({
+    stakePool: z.object({
+      noConfidence: RatioSchema,
+      committeeNormal: RatioSchema,
+      committeeNoConfidence: RatioSchema,
+      hardFork: RatioSchema,
+      ppSecurity: RatioSchema,
+    }),
+    delegateRep: z.object({
+      noConfidence: RatioSchema,
+      committeeNormal: RatioSchema,
+      committeeNoConfidence: RatioSchema,
+      constitution: RatioSchema,
+      hardFork: RatioSchema,
+      ppNetwork: RatioSchema,
+      ppEconomic: RatioSchema,
+      ppTechnical: RatioSchema,
+      ppGovernance: RatioSchema,
+      treasury: RatioSchema,
+    }),
+  }),
 })
 
-export const isProtocolParamsResponse = createTypeGuardFromSchema(
-  AppProtocolParamsSchema,
-)
+export const isProtocolParamsResponse =
+  createTypeGuardFromSchema(ProtocolParamsSchema)
diff --git a/packages/claim/package.json b/packages/claim/package.json
index f61afc1f09..5d9e92aa04 100644
--- a/packages/claim/package.json
+++ b/packages/claim/package.json
@@ -154,7 +154,7 @@
     "@types/react-test-renderer": "^18.0.7",
     "@yoroi/common": "^1.5.4",
     "@yoroi/portfolio": "1.0.3",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "bignumber.js": "^9.0.1",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
diff --git a/packages/common/package.json b/packages/common/package.json
index 7cbdaf653f..8f51b9b5b0 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -146,7 +146,7 @@
     "@types/jest": "^29.5.12",
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "axios": "^1.5.0",
     "axios-mock-adapter": "^1.21.5",
     "bignumber.js": "^9.0.1",
diff --git a/packages/dapp-connector/package.json b/packages/dapp-connector/package.json
index 680bb42f87..81172403fd 100644
--- a/packages/dapp-connector/package.json
+++ b/packages/dapp-connector/package.json
@@ -155,7 +155,7 @@
     "@types/jest": "^29.5.12",
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "axios-mock-adapter": "^1.21.5",
     "bignumber.js": "^9.0.1",
     "commitlint": "^17.0.2",
diff --git a/packages/exchange/package.json b/packages/exchange/package.json
index 8d51567f66..bf97202723 100644
--- a/packages/exchange/package.json
+++ b/packages/exchange/package.json
@@ -139,7 +139,7 @@
     "@types/jest": "^29.5.12",
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "axios": "^1.5.0",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
diff --git a/packages/explorers/package.json b/packages/explorers/package.json
index 7ee72ae904..3af3e603d9 100644
--- a/packages/explorers/package.json
+++ b/packages/explorers/package.json
@@ -144,7 +144,7 @@
     "@types/jest": "^29.5.12",
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "bignumber.js": "^9.0.1",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
diff --git a/packages/links/package.json b/packages/links/package.json
index eb3ea9b0fb..fe463bbc77 100644
--- a/packages/links/package.json
+++ b/packages/links/package.json
@@ -147,7 +147,7 @@
     "@types/jest": "^29.5.12",
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
     "dependency-cruiser": "^13.1.1",
diff --git a/packages/notifications/package.json b/packages/notifications/package.json
index ee0d1c9ea4..27a6b7d7e0 100644
--- a/packages/notifications/package.json
+++ b/packages/notifications/package.json
@@ -144,7 +144,7 @@
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
     "@yoroi/common": "1.5.4",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "axios": "^1.5.0",
     "axios-mock-adapter": "^1.21.5",
     "commitlint": "^17.0.2",
diff --git a/packages/portfolio/package.json b/packages/portfolio/package.json
index 53573b5b25..767504ffbf 100644
--- a/packages/portfolio/package.json
+++ b/packages/portfolio/package.json
@@ -145,7 +145,7 @@
     "@types/jest": "^29.5.12",
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "bignumber.js": "^9.0.1",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
@@ -170,7 +170,6 @@
   },
   "peerDependencies": {
     "@react-native-async-storage/async-storage": "^1.19.3",
-    "@yoroi/api": "1.5.2",
     "@yoroi/common": "1.5.4",
     "bignumber.js": "^9.0.1",
     "immer": "^10.0.3",
diff --git a/packages/resolver/package.json b/packages/resolver/package.json
index 72cabbd07d..f11ef4250e 100644
--- a/packages/resolver/package.json
+++ b/packages/resolver/package.json
@@ -154,7 +154,7 @@
     "@types/jest": "^29.5.12",
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "axios": "^1.5.0",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
@@ -178,8 +178,8 @@
   },
   "peerDependencies": {
     "@react-native-async-storage/async-storage": ">= 1.19.3 <= 1.20.0",
-    "@yoroi/api": "^1.5.2",
-    "@yoroi/common": "^1.5.4",
+    "@yoroi/api": "1.5.3",
+    "@yoroi/common": "1.5.4",
     "axios": "^1.5.0",
     "react": ">= 16.8.0 <= 19.0.0",
     "react-query": "^3.39.3",
diff --git a/packages/setup-wallet/package.json b/packages/setup-wallet/package.json
index 94b907d031..90b71b27e2 100644
--- a/packages/setup-wallet/package.json
+++ b/packages/setup-wallet/package.json
@@ -140,7 +140,7 @@
     "@types/jest": "^29.5.12",
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
     "dependency-cruiser": "^13.1.1",
@@ -162,7 +162,7 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "immer": "^10.0.2",
     "react": ">= 16.8.0 <= 19.0.0",
     "react-query": "^3.39.3"
diff --git a/packages/staking/package.json b/packages/staking/package.json
index 52b6476958..ca580e3c0f 100644
--- a/packages/staking/package.json
+++ b/packages/staking/package.json
@@ -149,7 +149,7 @@
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
     "@yoroi/common": "1.5.4",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "axios": "^1.5.0",
     "axios-mock-adapter": "^1.21.5",
     "commitlint": "^17.0.2",
diff --git a/packages/swap/package.json b/packages/swap/package.json
index bcb17ab2ca..8b1ea26c39 100644
--- a/packages/swap/package.json
+++ b/packages/swap/package.json
@@ -149,10 +149,10 @@
     "@types/jest": "^29.5.12",
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
-    "@yoroi/api": "^1.5.2",
-    "@yoroi/common": "^1.5.4",
+    "@yoroi/api": "1.5.3",
+    "@yoroi/common": "1.5.4",
     "@yoroi/portfolio": "1.0.3",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "bignumber.js": "^9.0.1",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
@@ -177,7 +177,7 @@
   "peerDependencies": {
     "@emurgo/yoroi-lib": "^2.0.0",
     "@react-native-async-storage/async-storage": ">= 1.19.3 <= 1.20.0",
-    "@yoroi/api": "1.5.2",
+    "@yoroi/api": "1.5.3",
     "@yoroi/common": "1.5.4",
     "@yoroi/portfolio": "1.0.3",
     "bignumber.js": "^9.0.1",
diff --git a/packages/theme/package.json b/packages/theme/package.json
index fa17570ee9..bb15a337c5 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -141,7 +141,7 @@
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
     "@yoroi/common": "^1.5.4",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "axios-mock-adapter": "^1.21.5",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
diff --git a/packages/transfer/package.json b/packages/transfer/package.json
index 12de9a83ec..6241aac08b 100644
--- a/packages/transfer/package.json
+++ b/packages/transfer/package.json
@@ -139,7 +139,7 @@
     "@types/react": "^18.2.55",
     "@types/react-test-renderer": "^18.0.7",
     "@yoroi/portfolio": "1.0.3",
-    "@yoroi/types": "1.5.8",
+    "@yoroi/types": "1.5.9",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
     "dependency-cruiser": "^13.1.1",
diff --git a/packages/types/package.json b/packages/types/package.json
index 506d58eda7..315db167b9 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yoroi/types",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "description": "The Yoroi Types package of Yoroi SDK",
   "keywords": [
     "yoroi",
diff --git a/packages/types/src/chain/cardano.ts b/packages/types/src/chain/cardano.ts
index 85df82723c..a60c64ab67 100644
--- a/packages/types/src/chain/cardano.ts
+++ b/packages/types/src/chain/cardano.ts
@@ -5,16 +5,80 @@ import {
 } from '@emurgo/yoroi-lib'
 
 import {BalanceAmounts} from '../balance/token'
+import {NumbersRatio} from '../numbers/ratio'
 
 export type ChainCardanoProtocolParams = Readonly<{
-  coinsPerUtxoByte: string
-  keyDeposit: string
   linearFee: {
-    coefficient: string
     constant: string
+    coefficient: string
+  }
+  minFeeReferenceScript: {
+    coinsPerByte: NumbersRatio
+    tierStepBytes: string
+    multiplier: string
   }
+  coinsPerUtxoByte: string
   poolDeposit: string
+  keyDeposit: string
   epoch: number
+  maxBlockBodySize: string
+  maxBlockHeaderSize: string
+  maxTxSize: string
+  maxReferenceScriptsSize: string
+  stakePoolPledgeInfluence: NumbersRatio
+  monetaryExpansion: NumbersRatio
+  treasuryExpansion: NumbersRatio
+  minPoolCost: string
+  maxExecutionUnits: {
+    perTransaction: {
+      memory: string
+      cpu: string
+    }
+    perBlock: {
+      memory: string
+      cpu: string
+    }
+  }
+  scriptExecutionPrices: {
+    memory: NumbersRatio
+    cpu: NumbersRatio
+  }
+  maxCollateralInputs: string
+  collateralPercentage: string
+  maxValueSize: string
+  version: {
+    major: string
+    minor: string
+  }
+  governanceActionDeposit: string
+  delegateRepresentativeDeposit: string
+  constitutionalCommitteeMinSize: string
+  constitutionalCommitteeMaxTermLength: string
+  governanceActionLifetime: string
+  delegateRepresentativeMaxIdleTime: string
+  desiredNumberOfStakePools: string
+  stakePoolRetirementEpochBound: string
+  votingThresholds: {
+    stakePool: {
+      noConfidence: NumbersRatio
+      committeeNormal: NumbersRatio
+      committeeNoConfidence: NumbersRatio
+      hardFork: NumbersRatio
+      ppSecurity: NumbersRatio
+    }
+    delegateRep: {
+      noConfidence: NumbersRatio
+      committeeNormal: NumbersRatio
+      committeeNoConfidence: NumbersRatio
+      constitution: NumbersRatio
+      hardFork: NumbersRatio
+      ppNetwork: NumbersRatio
+      ppEconomic: NumbersRatio
+      ppTechnical: NumbersRatio
+      ppGovernance: NumbersRatio
+      treasury: NumbersRatio
+    }
+  }
 }>
 
 export type ChainCardanoBestBlock = Readonly<{
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 8f738b91ab..1ad9190454 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -274,6 +274,7 @@ import {
   SwapMakeOrderCalculation,
   SwapOrderCalculation,
 } from './swap/calculations'
+import {NumbersRatio} from './numbers/ratio'
 
 export namespace App {
   export namespace Errors {
@@ -484,6 +485,7 @@ export namespace Api {
 export namespace Numbers {
   export type Locale = NumberLocale
   export type AtomicValue = NumbersAtomicValue
+  export type Ratio = NumbersRatio
 
   export namespace Errors {
     export class InvalidAtomicValue extends NumbersErrorInvalidAtomicValue {}
diff --git a/packages/types/src/numbers/ratio.ts b/packages/types/src/numbers/ratio.ts
new file mode 100644
index 0000000000..98855a9b77
--- /dev/null
+++ b/packages/types/src/numbers/ratio.ts
@@ -0,0 +1,4 @@
+export type NumbersRatio = {
+  numerator: string
+  denominator: string
+}