From 743f20975180707b31ee698e7d3aae498f0851dd Mon Sep 17 00:00:00 2001
From: Michal <miso.szorad@gmail.com>
Date: Wed, 1 Nov 2023 11:25:55 +0100
Subject: [PATCH 01/40] fix(swap): Fix placeholder text color (#2859)

---
 .../Swap/common/AmountCard/AmountCard.tsx        |  1 +
 .../Swap/common/AmountCard/AmountCard.json       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx b/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
index 32dbd6fb68..49cf6419ec 100644
--- a/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
+++ b/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
@@ -64,6 +64,7 @@ export const AmountCard = ({
               autoComplete="off"
               value={value}
               placeholder="0"
+              placeholderTextColor="#6B7384"
               onChangeText={onChange}
               allowFontScaling
               selectionColor={COLORS.TRANSPARENT_BLACK}
diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
index d373ba259b..ba1b1d0ff4 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Select token",
     "file": "src/features/Swap/common/AmountCard/AmountCard.tsx",
     "start": {
-      "line": 123,
+      "line": 124,
       "column": 15,
-      "index": 3821
+      "index": 3862
     },
     "end": {
-      "line": 126,
+      "line": 127,
       "column": 3,
-      "index": 3904
+      "index": 3945
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Current Balance",
     "file": "src/features/Swap/common/AmountCard/AmountCard.tsx",
     "start": {
-      "line": 127,
+      "line": 128,
       "column": 18,
-      "index": 3924
+      "index": 3965
     },
     "end": {
-      "line": 130,
+      "line": 131,
       "column": 3,
-      "index": 4013
+      "index": 4054
     }
   }
 ]
\ No newline at end of file

From 3beb7b06355b996c00f00c2f2c60444db6f94966 Mon Sep 17 00:00:00 2001
From: Sorin Chis <kish.sorin@yahoo.com>
Date: Wed, 1 Nov 2023 15:14:51 +0200
Subject: [PATCH 02/40] fix: Swap design fixes (#2861)

Signed-off-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Co-authored-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
---
 .../Swap/common/AmountCard/AmountCard.tsx     | 13 +++++++++--
 .../CreateOrder/CreateOrder.tsx               | 22 ++++++++++++++++---
 .../CreateOrder/EditSlippage/EditSlippage.tsx |  6 ++++-
 .../EditSlippageScreen/EditSlippageScreen.tsx | 19 +++++++---------
 .../EditSlippage/ShowSlippageInfo.tsx         |  3 ++-
 .../Swap/common/AmountCard/AmountCard.json    | 16 +++++++-------
 6 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx b/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
index 49cf6419ec..08cc0d5236 100644
--- a/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
+++ b/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
@@ -37,6 +37,7 @@ export const AmountCard = ({
   inputEditable = true,
   error,
 }: Props) => {
+  const [isFocused, setIsFocused] = React.useState(false)
   const strings = useStrings()
   const {quantity, tokenId} = amount
   const tokenInfo = useTokenInfo({wallet, tokenId})
@@ -52,9 +53,10 @@ export const AmountCard = ({
       inputRef.current.focus()
     }
   }
+
   return (
     <View>
-      <View style={[styles.container, !isEmptyString(error) && styles.borderError]}>
+      <View style={[styles.container, isFocused && styles.active, !isEmptyString(error) && styles.borderError]}>
         {label != null && <Text style={[styles.label, !isEmptyString(error) && styles.labelError]}>{label}</Text>}
 
         <View style={styles.content}>
@@ -67,12 +69,14 @@ export const AmountCard = ({
               placeholderTextColor="#6B7384"
               onChangeText={onChange}
               allowFontScaling
-              selectionColor={COLORS.TRANSPARENT_BLACK}
+              selectionColor={isFocused ? '#242838' : COLORS.TRANSPARENT_BLACK}
               style={styles.amountInput}
               underlineColorAndroid="transparent"
               ref={inputRef}
               editable={inputEditable}
               selectTextOnFocus
+              onFocus={() => setIsFocused(true)}
+              onBlur={() => setIsFocused(false)}
             />
           </Pressable>
 
@@ -154,6 +158,11 @@ const styles = StyleSheet.create({
   borderError: {
     borderColor: COLORS.ALERT_TEXT_COLOR,
   },
+  active: {
+    borderWidth: 2,
+    borderColor: '#242838',
+  },
+
   label: {
     position: 'absolute',
     top: -7,
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx
index 4c7a378732..d65bb44134 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx
@@ -3,7 +3,7 @@ import {makeLimitOrder, makePossibleMarketOrder, useSwap, useSwapCreateOrder, us
 import {Swap} from '@yoroi/types'
 import BigNumber from 'bignumber.js'
 import * as React from 'react'
-import {Alert, KeyboardAvoidingView, Platform, StyleSheet, View, ViewProps} from 'react-native'
+import {Alert, KeyboardAvoidingView, Platform, StyleSheet, useWindowDimensions, View, ViewProps} from 'react-native'
 import Config from 'react-native-config'
 import {ScrollView} from 'react-native-gesture-handler'
 
@@ -30,14 +30,18 @@ import {ShowTokenActions} from './ShowTokenActions/ShowTokenActions'
 import {TopTokenActions} from './ShowTokenActions/TopTokenActions'
 
 const LIMIT_PRICE_WARNING_THRESHOLD = 0.1 // 10%
+const BOTTOM_ACTION_SECTION = 180
 
 export const CreateOrder = () => {
+  const [contentHeight, setContentHeight] = React.useState(0)
   const strings = useStrings()
   const navigation = useNavigateTo()
   const {orderData, unsignedTxChanged, poolPairsChanged} = useSwap()
   const wallet = useSelectedWallet()
   const {track} = useMetrics()
   const {openModal} = useModal()
+  const {height: deviceHeight} = useWindowDimensions()
+
   const {
     sellQuantity: {isTouched: isSellTouched},
     buyQuantity: {isTouched: isBuyTouched},
@@ -224,7 +228,13 @@ export const CreateOrder = () => {
         keyboardVerticalOffset={120}
       >
         <ScrollView style={styles.scroll}>
-          <View style={styles.container}>
+          <View
+            style={styles.container}
+            onLayout={(event) => {
+              const {height} = event.nativeEvent.layout
+              setContentHeight(height + BOTTOM_ACTION_SECTION)
+            }}
+          >
             <TopTokenActions />
 
             <EditSellAmount />
@@ -248,7 +258,11 @@ export const CreateOrder = () => {
         </ScrollView>
       </KeyboardAvoidingView>
 
-      <Actions>
+      <Actions
+        style={{
+          ...(deviceHeight < contentHeight && styles.actionBorder),
+        }}
+      >
         <Button testID="swapButton" shelleyTheme title={strings.swapTitle} onPress={handleOnSwap} disabled={disabled} />
       </Actions>
     </View>
@@ -275,6 +289,8 @@ const styles = StyleSheet.create({
   actions: {
     paddingVertical: 16,
     paddingHorizontal: 16,
+  },
+  actionBorder: {
     borderTopWidth: 1,
     borderTopColor: COLORS.BORDER_GRAY,
   },
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/EditSlippage.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/EditSlippage.tsx
index 2558597e32..997df0ac7f 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/EditSlippage.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/EditSlippage.tsx
@@ -16,7 +16,7 @@ export const EditSlippage = () => {
       <ShowSlippageInfo />
 
       <View style={styles.row}>
-        <Text>{`${orderData.slippage} %`}</Text>
+        <Text style={styles.text}>{`${orderData.slippage}%`}</Text>
 
         <Spacer width={4} />
 
@@ -39,4 +39,8 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     alignItems: 'center',
   },
+  text: {
+    fontSize: 16,
+    fontFamily: 'Rubik',
+  },
 })
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx
index 9c0e79e5d4..e62e5afa0b 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx
@@ -138,10 +138,11 @@ export const EditSlippageScreen = () => {
               key={isInputEnabled ? 'enabled' : 'disabled'}
               selectTextOnFocus={isInputEnabled}
               autoFocus={isInputEnabled}
-              style={[!isInputEnabled && styles.disabledInput, styles.input]}
+              style={styles.input}
+              keyboardType="numeric"
             />
 
-            <Text style={[styles.percentLabel, isInputEnabled && styles.darkColor]}>%</Text>
+            <Text style={styles.percentLabel}>%</Text>
           </View>
 
           {isSelectedChoiceManual && !hasError && (
@@ -231,9 +232,7 @@ const styles = StyleSheet.create({
     color: COLORS.ERROR_TEXT_COLOR_DARK,
     fontFamily: 'Rubik-Regular',
   },
-  disabledInput: {
-    color: COLORS.TEXT_INPUT,
-  },
+
   disabledInputContainer: {
     backgroundColor: '#F0F3F5',
   },
@@ -248,25 +247,23 @@ const styles = StyleSheet.create({
     height: 24,
     padding: 0,
     fontSize: 16,
-    fontFamily: 'Rubik-Regular',
+    fontFamily: 'Rubik',
   },
   inputFocused: {
     borderColor: '#242838',
+    borderWidth: 2,
   },
   percentLabel: {
     lineHeight: 24,
-    fontFamily: 'Rubik-Regular',
+    fontFamily: 'Rubik',
     fontWeight: '400',
-    color: '#6B7384',
+    color: '#242838',
     position: 'absolute',
     padding: 16,
     fontSize: 16,
     right: 0,
     top: 0,
   },
-  darkColor: {
-    color: '#242838',
-  },
 })
 
 const validateSlippage = (text: string, format: NumberLocale) => {
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/ShowSlippageInfo.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/ShowSlippageInfo.tsx
index 9801e7d515..427da42f3c 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/ShowSlippageInfo.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/ShowSlippageInfo.tsx
@@ -33,8 +33,9 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   label: {
-    fontSize: 12,
+    fontSize: 16,
     color: COLORS.TEXT_INPUT,
+    fontFamily: 'Rubik',
   },
   sheetContent: {
     fontFamily: 'Rubik',
diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
index ba1b1d0ff4..dd18c118dc 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Select token",
     "file": "src/features/Swap/common/AmountCard/AmountCard.tsx",
     "start": {
-      "line": 124,
+      "line": 127,
       "column": 15,
-      "index": 3862
+      "index": 4030
     },
     "end": {
-      "line": 127,
+      "line": 130,
       "column": 3,
-      "index": 3945
+      "index": 4113
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Current Balance",
     "file": "src/features/Swap/common/AmountCard/AmountCard.tsx",
     "start": {
-      "line": 128,
+      "line": 131,
       "column": 18,
-      "index": 3965
+      "index": 4133
     },
     "end": {
-      "line": 131,
+      "line": 134,
       "column": 3,
-      "index": 4054
+      "index": 4222
     }
   }
 ]
\ No newline at end of file

From ce16074de6ce213a02c064b2e4b8653f577e6bca Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Wed, 1 Nov 2023 09:23:56 -0400
Subject: [PATCH 03/40] refactor: token list api source (#2860)

---
 .../src/components/AmountItem/AmountItem.tsx  | 11 +--
 .../src/features/Swap/SwapNavigator.tsx       |  4 +-
 .../src/features/Swap/common/helpers.ts       | 22 +++---
 .../SelectBuyTokenFromListScreen.tsx          | 51 ++++++------
 lerna.json                                    |  7 +-
 packages/openswap/src/api.ts                  | 11 ++-
 packages/openswap/src/config.ts               |  6 +-
 packages/openswap/src/index.ts                |  6 +-
 packages/openswap/src/token-pairs.spec.ts     | 79 +++++++++++++++++++
 packages/openswap/src/token-pairs.ts          | 25 ++++++
 packages/openswap/src/tokens.spec.ts          | 63 ++++-----------
 packages/openswap/src/tokens.ts               | 13 +--
 packages/openswap/src/types.ts                |  7 +-
 .../src/adapters/openswap-api/api.mocks.ts    | 67 +++++++++++++++-
 .../src/adapters/openswap-api/api.test.ts     | 58 ++++++++++++--
 .../swap/src/adapters/openswap-api/api.ts     | 11 ++-
 .../adapters/openswap-api/openswap.mocks.ts   | 78 +++++++++++++++++-
 .../swap/src/helpers/transformers.test.ts     | 38 ++++++++-
 packages/swap/src/helpers/transformers.ts     | 72 +++++++++++------
 packages/swap/src/index.ts                    |  3 +-
 packages/swap/src/manager.mocks.ts            | 32 ++++++--
 packages/swap/src/manager.test.ts             |  1 +
 packages/swap/src/manager.ts                  | 16 ++--
 ....test.tsx => useSwapTokensByPair.test.tsx} | 16 ++--
 ...yPairToken.tsx => useSwapTokensByPair.tsx} | 12 +--
 .../hooks/useSwapTokensOnlyVerified.test.tsx  | 51 ++++++++++++
 .../hooks/useSwapTokensOnlyVerified.tsx       | 27 +++++++
 packages/types/src/swap/api.ts                |  5 +-
 packages/types/src/swap/manager.ts            |  5 +-
 29 files changed, 610 insertions(+), 187 deletions(-)
 create mode 100644 packages/openswap/src/token-pairs.spec.ts
 create mode 100644 packages/openswap/src/token-pairs.ts
 rename packages/swap/src/translators/reactjs/hooks/{useSwapTokensByPairToken.test.tsx => useSwapTokensByPair.test.tsx} (70%)
 rename packages/swap/src/translators/reactjs/hooks/{useSwapTokensByPairToken.tsx => useSwapTokensByPair.tsx} (59%)
 create mode 100644 packages/swap/src/translators/reactjs/hooks/useSwapTokensOnlyVerified.test.tsx
 create mode 100644 packages/swap/src/translators/reactjs/hooks/useSwapTokensOnlyVerified.tsx

diff --git a/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx b/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx
index 2f5258c686..60fb652b9d 100644
--- a/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx
+++ b/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx
@@ -17,11 +17,10 @@ export type AmountItemProps = {
   isPrivacyOff?: boolean
   status?: string
   inWallet?: boolean
-  supply?: string
   variant?: 'swap'
 }
 
-export const AmountItem = ({isPrivacyOff, wallet, style, amount, inWallet, supply, variant}: AmountItemProps) => {
+export const AmountItem = ({isPrivacyOff, wallet, style, amount, inWallet, variant}: AmountItemProps) => {
   const {quantity, tokenId} = amount
   const tokenInfo = useTokenInfo({wallet, tokenId})
 
@@ -63,13 +62,15 @@ export const AmountItem = ({isPrivacyOff, wallet, style, amount, inWallet, suppl
       </Middle>
 
       <Right>
-        {tokenInfo.kind !== 'nft' && (
+        {tokenInfo.kind !== 'nft' && variant !== 'swap' && (
           <Text style={styles.quantity} testID="tokenAmountText">
-            {isPrivacyOff ? '**.*******' : variant === 'swap' ? `${supply}` : formattedQuantity}
+            {isPrivacyOff ? '**.*******' : formattedQuantity}
           </Text>
         )}
 
-        {isPrimary && <PairedBalance isPrivacyOff={isPrivacyOff} amount={{quantity, tokenId: tokenInfo.id}} />}
+        {isPrimary && variant !== 'swap' && (
+          <PairedBalance isPrivacyOff={isPrivacyOff} amount={{quantity, tokenId: tokenInfo.id}} />
+        )}
       </Right>
     </View>
   )
diff --git a/apps/wallet-mobile/src/features/Swap/SwapNavigator.tsx b/apps/wallet-mobile/src/features/Swap/SwapNavigator.tsx
index 3cbb0ffcbe..012b6c58af 100644
--- a/apps/wallet-mobile/src/features/Swap/SwapNavigator.tsx
+++ b/apps/wallet-mobile/src/features/Swap/SwapNavigator.tsx
@@ -1,5 +1,5 @@
 import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs'
-import {useSwap, useSwapTokensByPairToken} from '@yoroi/swap'
+import {useSwap, useSwapTokensOnlyVerified} from '@yoroi/swap'
 import React from 'react'
 import {StyleSheet} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
@@ -57,7 +57,7 @@ export const SwapTabNavigator = () => {
   }, [aggregatorTokenId, lpTokenHeld, lpTokenHeldChanged])
 
   // pre load swap tokens
-  const {refetch} = useSwapTokensByPairToken('', {suspense: false, enabled: false})
+  const {refetch} = useSwapTokensOnlyVerified({suspense: false, enabled: false})
   React.useEffect(() => {
     refetch()
   }, [refetch])
diff --git a/apps/wallet-mobile/src/features/Swap/common/helpers.ts b/apps/wallet-mobile/src/features/Swap/common/helpers.ts
index a10285e05f..5f25c3fca1 100644
--- a/apps/wallet-mobile/src/features/Swap/common/helpers.ts
+++ b/apps/wallet-mobile/src/features/Swap/common/helpers.ts
@@ -73,26 +73,22 @@ function containsOnlyValidChars(str?: string): boolean {
   return typeof str === 'string' && validCharsRegex.test(str)
 }
 
-export const sortTokensByName = (a: Balance.Token, b: Balance.Token, wallet: YoroiWallet) => {
-  const isValidNameA = containsOnlyValidChars(a.info.name)
-  const isValidNameB = containsOnlyValidChars(b.info.name)
-  const isValidTickerA = containsOnlyValidChars(a.info.ticker)
-  const isValidTickerB = containsOnlyValidChars(b.info.ticker)
+export const sortTokensByName = (a: Balance.TokenInfo, b: Balance.TokenInfo, wallet: YoroiWallet) => {
+  const isValidNameA = containsOnlyValidChars(a.name)
+  const isValidNameB = containsOnlyValidChars(b.name)
+  const isValidTickerA = containsOnlyValidChars(a.ticker)
+  const isValidTickerB = containsOnlyValidChars(b.ticker)
 
   const nameA =
-    a.info.ticker?.toLocaleLowerCase() && isValidTickerA
-      ? a.info.ticker?.toLocaleLowerCase()
-      : a.info.name.toLocaleLowerCase()
+    a.ticker?.toLocaleLowerCase() && isValidTickerA ? a.ticker?.toLocaleLowerCase() : a.name.toLocaleLowerCase()
 
   const nameB =
-    b.info.ticker?.toLocaleLowerCase() && isValidTickerB
-      ? b.info.ticker?.toLocaleLowerCase()
-      : b.info.name.toLocaleLowerCase()
+    b.ticker?.toLocaleLowerCase() && isValidTickerB ? b.ticker?.toLocaleLowerCase() : b.name.toLocaleLowerCase()
 
-  const isBPrimary = b.info.ticker === wallet.primaryTokenInfo.ticker
+  const isBPrimary = b.ticker === wallet.primaryTokenInfo.ticker
   if (isBPrimary) return 1
 
-  const isAPrimary = a.info.ticker === wallet.primaryTokenInfo.ticker
+  const isAPrimary = a.ticker === wallet.primaryTokenInfo.ticker
   if (isAPrimary) return -1
 
   if (!isValidNameA && isValidNameB) {
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
index 24b5cb1e75..75e3544c3b 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
@@ -1,5 +1,5 @@
 import {FlashList} from '@shopify/flash-list'
-import {useSwap, useSwapTokensByPairToken} from '@yoroi/swap'
+import {useSwap, useSwapTokensOnlyVerified} from '@yoroi/swap'
 import {Balance} from '@yoroi/types'
 import React from 'react'
 import {StyleSheet, TouchableOpacity, View} from 'react-native'
@@ -13,7 +13,7 @@ import {useSelectedWallet} from '../../../../../../../SelectedWallet'
 import {COLORS} from '../../../../../../../theme'
 import {YoroiWallet} from '../../../../../../../yoroi-wallets/cardano/types'
 import {useBalance, useBalances} from '../../../../../../../yoroi-wallets/hooks'
-import {Amounts, asQuantity, Quantities} from '../../../../../../../yoroi-wallets/utils'
+import {Amounts} from '../../../../../../../yoroi-wallets/utils'
 import {NoAssetFoundImage} from '../../../../../../Send/common/NoAssetFoundImage'
 import {Counter} from '../../../../../common/Counter/Counter'
 import {filterBySearch} from '../../../../../common/filterBySearch'
@@ -60,20 +60,20 @@ export const SelectBuyTokenFromListScreen = () => {
 const TokenList = () => {
   const strings = useStrings()
   const wallet = useSelectedWallet()
-  const {pairsByToken} = useSwapTokensByPairToken('')
+  const {onlyVerifiedTokens} = useSwapTokensOnlyVerified()
   const {search: assetSearchTerm} = useSearch()
   const balances = useBalances(wallet)
   const walletTokenIds = Amounts.toArray(balances).map(({tokenId}) => tokenId)
 
-  const tokens: Array<Balance.Token> = React.useMemo(() => {
-    if (pairsByToken === undefined) return []
-    return pairsByToken
-  }, [pairsByToken])
+  const tokenInfos: Array<Balance.TokenInfo> = React.useMemo(() => {
+    if (onlyVerifiedTokens === undefined) return []
+    return onlyVerifiedTokens
+  }, [onlyVerifiedTokens])
 
   const filteredTokenList = React.useMemo(() => {
     const filter = filterBySearch(assetSearchTerm)
-    return tokens.filter((token) => filter(token.info)).sort((a, b) => sortTokensByName(a, b, wallet))
-  }, [tokens, assetSearchTerm, wallet])
+    return tokenInfos.filter((tokenInfo) => filter(tokenInfo)).sort((a, b) => sortTokensByName(a, b, wallet))
+  }, [tokenInfos, assetSearchTerm, wallet])
 
   return (
     <View style={styles.list}>
@@ -83,8 +83,6 @@ const TokenList = () => {
 
           <View style={styles.labels}>
             <Text style={styles.label}>{strings.asset}</Text>
-
-            <Text style={styles.label}>{strings.volume}</Text>
           </View>
 
           <Spacer height={16} />
@@ -95,13 +93,13 @@ const TokenList = () => {
 
       <FlashList
         data={filteredTokenList}
-        renderItem={({item: token}: {item: Balance.Token}) => (
+        renderItem={({item: tokenInfo}: {item: Balance.TokenInfo}) => (
           <Boundary loading={{fallback: <AmountItemPlaceholder style={styles.item} />}}>
-            <SelectableToken token={token} wallet={wallet} walletTokenIds={walletTokenIds} />
+            <SelectableToken tokenInfo={tokenInfo} wallet={wallet} walletTokenIds={walletTokenIds} />
           </Boundary>
         )}
         bounces={false}
-        keyExtractor={({info: {id, name}}) => `${name}-${id}`}
+        keyExtractor={({id, name}) => `${name}-${id}`}
         testID="assetsList"
         estimatedItemSize={72}
         ListEmptyComponent={<EmptyList filteredTokensForList={filteredTokenList} />}
@@ -130,10 +128,11 @@ const TokenList = () => {
 type SelectableTokenProps = {
   wallet: YoroiWallet
   walletTokenIds: Array<string>
-  token: Balance.Token
+  tokenInfo: Balance.TokenInfo
 }
-const SelectableToken = ({wallet, token, walletTokenIds}: SelectableTokenProps) => {
-  const balanceAvailable = useBalance({wallet, tokenId: token.info.id})
+const SelectableToken = ({wallet, tokenInfo, walletTokenIds}: SelectableTokenProps) => {
+  const {id, name, ticker, group, decimals} = tokenInfo
+  const balanceAvailable = useBalance({wallet, tokenId: id})
   const {closeSearch} = useSearch()
   const {buyTokenInfoChanged, orderData} = useSwap()
   const {
@@ -143,17 +142,16 @@ const SelectableToken = ({wallet, token, walletTokenIds}: SelectableTokenProps)
   const navigateTo = useNavigateTo()
   const {track} = useMetrics()
 
-  const isDisabled = token.info.id === orderData.amounts.sell.tokenId && isSellTouched
-  const inUserWallet = walletTokenIds.includes(token.info.id)
-  const supplyFormatted = Quantities.format(asQuantity(token.supply?.total), token.info.decimals ?? 0)
+  const isDisabled = id === orderData.amounts.sell.tokenId && isSellTouched
+  const inUserWallet = walletTokenIds.includes(tokenInfo.id)
 
   const handleOnTokenSelection = () => {
     track.swapAssetToChanged({
-      to_asset: [{asset_name: token.info.name, asset_ticker: token.info.ticker, policy_id: token.info.group}],
+      to_asset: [{asset_name: name, asset_ticker: ticker, policy_id: group}],
     })
     buyTokenInfoChanged({
-      decimals: token.info.decimals ?? 0,
-      id: token.info.id,
+      decimals: decimals ?? 0,
+      id: id,
     })
     buyTouched()
     navigateTo.startSwap()
@@ -168,18 +166,17 @@ const SelectableToken = ({wallet, token, walletTokenIds}: SelectableTokenProps)
       disabled={isDisabled}
     >
       <AmountItem
-        amount={{tokenId: token.info.id, quantity: balanceAvailable}}
+        amount={{tokenId: id, quantity: balanceAvailable}}
         wallet={wallet}
-        status={token.status}
+        status="verified"
         inWallet={inUserWallet}
-        supply={supplyFormatted}
         variant="swap"
       />
     </TouchableOpacity>
   )
 }
 
-const EmptyList = ({filteredTokensForList}: {filteredTokensForList: Array<Balance.Token>}) => {
+const EmptyList = ({filteredTokensForList}: {filteredTokensForList: Array<Balance.TokenInfo>}) => {
   const {search: assetSearchTerm, visible: isSearching} = useSearch()
 
   if (isSearching && assetSearchTerm.length > 0 && filteredTokensForList.length === 0)
diff --git a/lerna.json b/lerna.json
index 140d2c6043..695b1e6b91 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,4 +1,9 @@
 {
   "npmClient": "yarn",
-  "version": "independent"
+  "version": "independent",
+  "command": {
+    "run": {
+      "ignore": ["e2e/*"]
+    }
+  }
 }
diff --git a/packages/openswap/src/api.ts b/packages/openswap/src/api.ts
index ed83aedd86..763e73a9bf 100644
--- a/packages/openswap/src/api.ts
+++ b/packages/openswap/src/api.ts
@@ -5,6 +5,7 @@ import {
   getCompletedOrders,
   getOrders, // returns all orders for a given stake key hash.
 } from './orders'
+import {getTokenPairs} from './token-pairs'
 import {getTokens} from './tokens'
 import {
   CancelOrderRequest,
@@ -95,13 +96,17 @@ export class OpenSwapApi {
     )
   }
 
-  public async getTokens({policyId = '', assetName = ''} = {}) {
-    const tokens = await getTokens(
+  public async getTokenPairs({policyId = '', assetName = ''} = {}) {
+    const tokenPairs = await getTokenPairs(
       {network: this.network, client: this.client},
       {policyId, assetName},
     )
 
-    return tokens
+    return tokenPairs
+  }
+
+  public async getTokens() {
+    return getTokens({network: this.network, client: this.client})
   }
 }
 
diff --git a/packages/openswap/src/config.ts b/packages/openswap/src/config.ts
index 1ad154a826..aabb9a6bc1 100644
--- a/packages/openswap/src/config.ts
+++ b/packages/openswap/src/config.ts
@@ -7,7 +7,8 @@ export const SWAP_API_ENDPOINTS = {
     getLiquidityPools: 'https://api.muesliswap.com/liquidity/pools',
     getOrders: 'https://onchain2.muesliswap.com/orders/all/',
     getCompletedOrders: 'https://api.muesliswap.com/orders/v2',
-    getTokens: 'https://api.muesliswap.com/list',
+    getTokenPairs: 'https://api.muesliswap.com/list',
+    getTokens: 'https://api.muesliswap.com/token-list',
     constructSwapDatum: 'https://aggregator.muesliswap.com/constructSwapDatum',
     cancelSwapTransaction:
       'https://aggregator.muesliswap.com/cancelSwapTransaction',
@@ -18,7 +19,8 @@ export const SWAP_API_ENDPOINTS = {
     getLiquidityPools: 'https://preprod.api.muesliswap.com/liquidity/pools',
     getOrders: 'https://preprod.pools.muesliswap.com/orders/all/',
     getCompletedOrders: 'https://api.muesliswap.com/orders/v2',
-    getTokens: 'https://preprod.api.muesliswap.com/list',
+    getTokenPairs: 'https://preprod.api.muesliswap.com/list',
+    getTokens: 'https://preprod.api.muesliswap.com/token-list',
     constructSwapDatum:
       'https://aggregator.muesliswap.com/constructTestnetSwapDatum',
     cancelSwapTransaction:
diff --git a/packages/openswap/src/index.ts b/packages/openswap/src/index.ts
index 1cef45a87f..1663abeab8 100644
--- a/packages/openswap/src/index.ts
+++ b/packages/openswap/src/index.ts
@@ -21,8 +21,10 @@ export namespace OpenSwap {
   export type LiquidityPoolResponse = Types.LiquidityPoolResponse
 
   // Tokens
-  export type Token = Types.Token
-  export type TokenResponse = Types.TokenResponse
+  export type TokenPair = Types.TokenPair
+  export type TokenInfo = Types.TokenInfo
+  export type TokenPairsResponse = Types.TokenPairsResponse
+  export type ListTokensResponse = Types.ListTokensResponse
   export type TokenAddress = Types.TokenAddress
 
   export type PriceAddress = Types.PriceAddress
diff --git a/packages/openswap/src/token-pairs.spec.ts b/packages/openswap/src/token-pairs.spec.ts
new file mode 100644
index 0000000000..9ce4b20a60
--- /dev/null
+++ b/packages/openswap/src/token-pairs.spec.ts
@@ -0,0 +1,79 @@
+import {expect, describe, it, vi, Mocked} from 'vitest'
+import {getTokenPairs} from './token-pairs'
+import {axiosClient} from './config'
+
+vi.mock('./config.ts')
+
+describe('SwapTokenPairsApi', () => {
+  it('should get all tokens based pairs', async () => {
+    const mockAxios = axiosClient as Mocked<typeof axiosClient>
+    mockAxios.get.mockImplementationOnce(() =>
+      Promise.resolve({status: 200, data: mockedGetTokenPairsResponse}),
+    )
+
+    const result = await getTokenPairs({network: 'mainnet', client: mockAxios})
+
+    expect(result).to.be.lengthOf(1)
+  })
+
+  it('should return empty list on preprod network', async () => {
+    const mockAxios = axiosClient as Mocked<typeof axiosClient>
+
+    const result = await getTokenPairs({network: 'preprod', client: mockAxios})
+
+    expect(result).to.be.empty
+  })
+
+  it('should throw error for invalid response', async () => {
+    const mockAxios = axiosClient as Mocked<typeof axiosClient>
+    mockAxios.get.mockImplementationOnce(() => Promise.resolve({status: 500}))
+    expect(() =>
+      getTokenPairs({network: 'mainnet', client: mockAxios}),
+    ).rejects.toThrow('Failed to fetch token pairs')
+  })
+})
+
+const mockedGetTokenPairsResponse = [
+  {
+    info: {
+      supply: {total: '1000000000000', circulating: null},
+      status: 'unverified',
+      image: 'ipfs://QmPzaykTy4yfutCtwv7nRUmgbQbA7euiThyy2i9fiFuDHX',
+      imageIpfsHash: 'QmPzaykTy4yfutCtwv7nRUmgbQbA7euiThyy2i9fiFuDHX',
+      symbol: 'ARGENT',
+      minting: {
+        type: 'time-lock-policy',
+        blockchain: 'cardano',
+        mintedBeforeSlotNumber: 91850718,
+      },
+      mediatype: 'image/png',
+      tokentype: 'token',
+      description: 'ARGENT Token',
+      totalsupply: 1000000000000,
+      address: {
+        policyId: 'c04f4200502a998e9eebafac0291a1f38008de3fe146d136946d8f4b',
+        name: '415247454e54',
+      },
+      decimalPlaces: 0,
+      categories: [],
+    },
+    price: {
+      volume: {base: 0, quote: 0},
+      volumeChange: {base: 0, quote: 0},
+      volumeTotal: {base: 0, quote: 0},
+      volumeAggregator: {},
+      price: 0,
+      askPrice: 0,
+      bidPrice: 0,
+      priceChange: {'24h': 0, '7d': 0},
+      quoteDecimalPlaces: 0,
+      baseDecimalPlaces: 6,
+      quoteAddress: {
+        policyId: 'c04f4200502a998e9eebafac0291a1f38008de3fe146d136946d8f4b',
+        name: '415247454e54',
+      },
+      baseAddress: {policyId: '', name: ''},
+      price10d: [],
+    },
+  },
+]
diff --git a/packages/openswap/src/token-pairs.ts b/packages/openswap/src/token-pairs.ts
new file mode 100644
index 0000000000..d6aaf46d2e
--- /dev/null
+++ b/packages/openswap/src/token-pairs.ts
@@ -0,0 +1,25 @@
+import {SWAP_API_ENDPOINTS} from './config'
+import type {ApiDeps, TokenPairsResponse} from './types'
+
+export async function getTokenPairs(
+  deps: ApiDeps,
+  {policyId = '', assetName = ''} = {},
+): Promise<TokenPairsResponse> {
+  const {network, client} = deps
+  if (network === 'preprod') return []
+
+  const apiUrl = SWAP_API_ENDPOINTS[network].getTokenPairs
+  const response = await client.get<TokenPairsResponse>('', {
+    baseURL: apiUrl,
+    params: {
+      'base-policy-id': policyId,
+      'base-tokenname': assetName,
+    },
+  })
+
+  if (response.status !== 200) {
+    throw new Error('Failed to fetch token pairs', {cause: response.data})
+  }
+
+  return response.data
+}
diff --git a/packages/openswap/src/tokens.spec.ts b/packages/openswap/src/tokens.spec.ts
index 8d0c91fe4c..638aebb6ce 100644
--- a/packages/openswap/src/tokens.spec.ts
+++ b/packages/openswap/src/tokens.spec.ts
@@ -8,7 +8,7 @@ describe('SwapTokensApi', () => {
   it('should get all supported tokens list', async () => {
     const mockAxios = axiosClient as Mocked<typeof axiosClient>
     mockAxios.get.mockImplementationOnce(() =>
-      Promise.resolve({status: 200, data: mockedGetTokensRes}),
+      Promise.resolve({status: 200, data: mockedGetTokensResponse}),
     )
 
     const result = await getTokens({network: 'mainnet', client: mockAxios})
@@ -16,14 +16,6 @@ describe('SwapTokensApi', () => {
     expect(result).to.be.lengthOf(1)
   })
 
-  it('should return empty list on preprod network', async () => {
-    const mockAxios = axiosClient as Mocked<typeof axiosClient>
-
-    const result = await getTokens({network: 'preprod', client: mockAxios})
-
-    expect(result).to.be.empty
-  })
-
   it('should throw error for invalid response', async () => {
     const mockAxios = axiosClient as Mocked<typeof axiosClient>
     mockAxios.get.mockImplementationOnce(() => Promise.resolve({status: 500}))
@@ -33,47 +25,22 @@ describe('SwapTokensApi', () => {
   })
 })
 
-const mockedGetTokensRes = [
+const mockedGetTokensResponse = [
   {
-    info: {
-      supply: {total: '1000000000000', circulating: null},
-      status: 'unverified',
-      image: 'ipfs://QmPzaykTy4yfutCtwv7nRUmgbQbA7euiThyy2i9fiFuDHX',
-      imageIpfsHash: 'QmPzaykTy4yfutCtwv7nRUmgbQbA7euiThyy2i9fiFuDHX',
-      symbol: 'ARGENT',
-      minting: {
-        type: 'time-lock-policy',
-        blockchain: 'cardano',
-        mintedBeforeSlotNumber: 91850718,
-      },
-      mediatype: 'image/png',
-      tokentype: 'token',
-      description: 'ARGENT Token',
-      totalsupply: 1000000000000,
-      address: {
-        policyId: 'c04f4200502a998e9eebafac0291a1f38008de3fe146d136946d8f4b',
-        name: '415247454e54',
-      },
-      decimalPlaces: 0,
-      categories: [],
+    supply: {
+      total: '10000000',
+      circulating: '6272565',
     },
-    price: {
-      volume: {base: 0, quote: 0},
-      volumeChange: {base: 0, quote: 0},
-      volumeTotal: {base: 0, quote: 0},
-      volumeAggregator: {},
-      price: 0,
-      askPrice: 0,
-      bidPrice: 0,
-      priceChange: {'24h': 0, '7d': 0},
-      quoteDecimalPlaces: 0,
-      baseDecimalPlaces: 6,
-      quoteAddress: {
-        policyId: 'c04f4200502a998e9eebafac0291a1f38008de3fe146d136946d8f4b',
-        name: '415247454e54',
-      },
-      baseAddress: {policyId: '', name: ''},
-      price10d: [],
+    status: 'verified',
+    website: 'https://ada.muesliswap.com/',
+    symbol: 'MILK',
+    decimalPlaces: 0,
+    image: 'https://static.muesliswap.com/images/tokens/MILK.png',
+    description: 'MILK is the utility token powering the MuesliSwap ecosystem.',
+    address: {
+      policyId: '8a1cfae21368b8bebbbed9800fec304e95cce39a2a57dc35e2e3ebaa',
+      name: '4d494c4b',
     },
+    categories: ['1', '2'],
   },
 ]
diff --git a/packages/openswap/src/tokens.ts b/packages/openswap/src/tokens.ts
index 750783007d..e1fc16909c 100644
--- a/packages/openswap/src/tokens.ts
+++ b/packages/openswap/src/tokens.ts
@@ -1,20 +1,13 @@
 import {SWAP_API_ENDPOINTS} from './config'
-import type {ApiDeps, TokenResponse} from './types'
+import type {ApiDeps, ListTokensResponse} from './types'
 
-export async function getTokens(
-  deps: ApiDeps,
-  {policyId = '', assetName = ''} = {},
-): Promise<TokenResponse> {
+export async function getTokens(deps: ApiDeps): Promise<ListTokensResponse> {
   const {network, client} = deps
   if (network === 'preprod') return []
 
   const apiUrl = SWAP_API_ENDPOINTS[network].getTokens
-  const response = await client.get<TokenResponse>('', {
+  const response = await client.get<ListTokensResponse>('', {
     baseURL: apiUrl,
-    params: {
-      'base-policy-id': policyId,
-      'base-tokenname': assetName,
-    },
   })
 
   if (response.status !== 200) {
diff --git a/packages/openswap/src/types.ts b/packages/openswap/src/types.ts
index dc5e7b7fc8..39c32e6edb 100644
--- a/packages/openswap/src/types.ts
+++ b/packages/openswap/src/types.ts
@@ -119,7 +119,7 @@ export type PoolPair = {
 }
 export type PoolPairResponse = PoolPair[]
 
-export type Token = {
+export type TokenPair = {
   info: {
     supply: {
       total: string // total circulating supply of the token, without decimals.
@@ -159,7 +159,10 @@ export type Token = {
     price10d: number[] //float, prices of this tokens averaged for the last 10 days, in chronological order i.e.oldest first.
   }
 }
-export type TokenResponse = Token[]
+export type TokenPairsResponse = TokenPair[]
+
+export type TokenInfo = Omit<TokenPair['info'], 'sign'>
+export type ListTokensResponse = TokenInfo[]
 
 export type TokenAddress =
   | {
diff --git a/packages/swap/src/adapters/openswap-api/api.mocks.ts b/packages/swap/src/adapters/openswap-api/api.mocks.ts
index 29b8166095..f501c1eb98 100644
--- a/packages/swap/src/adapters/openswap-api/api.mocks.ts
+++ b/packages/swap/src/adapters/openswap-api/api.mocks.ts
@@ -125,7 +125,7 @@ const getPools: Swap.Pool[] = [
   },
 ]
 
-const getTokens: Balance.Token[] = [
+const getTokenPairs: Balance.Token[] = [
   {
     info: {
       id: '1c1e38cfcc815d2015dbda6bee668b2e707ee3f9d038d96668fcf63c.4567677363617065436c75624561737465725a656e6e79',
@@ -263,10 +263,75 @@ const getTokens: Balance.Token[] = [
   },
 ]
 
+const getTokens: Balance.TokenInfo[] = [
+  {
+    id: '1c1e38cfcc815d2015dbda6bee668b2e707ee3f9d038d96668fcf63c.4567677363617065436c75624561737465725a656e6e79',
+    group: '1c1e38cfcc815d2015dbda6bee668b2e707ee3f9d038d96668fcf63c',
+    fingerprint: 'asset126v2sm79r8uxvk4ju64mr6srxrvm2x75fpg6w3',
+    name: 'EggscapeClubEasterZenny',
+    decimals: 0,
+    description: 'Eggscape Club Utility Token',
+    image: 'ipfs://QmNYibJoiTWRiMmWn4yXwvoakEPgq9WmaukmRXHF1VGbAU',
+    kind: 'ft',
+    symbol: undefined,
+    icon: undefined,
+    ticker: 'EZY',
+
+    metadatas: {},
+  },
+  {
+    id: 'cdaaee586376139ee8c3cc4061623968810d177ca5c300afb890b48a.43415354',
+    group: 'cdaaee586376139ee8c3cc4061623968810d177ca5c300afb890b48a',
+    fingerprint: 'asset1yv4fx867hueqt98aqvjw5ncjymz8k3ah8zawcg',
+    name: 'CAST',
+    decimals: 0,
+    description: 'Utility Token for Carda Station Metaverse',
+    image:
+      'https://tokens.muesliswap.com/static/img/tokens/cdaaee586376139ee8c3cc4061623968810d177ca5c300afb890b48a.43415354.png',
+    kind: 'ft',
+    symbol: undefined,
+    icon: undefined,
+    ticker: 'CAST',
+    metadatas: {},
+  },
+  {
+    id: 'cd5b9dd91319edbb19477ad00cbef673a221e70a17ef043951fc6786.52656465656d61626c65',
+    group: 'cd5b9dd91319edbb19477ad00cbef673a221e70a17ef043951fc6786',
+    fingerprint: 'asset18qw75gcdldlu7q5xh8fjsemgvwffzkg8hatq3s',
+    name: 'Redeemable',
+    decimals: 4,
+    description:
+      'The fiat-backed stablecoin issued by Shareslake. Powering the fully stable branch of Cardano.',
+    image:
+      'https://tokens.muesliswap.com/static/img/tokens/cd5b9dd91319edbb19477ad00cbef673a221e70a17ef043951fc6786.52656465656d61626c65.png',
+    kind: 'ft',
+    symbol: undefined,
+    icon: undefined,
+    ticker: 'RUSD',
+    metadatas: {},
+  },
+  {
+    id: '2d420236ffaada336c21e3f4520b799f6e246d8618f2fc89a4907da6.4564756c6164646572546f6b656e',
+    group: '2d420236ffaada336c21e3f4520b799f6e246d8618f2fc89a4907da6',
+    fingerprint: 'asset1ny2ehvl20cp5y7mmn5qq332sgdncdmsgrcqlwh',
+    name: 'EduladderToken',
+    decimals: 6,
+    description: 'Proof Of Contribution.',
+    image:
+      'https://tokens.muesliswap.com/static/img/tokens/2d420236ffaada336c21e3f4520b799f6e246d8618f2fc89a4907da6.4564756c6164646572546f6b656e.png',
+    kind: 'ft',
+    symbol: undefined,
+    icon: undefined,
+    ticker: 'ELADR',
+    metadatas: {},
+  },
+]
+
 export const apiMocks = {
   getOpenOrders,
   getCompletedOrders,
   createOrderData,
   getPools,
+  getTokenPairs,
   getTokens,
 }
diff --git a/packages/swap/src/adapters/openswap-api/api.test.ts b/packages/swap/src/adapters/openswap-api/api.test.ts
index e009a5c066..ede5c3d460 100644
--- a/packages/swap/src/adapters/openswap-api/api.test.ts
+++ b/packages/swap/src/adapters/openswap-api/api.test.ts
@@ -20,6 +20,7 @@ describe('swapApiMaker', () => {
       createOrder: jest.fn(),
       getOrders: jest.fn(),
       getTokens: jest.fn(),
+      getTokenPairs: jest.fn(),
       getCompletedOrders: jest.fn(),
       getLiquidityPools: jest.fn(),
       getPoolsPair: jest.fn(),
@@ -217,6 +218,53 @@ describe('swapApiMaker', () => {
     })
   })
 
+  describe('getTokenPairs', () => {
+    it('mainnet', async () => {
+      mockOpenSwapApi.getTokenPairs = jest
+        .fn()
+        .mockResolvedValue(openswapMocks.getTokenPairs)
+      const api = swapApiMaker(
+        {
+          isMainnet: true,
+          stakingKey,
+          primaryTokenId,
+          supportedProviders,
+        },
+        {
+          openswap: mockOpenSwapApi,
+        },
+      )
+
+      const result = await api.getTokenPairs('')
+
+      expect(mockOpenSwapApi.getTokenPairs).toHaveBeenCalledTimes(1)
+      expect(result).toEqual<Array<Balance.Token>>(apiMocks.getTokenPairs)
+    })
+
+    it('preprod (mocked)', async () => {
+      mockOpenSwapApi.getTokenPairs = jest
+        .fn()
+        .mockResolvedValue(openswapMocks.getTokenPairs)
+
+      const api = swapApiMaker(
+        {
+          isMainnet: false,
+          stakingKey,
+          primaryTokenId,
+          supportedProviders,
+        },
+        {
+          openswap: mockOpenSwapApi,
+        },
+      )
+
+      const result = await api.getTokenPairs('')
+
+      expect(result).toBeDefined()
+      expect(mockOpenSwapApi.getTokenPairs).not.toHaveBeenCalled()
+    })
+  })
+
   describe('getTokens', () => {
     it('mainnet', async () => {
       mockOpenSwapApi.getTokens = jest
@@ -234,13 +282,13 @@ describe('swapApiMaker', () => {
         },
       )
 
-      const result = await api.getTokens('')
+      const result = await api.getTokens()
 
       expect(mockOpenSwapApi.getTokens).toHaveBeenCalledTimes(1)
-      expect(result).toEqual<Array<Balance.Token>>(apiMocks.getTokens)
+      expect(result).toEqual<Array<Balance.TokenInfo>>(apiMocks.getTokens)
     })
 
-    it('preprod (mocked)', async () => {
+    it('preprod', async () => {
       mockOpenSwapApi.getTokens = jest
         .fn()
         .mockResolvedValue(openswapMocks.getTokens)
@@ -257,10 +305,10 @@ describe('swapApiMaker', () => {
         },
       )
 
-      const result = await api.getTokens('')
+      const result = await api.getTokens()
 
       expect(result).toBeDefined()
-      expect(mockOpenSwapApi.getTokens).not.toHaveBeenCalled()
+      expect(mockOpenSwapApi.getTokenPairs).not.toHaveBeenCalled()
     })
   })
 
diff --git a/packages/swap/src/adapters/openswap-api/api.ts b/packages/swap/src/adapters/openswap-api/api.ts
index 76e6f5b32b..8f7920dda4 100644
--- a/packages/swap/src/adapters/openswap-api/api.ts
+++ b/packages/swap/src/adapters/openswap-api/api.ts
@@ -69,13 +69,17 @@ export const swapApiMaker = (
       })
       .then((response) => response)
 
-  const getTokens: Swap.Api['getTokens'] = async (token) =>
+  const getTokenPairs: Swap.Api['getTokenPairs'] = async (token) =>
     !isMainnet
-      ? apiMocks.getTokens // preprod doesn't return any tokens
+      ? apiMocks.getTokenPairs // preprod doesn't return any tokens
       : api
-          .getTokens(transformers.asOpenswapTokenId(token))
+          .getTokenPairs(transformers.asOpenswapTokenId(token))
           .then(transformers.asYoroiBalanceTokens)
 
+  const getTokens: Swap.Api['getTokens'] = async () => {
+    return api.getTokens().then(transformers.asYoroiBalanceTokenInfos)
+  }
+
   const getPools: Swap.Api['getPools'] = async ({
     tokenA,
     tokenB,
@@ -114,6 +118,7 @@ export const swapApiMaker = (
     cancelOrder,
     createOrder,
     getTokens,
+    getTokenPairs,
     getPools,
     getCompletedOrders,
     stakingKey,
diff --git a/packages/swap/src/adapters/openswap-api/openswap.mocks.ts b/packages/swap/src/adapters/openswap-api/openswap.mocks.ts
index b5582b56d3..b623aacfa4 100644
--- a/packages/swap/src/adapters/openswap-api/openswap.mocks.ts
+++ b/packages/swap/src/adapters/openswap-api/openswap.mocks.ts
@@ -1,6 +1,81 @@
 import {OpenSwap} from '@yoroi/openswap'
 
-const getTokens: OpenSwap.Token[] = [
+const getTokens: OpenSwap.ListTokensResponse = [
+  {
+    supply: {
+      total: '10000000',
+      circulating: '300',
+    },
+    status: 'verified',
+    website: 'https://eggscape.io/',
+    image: 'ipfs://QmNYibJoiTWRiMmWn4yXwvoakEPgq9WmaukmRXHF1VGbAU',
+    description: 'Eggscape Club Utility Token',
+    address: {
+      policyId: '1c1e38cfcc815d2015dbda6bee668b2e707ee3f9d038d96668fcf63c',
+      name: '4567677363617065436c75624561737465725a656e6e79',
+    },
+    symbol: 'EZY',
+    decimalPlaces: 0,
+    categories: [],
+  },
+  {
+    supply: {
+      total: '1500000000',
+      circulating: null,
+    },
+    status: 'verified',
+    symbol: 'CAST',
+    decimalPlaces: 0,
+    image:
+      'https://tokens.muesliswap.com/static/img/tokens/cdaaee586376139ee8c3cc4061623968810d177ca5c300afb890b48a.43415354.png',
+    description: 'Utility Token for Carda Station Metaverse',
+    address: {
+      policyId: 'cdaaee586376139ee8c3cc4061623968810d177ca5c300afb890b48a',
+      name: '43415354',
+    },
+    website: 'https://cardastation.com',
+    categories: [],
+  },
+  {
+    supply: {
+      total: '387017195',
+      circulating: null,
+    },
+    status: 'verified',
+    website: 'https://www.shareslake.com',
+    description:
+      'The fiat-backed stablecoin issued by Shareslake. Powering the fully stable branch of Cardano.',
+    image:
+      'https://tokens.muesliswap.com/static/img/tokens/cd5b9dd91319edbb19477ad00cbef673a221e70a17ef043951fc6786.52656465656d61626c65.png',
+    symbol: 'RUSD',
+    decimalPlaces: 4,
+    address: {
+      policyId: 'cd5b9dd91319edbb19477ad00cbef673a221e70a17ef043951fc6786',
+      name: '52656465656d61626c65',
+    },
+    categories: [],
+  },
+  {
+    supply: {
+      total: '45000000003000000',
+      circulating: null,
+    },
+    status: 'verified',
+    website: 'https://eduladder.com',
+    symbol: 'ELADR',
+    decimalPlaces: 6,
+    image:
+      'https://tokens.muesliswap.com/static/img/tokens/2d420236ffaada336c21e3f4520b799f6e246d8618f2fc89a4907da6.4564756c6164646572546f6b656e.png',
+    description: 'Proof Of Contribution.',
+    address: {
+      policyId: '2d420236ffaada336c21e3f4520b799f6e246d8618f2fc89a4907da6',
+      name: '4564756c6164646572546f6b656e',
+    },
+    categories: [],
+  },
+]
+
+const getTokenPairs: OpenSwap.TokenPairsResponse = [
   {
     info: {
       supply: {
@@ -573,6 +648,7 @@ const getPrice: OpenSwap.PriceResponse = {
 }
 
 export const openswapMocks = {
+  getTokenPairs,
   getTokens,
   getPrice,
   getCompletedOrders,
diff --git a/packages/swap/src/helpers/transformers.test.ts b/packages/swap/src/helpers/transformers.test.ts
index c383c2ac58..85acb1b423 100644
--- a/packages/swap/src/helpers/transformers.test.ts
+++ b/packages/swap/src/helpers/transformers.test.ts
@@ -241,16 +241,46 @@ describe('asYoroiPool', () => {
 
 describe('asYoroiBalanceToken', () => {
   it('success', () => {
-    const result = transformers.asYoroiBalanceToken(openswapMocks.getTokens[0]!)
+    const result = transformers.asYoroiBalanceToken(
+      openswapMocks.getTokenPairs[0]!,
+    )
 
-    expect(result).toEqual<Balance.Token>(apiMocks.getTokens[0]!)
+    expect(result).toEqual<Balance.Token>(apiMocks.getTokenPairs[0]!)
   })
 })
 
 describe('asYoroiBalanceTokens', () => {
   it('success', () => {
-    const result = transformers.asYoroiBalanceTokens(openswapMocks.getTokens)
+    const result = transformers.asYoroiBalanceTokens(
+      openswapMocks.getTokenPairs,
+    )
+
+    expect(result).toEqual<Array<Balance.Token>>(apiMocks.getTokenPairs)
+  })
+})
+
+describe('asYoroiBalanceTokenInfo', () => {
+  it('success', () => {
+    const result = transformers.asYoroiBalanceTokenInfo(
+      openswapMocks.getTokens[0]!,
+    )
+
+    expect(result).toEqual<Balance.TokenInfo>(apiMocks.getTokens[0]!)
+  })
+})
+
+describe('asYoroiBalanceTokenInfos', () => {
+  it('success', () => {
+    const result = transformers.asYoroiBalanceTokenInfos(
+      openswapMocks.getTokens,
+    )
+
+    expect(result).toEqual<Array<Balance.TokenInfo>>(apiMocks.getTokens)
+  })
+
+  it('success (empty)', () => {
+    const result = transformers.asYoroiBalanceTokenInfos([])
 
-    expect(result).toEqual<Array<Balance.Token>>(apiMocks.getTokens)
+    expect(result).toEqual<Array<Balance.TokenInfo>>([])
   })
 })
diff --git a/packages/swap/src/helpers/transformers.ts b/packages/swap/src/helpers/transformers.ts
index 9626bd3224..a13071fe41 100644
--- a/packages/swap/src/helpers/transformers.ts
+++ b/packages/swap/src/helpers/transformers.ts
@@ -93,27 +93,11 @@ export const transformersMaker = (
   }
 
   const asYoroiBalanceToken = (
-    openswapToken: OpenSwap.Token,
+    openswapTokenPair: OpenSwap.TokenPair,
   ): Balance.Token => {
-    const {info, price} = openswapToken
+    const {info, price} = openswapTokenPair
     const balanceToken: Balance.Token = {
-      info: {
-        id: asYoroiTokenId(info.address),
-        group: info.address.policyId,
-        fingerprint: asTokenFingerprint({
-          policyId: info.address.policyId,
-          assetNameHex: info.address.name,
-        }),
-        name: asUtf8(info.address.name),
-        decimals: info.decimalPlaces,
-        description: info.description,
-        image: info.image,
-        kind: 'ft',
-        symbol: info?.sign,
-        icon: undefined,
-        ticker: info.symbol,
-        metadatas: {},
-      },
+      info: asYoroiBalanceTokenInfo(info),
       price: {
         ...price,
       },
@@ -125,6 +109,39 @@ export const transformersMaker = (
     return balanceToken
   }
 
+  const asYoroiBalanceTokenInfo = (
+    openswapToken: OpenSwap.TokenPair['info'],
+  ): Balance.TokenInfo => {
+    const tokenInfo: Balance.TokenInfo = {
+      id: asYoroiTokenId(openswapToken.address),
+      group: openswapToken.address.policyId,
+      fingerprint: asTokenFingerprint({
+        policyId: openswapToken.address.policyId,
+        assetNameHex: openswapToken.address.name,
+      }),
+      name: asUtf8(openswapToken.address.name),
+      decimals: openswapToken.decimalPlaces,
+      description: openswapToken.description,
+      image: openswapToken.image,
+      kind: 'ft',
+      icon: undefined,
+      ticker: openswapToken.symbol,
+      symbol: openswapToken.sign,
+      metadatas: {},
+    }
+    return tokenInfo
+  }
+
+  const asYoroiBalanceTokenInfos = (
+    openswapTokens: OpenSwap.ListTokensResponse,
+  ): Balance.TokenInfo[] => {
+    if (openswapTokens.length === 0) return []
+    // filters should go into manager, but since we strip out the status is here for now
+    return openswapTokens
+      .filter((token) => token.status === 'verified')
+      .map(asYoroiBalanceTokenInfo)
+  }
+
   const asYoroiPool = (
     openswapLiquidityPool: OpenSwap.LiquidityPool,
   ): Swap.Pool | null => {
@@ -206,22 +223,27 @@ export const transformersMaker = (
   }
 
   const asYoroiBalanceTokens = (
-    openswapTokens: OpenSwap.Token[],
-  ): Balance.Token[] => openswapTokens.map(asYoroiBalanceToken)
+    openswapTokenPairs: OpenSwap.TokenPair[],
+  ): Balance.Token[] => openswapTokenPairs.map(asYoroiBalanceToken)
 
   return {
     asOpenswapTokenId,
     asOpenswapPriceTokenAddress,
     asOpenswapAmount,
 
-    asYoroiTokenId,
-    asYoroiAmount,
-    asYoroiBalanceToken,
-    asYoroiBalanceTokens,
     asYoroiCompletedOrder,
     asYoroiOpenOrder,
+
     asYoroiPool,
     asYoroiPools,
+
+    asYoroiTokenId,
+    asYoroiBalanceToken,
+    asYoroiBalanceTokens,
+    asYoroiBalanceTokenInfo,
+    asYoroiBalanceTokenInfos,
+
+    asYoroiAmount,
   }
 }
 
diff --git a/packages/swap/src/index.ts b/packages/swap/src/index.ts
index 1df3791fbb..a267f2ba7f 100644
--- a/packages/swap/src/index.ts
+++ b/packages/swap/src/index.ts
@@ -39,7 +39,8 @@ export {useSwapOrdersByStatusOpen} from './translators/reactjs/hooks/useSwapOrde
 export {useSwapPoolsByPair} from './translators/reactjs/hooks/useSwapPoolsByPair'
 export {useSwapSetSlippage} from './translators/reactjs/hooks/useSwapSetSlippage'
 export {useSwapSlippage} from './translators/reactjs/hooks/useSwapSlippage'
-export {useSwapTokensByPairToken} from './translators/reactjs/hooks/useSwapTokensByPairToken'
+export {useSwapTokensByPair} from './translators/reactjs/hooks/useSwapTokensByPair'
+export {useSwapTokensOnlyVerified} from './translators/reactjs/hooks/useSwapTokensOnlyVerified'
 export {useSwap} from './translators/reactjs/hooks/useSwap'
 export {supportedProviders, milkTokenId} from './translators/constants'
 
diff --git a/packages/swap/src/manager.mocks.ts b/packages/swap/src/manager.mocks.ts
index b265e3720e..cbc9aaa243 100644
--- a/packages/swap/src/manager.mocks.ts
+++ b/packages/swap/src/manager.mocks.ts
@@ -26,7 +26,8 @@ const listOrdersByStatusOpenResponse: Swap.OpenOrderResponse =
 const listOrdersByStatusCompletedResponse: Swap.CompletedOrderResponse =
   apiMocks.getCompletedOrders
 const listPoolsByPairResponse: Swap.PoolResponse = apiMocks.getPools
-const listPairsByTokenResponse: Balance.Token[] = apiMocks.getTokens
+const listTokensByPairResponse: Balance.Token[] = apiMocks.getTokenPairs
+const listOnlyVerifiedTokensResponse: Balance.TokenInfo[] = apiMocks.getTokens
 
 // API FUNCTIONS
 const createOrder = {
@@ -92,10 +93,21 @@ const getPrice = {
   },
 }
 
+const getTokenPairs = {
+  success: () => Promise.resolve(listTokensByPairResponse),
+  delayed: (timeout?: number) =>
+    delayedResponse({data: listTokensByPairResponse, timeout}),
+  empty: () => Promise.resolve([]),
+  loading,
+  error: {
+    unknown: unknownError,
+  },
+}
+
 const getTokens = {
-  success: () => Promise.resolve(listPairsByTokenResponse),
+  success: () => Promise.resolve(listOnlyVerifiedTokensResponse),
   delayed: (timeout?: number) =>
-    delayedResponse({data: listPairsByTokenResponse, timeout}),
+    delayedResponse({data: listOnlyVerifiedTokensResponse, timeout}),
   empty: () => Promise.resolve([]),
   loading,
   error: {
@@ -144,7 +156,8 @@ export const swapManagerMocks = {
   listOrdersByStatusOpenResponse,
   listOrdersByStatusCompletedResponse,
   listPoolsByPairResponse,
-  listPairsByTokenResponse,
+  listTokensByPairResponse,
+  listOnlyVerifiedTokensResponse,
 
   slippageResponse,
 
@@ -154,6 +167,7 @@ export const swapManagerMocks = {
   getOpenOrders,
   getCompletedOrders,
   getPools,
+  getTokenPairs,
   getTokens,
 
   slippage,
@@ -174,9 +188,10 @@ export const mockSwapManager: Swap.Manager = {
       byPair: getPools.success,
     },
   },
-  pairs: {
+  tokens: {
     list: {
-      byToken: getTokens.success,
+      byPair: getTokenPairs.success,
+      onlyVerified: getTokens.success,
     },
   },
   price: {
@@ -209,9 +224,10 @@ export const mockSwapManagerDefault: Swap.Manager = {
   price: {
     byPair: getPrice.error.unknown,
   },
-  pairs: {
+  tokens: {
     list: {
-      byToken: getTokens.error.unknown,
+      byPair: getTokenPairs.error.unknown,
+      onlyVerified: getTokens.error.unknown,
     },
   },
   slippage: slippage.error.unknown,
diff --git a/packages/swap/src/manager.test.ts b/packages/swap/src/manager.test.ts
index 91b369e59e..794e75b590 100644
--- a/packages/swap/src/manager.test.ts
+++ b/packages/swap/src/manager.test.ts
@@ -22,6 +22,7 @@ describe('swapManagerMaker', () => {
     getPrice: jest.fn(),
     getPools: jest.fn(),
     getTokens: jest.fn(),
+    getTokenPairs: jest.fn(),
     getCompletedOrders: jest.fn(),
     primaryTokenId: '',
     stakingKey: 'someStakingKey',
diff --git a/packages/swap/src/manager.ts b/packages/swap/src/manager.ts
index a98fbdf0b6..cf5c92b830 100644
--- a/packages/swap/src/manager.ts
+++ b/packages/swap/src/manager.ts
@@ -19,6 +19,7 @@ export const swapManagerMaker = ({
     getPools,
     getOpenOrders,
     getCompletedOrders,
+    getTokenPairs,
     getTokens,
     cancelOrder,
     createOrder,
@@ -36,12 +37,6 @@ export const swapManagerMaker = ({
     } as const,
   }
 
-  const pairs = {
-    list: {
-      byToken: getTokens,
-    } as const,
-  }
-
   const price = {
     byPair: getPrice,
   } as const
@@ -52,12 +47,19 @@ export const swapManagerMaker = ({
     } as const,
   }
 
+  const tokens = {
+    list: {
+      byPair: getTokenPairs,
+      onlyVerified: getTokens,
+    } as const,
+  }
+
   return {
     price,
     clearStorage,
     slippage,
     order,
-    pairs,
+    tokens,
     pools,
     primaryTokenId,
     stakingKey,
diff --git a/packages/swap/src/translators/reactjs/hooks/useSwapTokensByPairToken.test.tsx b/packages/swap/src/translators/reactjs/hooks/useSwapTokensByPair.test.tsx
similarity index 70%
rename from packages/swap/src/translators/reactjs/hooks/useSwapTokensByPairToken.test.tsx
rename to packages/swap/src/translators/reactjs/hooks/useSwapTokensByPair.test.tsx
index 92d3569c29..4e9f376ab5 100644
--- a/packages/swap/src/translators/reactjs/hooks/useSwapTokensByPairToken.test.tsx
+++ b/packages/swap/src/translators/reactjs/hooks/useSwapTokensByPair.test.tsx
@@ -6,9 +6,9 @@ import {render, waitFor} from '@testing-library/react-native'
 import {queryClientFixture} from '../../../fixtures/query-client'
 import {mockSwapManager, swapManagerMocks} from '../../../manager.mocks'
 import {wrapperManagerFixture} from '../../../fixtures/manager-wrapper'
-import {useSwapTokensByPairToken} from './useSwapTokensByPairToken'
+import {useSwapTokensByPair} from './useSwapTokensByPair'
 
-describe('useSwapTokensByPairToken', () => {
+describe('useSwapTokensByPair', () => {
   let queryClient: QueryClient
 
   beforeEach(() => {
@@ -22,7 +22,7 @@ describe('useSwapTokensByPairToken', () => {
 
   it('success', async () => {
     const TestPairListToken = () => {
-      const tokens = useSwapTokensByPairToken('tokenIdBase')
+      const tokens = useSwapTokensByPair('tokenIdBase')
       return (
         <View>
           <Text testID="tokens">{JSON.stringify(tokens.data)}</Text>
@@ -30,9 +30,9 @@ describe('useSwapTokensByPairToken', () => {
       )
     }
 
-    mockSwapManager.pairs.list.byToken = jest
+    mockSwapManager.tokens.list.byPair = jest
       .fn()
-      .mockResolvedValue(swapManagerMocks.listPairsByTokenResponse)
+      .mockResolvedValue(swapManagerMocks.listTokensByPairResponse)
     const wrapper = wrapperManagerFixture({
       queryClient,
       swapManager: mockSwapManager,
@@ -44,10 +44,10 @@ describe('useSwapTokensByPairToken', () => {
     })
 
     expect(getByTestId('tokens').props.children).toEqual(
-      JSON.stringify(swapManagerMocks.listPairsByTokenResponse),
+      JSON.stringify(swapManagerMocks.listTokensByPairResponse),
     )
-    expect(mockSwapManager.pairs.list.byToken).toHaveBeenCalled()
-    expect(mockSwapManager.pairs.list.byToken).toHaveBeenCalledWith(
+    expect(mockSwapManager.tokens.list.byPair).toHaveBeenCalled()
+    expect(mockSwapManager.tokens.list.byPair).toHaveBeenCalledWith(
       'tokenIdBase',
     )
   })
diff --git a/packages/swap/src/translators/reactjs/hooks/useSwapTokensByPairToken.tsx b/packages/swap/src/translators/reactjs/hooks/useSwapTokensByPair.tsx
similarity index 59%
rename from packages/swap/src/translators/reactjs/hooks/useSwapTokensByPairToken.tsx
rename to packages/swap/src/translators/reactjs/hooks/useSwapTokensByPair.tsx
index a55754961e..40b473bc99 100644
--- a/packages/swap/src/translators/reactjs/hooks/useSwapTokensByPairToken.tsx
+++ b/packages/swap/src/translators/reactjs/hooks/useSwapTokensByPair.tsx
@@ -3,26 +3,26 @@ import {UseQueryOptions, useQuery} from 'react-query'
 
 import {useSwap} from './useSwap'
 
-export const useSwapTokensByPairToken = (
+export const useSwapTokensByPair = (
   tokenIdBase: Balance.Token['info']['id'],
   options?: UseQueryOptions<
     Balance.Token[],
     Error,
     Balance.Token[],
-    ['useSwapTokensByPairToken', string]
+    ['useSwapTokensByPair', string]
   >,
 ) => {
-  const {pairs} = useSwap()
+  const {tokens} = useSwap()
 
   const query = useQuery({
     suspense: true,
-    queryKey: ['useSwapTokensByPairToken', tokenIdBase],
+    queryKey: ['useSwapTokensByPair', tokenIdBase],
     ...options,
-    queryFn: () => pairs.list.byToken(tokenIdBase),
+    queryFn: () => tokens.list.byPair(tokenIdBase),
   })
 
   return {
     ...query,
-    pairsByToken: query.data,
+    tokensByPair: query.data,
   }
 }
diff --git a/packages/swap/src/translators/reactjs/hooks/useSwapTokensOnlyVerified.test.tsx b/packages/swap/src/translators/reactjs/hooks/useSwapTokensOnlyVerified.test.tsx
new file mode 100644
index 0000000000..f359bbd7eb
--- /dev/null
+++ b/packages/swap/src/translators/reactjs/hooks/useSwapTokensOnlyVerified.test.tsx
@@ -0,0 +1,51 @@
+import * as React from 'react'
+import {QueryClient} from 'react-query'
+import {Text, View} from 'react-native'
+import {render, waitFor} from '@testing-library/react-native'
+
+import {queryClientFixture} from '../../../fixtures/query-client'
+import {mockSwapManager, swapManagerMocks} from '../../../manager.mocks'
+import {wrapperManagerFixture} from '../../../fixtures/manager-wrapper'
+import {useSwapTokensOnlyVerified} from './useSwapTokensOnlyVerified'
+
+describe('useSwapTokensOnlyVerified', () => {
+  let queryClient: QueryClient
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+    queryClient = queryClientFixture()
+  })
+
+  afterEach(() => {
+    queryClient.clear()
+  })
+
+  it('success', async () => {
+    const TestListToken = () => {
+      const tokens = useSwapTokensOnlyVerified()
+      return (
+        <View>
+          <Text testID="tokens">{JSON.stringify(tokens.data)}</Text>
+        </View>
+      )
+    }
+
+    mockSwapManager.tokens.list.onlyVerified = jest
+      .fn()
+      .mockResolvedValue(swapManagerMocks.listOnlyVerifiedTokensResponse)
+    const wrapper = wrapperManagerFixture({
+      queryClient,
+      swapManager: mockSwapManager,
+    })
+    const {getByTestId} = render(<TestListToken />, {wrapper})
+
+    await waitFor(() => {
+      expect(getByTestId('tokens')).toBeDefined()
+    })
+
+    expect(getByTestId('tokens').props.children).toEqual(
+      JSON.stringify(swapManagerMocks.listOnlyVerifiedTokensResponse),
+    )
+    expect(mockSwapManager.tokens.list.onlyVerified).toHaveBeenCalled()
+  })
+})
diff --git a/packages/swap/src/translators/reactjs/hooks/useSwapTokensOnlyVerified.tsx b/packages/swap/src/translators/reactjs/hooks/useSwapTokensOnlyVerified.tsx
new file mode 100644
index 0000000000..3deced4d91
--- /dev/null
+++ b/packages/swap/src/translators/reactjs/hooks/useSwapTokensOnlyVerified.tsx
@@ -0,0 +1,27 @@
+import {Balance} from '@yoroi/types'
+import {UseQueryOptions, useQuery} from 'react-query'
+
+import {useSwap} from './useSwap'
+
+export const useSwapTokensOnlyVerified = (
+  options?: UseQueryOptions<
+    Balance.TokenInfo[],
+    Error,
+    Balance.TokenInfo[],
+    ['useSwapTokensOnlyVerified']
+  >,
+) => {
+  const {tokens} = useSwap()
+
+  const query = useQuery({
+    suspense: true,
+    queryKey: ['useSwapTokensOnlyVerified'],
+    ...options,
+    queryFn: () => tokens.list.onlyVerified(),
+  })
+
+  return {
+    ...query,
+    onlyVerifiedTokens: query.data,
+  }
+}
diff --git a/packages/types/src/swap/api.ts b/packages/types/src/swap/api.ts
index 6c60cb71e2..1534c0a2c9 100644
--- a/packages/types/src/swap/api.ts
+++ b/packages/types/src/swap/api.ts
@@ -18,7 +18,10 @@ export interface SwapApi {
     tokenB: BalanceToken['info']['id']
     providers?: ReadonlyArray<SwapPoolProvider>
   }): Promise<SwapPool[]>
-  getTokens(tokenIdBase: BalanceToken['info']['id']): Promise<BalanceToken[]>
+  getTokenPairs(
+    tokenIdBase: BalanceToken['info']['id'],
+  ): Promise<BalanceToken[]>
+  getTokens(): Promise<BalanceToken['info'][]>
   getPrice(args: {
     baseToken: BalanceToken['info']['id']
     quoteToken: BalanceToken['info']['id']
diff --git a/packages/types/src/swap/manager.ts b/packages/types/src/swap/manager.ts
index e47e6f53e7..2078f00c0c 100644
--- a/packages/types/src/swap/manager.ts
+++ b/packages/types/src/swap/manager.ts
@@ -16,9 +16,10 @@ export type SwapManager = Readonly<{
       byStatusCompleted: SwapApi['getCompletedOrders']
     }
   }
-  pairs: {
+  tokens: {
     list: {
-      byToken: SwapApi['getTokens']
+      onlyVerified: SwapApi['getTokens']
+      byPair: SwapApi['getTokenPairs']
     }
   }
   price: {

From 9608dbb9a8174bb33eb1124e63f3da5dcf0fadfe Mon Sep 17 00:00:00 2001
From: Michal <miso.szorad@gmail.com>
Date: Wed, 1 Nov 2023 17:11:16 +0100
Subject: [PATCH 04/40] fix(swap): Show slippage warning when minReceived is 0
 (#2862)

---
 .../.storybook/storybook.requires.js          |   1 +
 .../src/features/Swap/common/strings.ts       |  16 +
 .../ConfirmTxScreen/ConfirmTxScreen.tsx       |  11 +-
 .../ShowSubmittedTxScreen.stories.tsx         |  18 +-
 .../CreateOrder/CreateOrder.tsx               |  19 +
 .../SlippageWarning.stories.tsx               |  37 +
 .../SlippageWarning/SlippageWarning.tsx       | 120 +++
 .../CreateOrder/SlippageWarning/index.tsx     |   1 +
 .../wallet-mobile/src/i18n/locales/en-US.json |   3 +
 .../Swap/common/AmountCard/AmountCard.json    |  16 +-
 .../src/features/Swap/common/strings.json     | 869 +++++++++---------
 11 files changed, 687 insertions(+), 424 deletions(-)
 create mode 100644 apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.stories.tsx
 create mode 100644 apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.tsx
 create mode 100644 apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/index.tsx

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index 07ae7929df..787265e14f 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -159,6 +159,7 @@ const getStories = () => {
     "./src/features/Swap/useCases/StartSwapScreen/CreateOrder/ShowTokenActions/ShowTokenActions.stories.tsx": require("../src/features/Swap/useCases/StartSwapScreen/CreateOrder/ShowTokenActions/ShowTokenActions.stories.tsx"),
     "./src/features/Swap/useCases/StartSwapScreen/CreateOrder/ShowTokenActions/SwitchTokens.stories.tsx": require("../src/features/Swap/useCases/StartSwapScreen/CreateOrder/ShowTokenActions/SwitchTokens.stories.tsx"),
     "./src/features/Swap/useCases/StartSwapScreen/CreateOrder/ShowTokenActions/TopTokenActions.stories.tsx": require("../src/features/Swap/useCases/StartSwapScreen/CreateOrder/ShowTokenActions/TopTokenActions.stories.tsx"),
+    "./src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.stories.tsx": require("../src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.stories.tsx"),
     "./src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.stories.tsx": require("../src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.stories.tsx"),
     "./src/features/Swap/useCases/StartSwapScreen/ListOrders/ListOrders.stories.tsx": require("../src/features/Swap/useCases/StartSwapScreen/ListOrders/ListOrders.stories.tsx"),
     "./src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.stories.tsx": require("../src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.stories.tsx"),
diff --git a/apps/wallet-mobile/src/features/Swap/common/strings.ts b/apps/wallet-mobile/src/features/Swap/common/strings.ts
index 91cac0e136..9fa44a49c1 100644
--- a/apps/wallet-mobile/src/features/Swap/common/strings.ts
+++ b/apps/wallet-mobile/src/features/Swap/common/strings.ts
@@ -128,6 +128,9 @@ export const useStrings = () => {
     ledgerGeneralConnectionError: intl.formatMessage(ledgerMessages.connectionError),
     ledgerUserError: intl.formatMessage(ledgerMessages.connectionError),
     ledgerAdaAppNeedsToBeOpenError: intl.formatMessage(ledgerMessages.appOpened),
+    slippageWarningTitle: intl.formatMessage(messages.slippageWarningTitle),
+    slippageWarningText: intl.formatMessage(messages.slippageWarningText),
+    slippageWarningYourSlippage: intl.formatMessage(messages.slippageWarningYourSlippage),
   }
 }
 
@@ -555,4 +558,17 @@ export const messages = defineMessages({
     id: 'global.ledgerMessages.continueOnLedger',
     defaultMessage: '!!!Continue on Ledger',
   },
+  slippageWarningTitle: {
+    id: 'swap.slippage.slippageWarningTitle',
+    defaultMessage: '!!!Slippage Warning',
+  },
+  slippageWarningText: {
+    id: 'swap.slippage.slippageWarningText',
+    defaultMessage:
+      '!!!Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.',
+  },
+  slippageWarningYourSlippage: {
+    id: 'swap.slippage.yourSlippage',
+    defaultMessage: '!!!Your slippage tolerance',
+  },
 })
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.tsx
index 702053ff75..59df280370 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.tsx
@@ -12,6 +12,7 @@ import {COLORS} from '../../../../theme'
 import {useAuthOsWithEasyConfirmation} from '../../../../yoroi-wallets/auth'
 import {useSignAndSubmitTx, useTokenInfo} from '../../../../yoroi-wallets/hooks'
 import {YoroiSignedTx} from '../../../../yoroi-wallets/types'
+import {Quantities} from '../../../../yoroi-wallets/utils'
 import {useNavigateTo} from '../../common/navigation'
 import {useStrings} from '../../common/strings'
 import {ConfirmTx} from './ConfirmTx'
@@ -35,6 +36,13 @@ export const ConfirmTxScreen = () => {
     tokenId: orderData.amounts.buy.tokenId,
   })
 
+  const minReceived = Quantities.denominated(
+    orderData.selectedPoolCalculation?.buyAmountWithSlippage?.quantity ?? Quantities.zero,
+    buyTokenInfo.decimals ?? 0,
+  )
+
+  const couldReceiveNoAssets = Quantities.isZero(minReceived)
+
   const {authWithOs, isLoading: authenticating} = useAuthOsWithEasyConfirmation(
     {id: wallet.id},
     {onSuccess: (rootKey) => signAndSubmitTx({unsignedTx, rootKey})},
@@ -77,6 +85,7 @@ export const ConfirmTxScreen = () => {
   )
 
   const txIsLoading = authenticating || processingTx
+  const isButtonDisabled = txIsLoading || couldReceiveNoAssets
 
   return (
     <SafeAreaView style={styles.container} edges={['left', 'right', 'bottom']}>
@@ -84,7 +93,7 @@ export const ConfirmTxScreen = () => {
 
       <Actions>
         <Button
-          disabled={txIsLoading}
+          disabled={isButtonDisabled}
           testID="swapButton"
           shelleyTheme
           title={strings.confirm}
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.stories.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.stories.tsx
index c25e9d2e51..621282c90b 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.stories.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.stories.tsx
@@ -1,8 +1,20 @@
 import {storiesOf} from '@storybook/react-native'
+import {mockSwapManager, SwapProvider} from '@yoroi/swap'
 import React from 'react'
+import {StyleSheet, View} from 'react-native'
 
+import {SelectedWalletProvider} from '../../../../../SelectedWallet'
+import {mocks as walletMocks} from '../../../../../yoroi-wallets/mocks'
 import {ShowSubmittedTxScreen} from './ShowSubmittedTxScreen'
 
-storiesOf('Submitted Tx Screen', module).add('initial', () => {
-  return <ShowSubmittedTxScreen />
-})
+storiesOf('Submitted Tx Screen', module)
+  .addDecorator((getStory) => (
+    <SelectedWalletProvider wallet={walletMocks.wallet}>
+      <SwapProvider swapManager={mockSwapManager}>
+        <View style={{...StyleSheet.absoluteFillObject}}>{getStory()}</View>
+      </SwapProvider>
+    </SelectedWalletProvider>
+  ))
+  .add('initial', () => {
+    return <ShowSubmittedTxScreen />
+  })
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx
index d65bb44134..2c656a6715 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx
@@ -28,6 +28,7 @@ import {EditSlippage} from './EditSlippage/EditSlippage'
 import {LimitPriceWarning} from './LimitPriceWarning/LimitPriceWarning'
 import {ShowTokenActions} from './ShowTokenActions/ShowTokenActions'
 import {TopTokenActions} from './ShowTokenActions/TopTokenActions'
+import {SlippageWarning} from './SlippageWarning'
 
 const LIMIT_PRICE_WARNING_THRESHOLD = 0.1 // 10%
 const BOTTOM_ACTION_SECTION = 180
@@ -215,6 +216,24 @@ export const CreateOrder = () => {
       }
     }
 
+    const minReceived = Quantities.denominated(
+      orderData.selectedPoolCalculation.buyAmountWithSlippage.quantity,
+      buyTokenInfo.decimals ?? 0,
+    )
+
+    if (Quantities.isZero(minReceived)) {
+      openModal(
+        strings.slippageWarningTitle,
+        <SlippageWarning
+          onSubmit={createUnsignedSwapTx}
+          slippage={orderData.slippage}
+          ticker={buyTokenInfo.ticker ?? buyTokenInfo.name ?? ''}
+        />,
+        300,
+      )
+      return
+    }
+
     createUnsignedSwapTx()
   }
 
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.stories.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.stories.tsx
new file mode 100644
index 0000000000..f6f0d8649d
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.stories.tsx
@@ -0,0 +1,37 @@
+import {storiesOf} from '@storybook/react-native'
+import {mockSwapManager, SwapProvider} from '@yoroi/swap'
+import React from 'react'
+import {Button, StyleSheet, View} from 'react-native'
+
+import {useModal} from '../../../../../../components'
+import {useStrings} from '../../../../../../features/Swap/common/strings'
+import {SelectedWalletProvider} from '../../../../../../SelectedWallet'
+import {mocks as walletMocks} from '../../../../../../yoroi-wallets/mocks'
+import {SlippageWarning} from './SlippageWarning'
+
+storiesOf('Swap Slippage Tolerance Warning', module)
+  .addDecorator((getStory) => (
+    <SelectedWalletProvider wallet={walletMocks.wallet}>
+      <SwapProvider swapManager={mockSwapManager}>
+        <View style={{...StyleSheet.absoluteFillObject}}>{getStory()}</View>
+      </SwapProvider>
+    </SelectedWalletProvider>
+  ))
+  .add('Initial', () => {
+    const {openModal, content, closeModal} = useModal()
+    const strings = useStrings()
+
+    return (
+      <Button
+        title="Open Modal"
+        onPress={() => {
+          content !== undefined
+            ? closeModal()
+            : openModal(
+                strings.slippageWarningTitle,
+                <SlippageWarning slippage={10} onSubmit={closeModal} ticker="MILK" />,
+              )
+        }}
+      />
+    )
+  })
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.tsx
new file mode 100644
index 0000000000..721e012c06
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.tsx
@@ -0,0 +1,120 @@
+import React from 'react'
+import {StyleSheet, Text, View} from 'react-native'
+
+import {Button, Spacer, useModal} from '../../../../../../components'
+import {useStrings} from '../../../../common/strings'
+
+export interface Props {
+  onSubmit: () => void
+  slippage: number
+  ticker: string
+}
+
+export const SlippageWarning = ({onSubmit, slippage, ticker}: Props) => {
+  const strings = useStrings()
+  const {closeModal} = useModal()
+
+  const slippageTolerance = `${slippage}%`
+  const minReceived = `0 ${ticker}`
+
+  return (
+    <View style={styles.container}>
+      <View>
+        <Text style={styles.description}>{strings.slippageWarningText}</Text>
+
+        <Spacer height={16} />
+
+        <View style={styles.table}>
+          <View style={styles.row}>
+            <Text style={styles.label}>{strings.slippageWarningYourSlippage}</Text>
+
+            <View style={styles.textWrapper}>
+              <Text style={styles.value}>{slippageTolerance}</Text>
+            </View>
+          </View>
+
+          <View style={styles.row}>
+            <Text style={styles.label}>{strings.swapMinReceivedTitle}</Text>
+
+            <View style={styles.textWrapper}>
+              <Text style={styles.value}>{minReceived}</Text>
+            </View>
+          </View>
+        </View>
+      </View>
+
+      <Spacer fill />
+
+      <View style={styles.buttonsWrapper}>
+        <Button
+          testID="swapCancelButton"
+          outlineShelley
+          title={strings.limitPriceWarningBack}
+          onPress={closeModal}
+          containerStyle={styles.buttonContainer}
+        />
+
+        <Button
+          testID="swapConfirmButton"
+          shelleyTheme
+          title={strings.limitPriceWarningConfirm}
+          onPress={onSubmit}
+          containerStyle={styles.buttonContainer}
+        />
+      </View>
+    </View>
+  )
+}
+
+const styles = StyleSheet.create({
+  buttonContainer: {
+    flex: 1,
+  },
+  buttonsWrapper: {
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    flexDirection: 'row',
+    gap: 16,
+  },
+  container: {
+    flex: 1,
+    justifyContent: 'space-between',
+  },
+  label: {
+    fontSize: 16,
+    color: '#6B7384',
+    lineHeight: 24,
+    fontFamily: 'Rubik-Regular',
+  },
+  value: {
+    fontSize: 16,
+    color: '#000000',
+    lineHeight: 24,
+    fontFamily: 'Rubik-Regular',
+    textAlign: 'right',
+  },
+  textWrapper: {
+    flexDirection: 'row',
+    justifyContent: 'flex-end',
+    alignItems: 'flex-end',
+    flex: 1,
+    flexWrap: 'wrap',
+    gap: 4,
+  },
+  table: {
+    flexDirection: 'column',
+    gap: 8,
+  },
+  row: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    gap: 10,
+  },
+  description: {
+    fontFamily: 'Rubik',
+    fontWeight: '400',
+    fontSize: 16,
+    lineHeight: 24,
+    color: '#242838',
+  },
+})
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/index.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/index.tsx
new file mode 100644
index 0000000000..87c4886304
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/index.tsx
@@ -0,0 +1 @@
+export {SlippageWarning} from './SlippageWarning'
diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json
index fe9c97fc2e..fe86ca505e 100644
--- a/apps/wallet-mobile/src/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/i18n/locales/en-US.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Copied",
diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
index dd18c118dc..d127348e65 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Select token",
     "file": "src/features/Swap/common/AmountCard/AmountCard.tsx",
     "start": {
-      "line": 127,
+      "line": 128,
       "column": 15,
-      "index": 4030
+      "index": 4075
     },
     "end": {
-      "line": 130,
+      "line": 131,
       "column": 3,
-      "index": 4113
+      "index": 4158
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Current Balance",
     "file": "src/features/Swap/common/AmountCard/AmountCard.tsx",
     "start": {
-      "line": 131,
+      "line": 132,
       "column": 18,
-      "index": 4133
+      "index": 4178
     },
     "end": {
-      "line": 134,
+      "line": 135,
       "column": 3,
-      "index": 4222
+      "index": 4267
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
index 81c858e8e3..067b23bf0d 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Incorrect password.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 137,
+      "line": 140,
       "column": 24,
-      "index": 8813
+      "index": 9056
     },
     "end": {
-      "line": 140,
+      "line": 143,
       "column": 3,
-      "index": 8922
+      "index": 9165
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 141,
+      "line": 144,
       "column": 13,
-      "index": 8937
+      "index": 9180
     },
     "end": {
-      "line": 144,
+      "line": 147,
       "column": 3,
-      "index": 9010
+      "index": 9253
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Token swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 145,
+      "line": 148,
       "column": 13,
-      "index": 9025
+      "index": 9268
     },
     "end": {
-      "line": 148,
+      "line": 151,
       "column": 3,
-      "index": 9107
+      "index": 9350
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 149,
+      "line": 152,
       "column": 13,
-      "index": 9122
+      "index": 9365
     },
     "end": {
-      "line": 152,
+      "line": 155,
       "column": 3,
-      "index": 9201
+      "index": 9444
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Market Button",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 153,
+      "line": 156,
       "column": 16,
-      "index": 9219
+      "index": 9462
     },
     "end": {
-      "line": 156,
+      "line": 159,
       "column": 3,
-      "index": 9304
+      "index": 9547
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Limit",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 157,
+      "line": 160,
       "column": 15,
-      "index": 9321
+      "index": 9564
     },
     "end": {
-      "line": 160,
+      "line": 163,
       "column": 3,
-      "index": 9397
+      "index": 9640
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Swap from",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 161,
+      "line": 164,
       "column": 12,
-      "index": 9411
+      "index": 9654
     },
     "end": {
-      "line": 164,
+      "line": 167,
       "column": 3,
-      "index": 9488
+      "index": 9731
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Swap to",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 165,
+      "line": 168,
       "column": 10,
-      "index": 9500
+      "index": 9743
     },
     "end": {
-      "line": 168,
+      "line": 171,
       "column": 3,
-      "index": 9573
+      "index": 9816
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Current Balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 169,
+      "line": 172,
       "column": 18,
-      "index": 9593
+      "index": 9836
     },
     "end": {
-      "line": 172,
+      "line": 175,
       "column": 3,
-      "index": 9682
+      "index": 9925
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 173,
+      "line": 176,
       "column": 11,
-      "index": 9695
+      "index": 9938
     },
     "end": {
-      "line": 176,
+      "line": 179,
       "column": 3,
-      "index": 9769
+      "index": 10012
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Select Token",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 177,
+      "line": 180,
       "column": 15,
-      "index": 9786
+      "index": 10029
     },
     "end": {
-      "line": 180,
+      "line": 183,
       "column": 3,
-      "index": 9869
+      "index": 10112
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Market Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 181,
+      "line": 184,
       "column": 15,
-      "index": 9886
+      "index": 10129
     },
     "end": {
-      "line": 184,
+      "line": 187,
       "column": 3,
-      "index": 9969
+      "index": 10212
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Limit Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 185,
+      "line": 188,
       "column": 14,
-      "index": 9985
+      "index": 10228
     },
     "end": {
-      "line": 188,
+      "line": 191,
       "column": 3,
-      "index": 10066
+      "index": 10309
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Slippage Tolerance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 189,
+      "line": 192,
       "column": 21,
-      "index": 10089
+      "index": 10332
     },
     "end": {
-      "line": 192,
+      "line": 195,
       "column": 3,
-      "index": 10184
+      "index": 10427
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!Slippage must be a number between 0 and 75 and have up to 1 decimal",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 193,
+      "line": 196,
       "column": 26,
-      "index": 10212
+      "index": 10455
     },
     "end": {
-      "line": 196,
+      "line": 199,
       "column": 3,
-      "index": 10361
+      "index": 10604
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!Slippage Tolerance Info",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 197,
+      "line": 200,
       "column": 25,
-      "index": 10388
+      "index": 10631
     },
     "end": {
-      "line": 200,
+      "line": 203,
       "column": 3,
-      "index": 10492
+      "index": 10735
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!Verified by {pool}",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 201,
+      "line": 204,
       "column": 14,
-      "index": 10508
+      "index": 10751
     },
     "end": {
-      "line": 204,
+      "line": 207,
       "column": 3,
-      "index": 10596
+      "index": 10839
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!This asset is in my portfolio",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 205,
+      "line": 208,
       "column": 12,
-      "index": 10610
+      "index": 10853
     },
     "end": {
-      "line": 208,
+      "line": 211,
       "column": 3,
-      "index": 10707
+      "index": 10950
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!Slippage tolerance is set as a percentage of the total swap value.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 209,
+      "line": 212,
       "column": 16,
-      "index": 10725
+      "index": 10968
     },
     "end": {
-      "line": 212,
+      "line": 215,
       "column": 3,
-      "index": 10863
+      "index": 11106
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!(auto)",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 213,
+      "line": 216,
       "column": 12,
-      "index": 10877
+      "index": 11120
     },
     "end": {
-      "line": 216,
+      "line": 219,
       "column": 3,
-      "index": 10951
+      "index": 11194
     }
   },
   {
@@ -304,14 +304,14 @@
     "defaultMessage": "!!!change dex",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 217,
+      "line": 220,
       "column": 14,
-      "index": 10967
+      "index": 11210
     },
     "end": {
-      "line": 220,
+      "line": 223,
       "column": 3,
-      "index": 11047
+      "index": 11290
     }
   },
   {
@@ -319,14 +319,14 @@
     "defaultMessage": "!!!Min-ADA is the minimum ADA amount required to be contained when holding or sending Cardano native assets.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 221,
+      "line": 224,
       "column": 14,
-      "index": 11063
+      "index": 11306
     },
     "end": {
-      "line": 225,
+      "line": 228,
       "column": 3,
-      "index": 11244
+      "index": 11487
     }
   },
   {
@@ -334,14 +334,14 @@
     "defaultMessage": "!!!Min ADA",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 226,
+      "line": 229,
       "column": 19,
-      "index": 11265
+      "index": 11508
     },
     "end": {
-      "line": 229,
+      "line": 232,
       "column": 3,
-      "index": 11347
+      "index": 11590
     }
   },
   {
@@ -349,14 +349,14 @@
     "defaultMessage": "!!!Swap fees include the following:\n • Matchmaker Fee\n • Frontend Fee\n • Liquidity Provider Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 230,
+      "line": 233,
       "column": 12,
-      "index": 11361
+      "index": 11604
     },
     "end": {
-      "line": 233,
+      "line": 236,
       "column": 3,
-      "index": 11524
+      "index": 11767
     }
   },
   {
@@ -364,14 +364,14 @@
     "defaultMessage": "!!!Fees",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 234,
+      "line": 237,
       "column": 17,
-      "index": 11543
+      "index": 11786
     },
     "end": {
-      "line": 237,
+      "line": 240,
       "column": 3,
-      "index": 11620
+      "index": 11863
     }
   },
   {
@@ -379,14 +379,14 @@
     "defaultMessage": "!!!Liquidity provider fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 238,
+      "line": 241,
       "column": 20,
-      "index": 11642
+      "index": 11885
     },
     "end": {
-      "line": 241,
+      "line": 244,
       "column": 3,
-      "index": 11740
+      "index": 11983
     }
   },
   {
@@ -394,14 +394,14 @@
     "defaultMessage": "!!!Liq. prov. fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 242,
+      "line": 245,
       "column": 18,
-      "index": 11760
+      "index": 12003
     },
     "end": {
-      "line": 245,
+      "line": 248,
       "column": 3,
-      "index": 11848
+      "index": 12091
     }
   },
   {
@@ -409,14 +409,14 @@
     "defaultMessage": "!!!Liquidity provider fee is a fixed {fee}% operational fee from the whole transaction volume, that is taken to support DEX “liquidity” allowing traders to buy and sell assets on the decentralized Cardano network.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 246,
+      "line": 249,
       "column": 24,
-      "index": 11874
+      "index": 12117
     },
     "end": {
-      "line": 250,
+      "line": 253,
       "column": 3,
-      "index": 12170
+      "index": 12413
     }
   },
   {
@@ -424,14 +424,14 @@
     "defaultMessage": "!!!Minimum amount of assets you can get because of the slippage tolerance.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 251,
+      "line": 254,
       "column": 19,
-      "index": 12191
+      "index": 12434
     },
     "end": {
-      "line": 254,
+      "line": 257,
       "column": 3,
-      "index": 12337
+      "index": 12580
     }
   },
   {
@@ -439,14 +439,14 @@
     "defaultMessage": "!!!Min Received",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 255,
+      "line": 258,
       "column": 24,
-      "index": 12363
+      "index": 12606
     },
     "end": {
-      "line": 258,
+      "line": 261,
       "column": 3,
-      "index": 12455
+      "index": 12698
     }
   },
   {
@@ -454,14 +454,14 @@
     "defaultMessage": "!!!Enter a value from 0% to 75%. You can also enter up to 1 decimal",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 259,
+      "line": 262,
       "column": 17,
-      "index": 12474
+      "index": 12717
     },
     "end": {
-      "line": 262,
+      "line": 265,
       "column": 3,
-      "index": 12611
+      "index": 12854
     }
   },
   {
@@ -469,14 +469,14 @@
     "defaultMessage": "!!!{pool} verification",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 263,
+      "line": 266,
       "column": 20,
-      "index": 12633
+      "index": 12876
     },
     "end": {
-      "line": 266,
+      "line": 269,
       "column": 3,
-      "index": 12728
+      "index": 12971
     }
   },
   {
@@ -484,14 +484,14 @@
     "defaultMessage": "!!!Volume, 24h",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 267,
+      "line": 270,
       "column": 10,
-      "index": 12740
+      "index": 12983
     },
     "end": {
-      "line": 270,
+      "line": 273,
       "column": 3,
-      "index": 12817
+      "index": 13060
     }
   },
   {
@@ -499,14 +499,14 @@
     "defaultMessage": "!!!Cardano projects that list their own tokens can apply for an additional {pool} verification. This verification is a manual validation that {pool} team performs with the help of Cardano Foundation.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 271,
+      "line": 274,
       "column": 24,
-      "index": 12843
+      "index": 13086
     },
     "end": {
-      "line": 275,
+      "line": 278,
       "column": 3,
-      "index": 13125
+      "index": 13368
     }
   },
   {
@@ -514,14 +514,14 @@
     "defaultMessage": "!!! Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 276,
+      "line": 279,
       "column": 9,
-      "index": 13136
+      "index": 13379
     },
     "end": {
-      "line": 279,
+      "line": 282,
       "column": 3,
-      "index": 13198
+      "index": 13441
     }
   },
   {
@@ -529,14 +529,14 @@
     "defaultMessage": "!!!No assets found for this pair",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 280,
+      "line": 283,
       "column": 17,
-      "index": 13217
+      "index": 13460
     },
     "end": {
-      "line": 283,
+      "line": 286,
       "column": 3,
-      "index": 13319
+      "index": 13562
     }
   },
   {
@@ -544,14 +544,14 @@
     "defaultMessage": "!!!No assets found for \"{search}\"",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 284,
+      "line": 287,
       "column": 20,
-      "index": 13341
+      "index": 13584
     },
     "end": {
-      "line": 287,
+      "line": 290,
       "column": 3,
-      "index": 13447
+      "index": 13690
     }
   },
   {
@@ -559,14 +559,14 @@
     "defaultMessage": "!!!Each verified tokens gets",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 288,
+      "line": 291,
       "column": 21,
-      "index": 13470
+      "index": 13713
     },
     "end": {
-      "line": 291,
+      "line": 294,
       "column": 3,
-      "index": 13572
+      "index": 13815
     }
   },
   {
@@ -574,14 +574,14 @@
     "defaultMessage": "!!!verified badge",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 292,
+      "line": 295,
       "column": 17,
-      "index": 13591
+      "index": 13834
     },
     "end": {
-      "line": 295,
+      "line": 298,
       "column": 3,
-      "index": 13678
+      "index": 13921
     }
   },
   {
@@ -589,14 +589,14 @@
     "defaultMessage": "!!!Open orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 296,
+      "line": 299,
       "column": 14,
-      "index": 13694
+      "index": 13937
     },
     "end": {
-      "line": 299,
+      "line": 302,
       "column": 3,
-      "index": 13775
+      "index": 14018
     }
   },
   {
@@ -604,14 +604,14 @@
     "defaultMessage": "!!!Completed orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 300,
+      "line": 303,
       "column": 19,
-      "index": 13796
+      "index": 14039
     },
     "end": {
-      "line": 303,
+      "line": 306,
       "column": 3,
-      "index": 13887
+      "index": 14130
     }
   },
   {
@@ -619,14 +619,14 @@
     "defaultMessage": "!!!TVL",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 304,
+      "line": 307,
       "column": 7,
-      "index": 13896
+      "index": 14139
     },
     "end": {
-      "line": 307,
+      "line": 310,
       "column": 3,
-      "index": 13962
+      "index": 14205
     }
   },
   {
@@ -634,14 +634,14 @@
     "defaultMessage": "!!! Dex Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 308,
+      "line": 311,
       "column": 11,
-      "index": 13975
+      "index": 14218
     },
     "end": {
-      "line": 311,
+      "line": 314,
       "column": 3,
-      "index": 14050
+      "index": 14293
     }
   },
   {
@@ -649,14 +649,14 @@
     "defaultMessage": "!!! Batcher Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 312,
+      "line": 315,
       "column": 14,
-      "index": 14066
+      "index": 14309
     },
     "end": {
-      "line": 315,
+      "line": 318,
       "column": 3,
-      "index": 14148
+      "index": 14391
     }
   },
   {
@@ -664,14 +664,14 @@
     "defaultMessage": "!!!Limit price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 316,
+      "line": 319,
       "column": 26,
-      "index": 14176
+      "index": 14419
     },
     "end": {
-      "line": 319,
+      "line": 322,
       "column": 3,
-      "index": 14269
+      "index": 14512
     }
   },
   {
@@ -679,14 +679,14 @@
     "defaultMessage": "!!!Are you sure you want to proceed this order with the limit price that is 10% or more higher than the\nmarket price?",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 320,
+      "line": 323,
       "column": 32,
-      "index": 14303
+      "index": 14546
     },
     "end": {
-      "line": 325,
+      "line": 328,
       "column": 3,
-      "index": 14523
+      "index": 14766
     }
   },
   {
@@ -694,14 +694,14 @@
     "defaultMessage": "!!!Your limit price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 326,
+      "line": 329,
       "column": 30,
-      "index": 14555
+      "index": 14798
     },
     "end": {
-      "line": 329,
+      "line": 332,
       "column": 3,
-      "index": 14657
+      "index": 14900
     }
   },
   {
@@ -709,14 +709,14 @@
     "defaultMessage": "!!!Market price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 330,
+      "line": 333,
       "column": 32,
-      "index": 14691
+      "index": 14934
     },
     "end": {
-      "line": 333,
+      "line": 336,
       "column": 3,
-      "index": 14791
+      "index": 15034
     }
   },
   {
@@ -724,14 +724,14 @@
     "defaultMessage": "!!!Back",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 334,
+      "line": 337,
       "column": 25,
-      "index": 14818
+      "index": 15061
     },
     "end": {
-      "line": 337,
+      "line": 340,
       "column": 3,
-      "index": 14903
+      "index": 15146
     }
   },
   {
@@ -739,14 +739,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 338,
+      "line": 341,
       "column": 28,
-      "index": 14933
+      "index": 15176
     },
     "end": {
-      "line": 341,
+      "line": 344,
       "column": 3,
-      "index": 15021
+      "index": 15264
     }
   },
   {
@@ -754,14 +754,14 @@
     "defaultMessage": "!!!Transaction submitted",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 342,
+      "line": 345,
       "column": 21,
-      "index": 15044
+      "index": 15287
     },
     "end": {
-      "line": 345,
+      "line": 348,
       "column": 3,
-      "index": 15142
+      "index": 15385
     }
   },
   {
@@ -769,14 +769,14 @@
     "defaultMessage": "!!!Your transactions will be displayed both in the list of transaction and Open swap orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 346,
+      "line": 349,
       "column": 22,
-      "index": 15166
+      "index": 15409
     },
     "end": {
-      "line": 349,
+      "line": 352,
       "column": 3,
-      "index": 15332
+      "index": 15575
     }
   },
   {
@@ -784,14 +784,14 @@
     "defaultMessage": "!!! dex",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 350,
+      "line": 353,
       "column": 7,
-      "index": 15341
+      "index": 15584
     },
     "end": {
-      "line": 353,
+      "line": 356,
       "column": 3,
-      "index": 15408
+      "index": 15651
     }
   },
   {
@@ -799,14 +799,14 @@
     "defaultMessage": "!!!see on explorer",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 354,
+      "line": 357,
       "column": 17,
-      "index": 15427
+      "index": 15670
     },
     "end": {
-      "line": 357,
+      "line": 360,
       "column": 3,
-      "index": 15515
+      "index": 15758
     }
   },
   {
@@ -814,14 +814,14 @@
     "defaultMessage": "!!!GO to Orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 358,
+      "line": 361,
       "column": 14,
-      "index": 15531
+      "index": 15774
     },
     "end": {
-      "line": 361,
+      "line": 364,
       "column": 3,
-      "index": 15613
+      "index": 15856
     }
   },
   {
@@ -829,14 +829,14 @@
     "defaultMessage": "!!!Asset",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 362,
+      "line": 365,
       "column": 9,
-      "index": 15624
+      "index": 15867
     },
     "end": {
-      "line": 365,
+      "line": 368,
       "column": 3,
-      "index": 15697
+      "index": 15940
     }
   },
   {
@@ -844,14 +844,14 @@
     "defaultMessage": "!!!Clear",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 366,
+      "line": 369,
       "column": 9,
-      "index": 15708
+      "index": 15951
     },
     "end": {
-      "line": 369,
+      "line": 372,
       "column": 3,
-      "index": 15769
+      "index": 16012
     }
   },
   {
@@ -859,14 +859,14 @@
     "defaultMessage": "!!!Sign transaction",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 370,
+      "line": 373,
       "column": 19,
-      "index": 15790
+      "index": 16033
     },
     "end": {
-      "line": 373,
+      "line": 376,
       "column": 3,
-      "index": 15872
+      "index": 16115
     }
   },
   {
@@ -874,14 +874,14 @@
     "defaultMessage": "!!!Spending Password",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 374,
+      "line": 377,
       "column": 20,
-      "index": 15894
+      "index": 16137
     },
     "end": {
-      "line": 377,
+      "line": 380,
       "column": 3,
-      "index": 15978
+      "index": 16221
     }
   },
   {
@@ -889,14 +889,14 @@
     "defaultMessage": "!!!Enter spending password to sign this transaction",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 378,
+      "line": 381,
       "column": 25,
-      "index": 16005
+      "index": 16248
     },
     "end": {
-      "line": 381,
+      "line": 384,
       "column": 3,
-      "index": 16125
+      "index": 16368
     }
   },
   {
@@ -904,14 +904,14 @@
     "defaultMessage": "!!!Sign",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 382,
+      "line": 385,
       "column": 8,
-      "index": 16135
+      "index": 16378
     },
     "end": {
-      "line": 385,
+      "line": 388,
       "column": 3,
-      "index": 16194
+      "index": 16437
     }
   },
   {
@@ -919,14 +919,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 386,
+      "line": 389,
       "column": 14,
-      "index": 16210
+      "index": 16453
     },
     "end": {
-      "line": 389,
+      "line": 392,
       "column": 3,
-      "index": 16269
+      "index": 16512
     }
   },
   {
@@ -934,14 +934,14 @@
     "defaultMessage": "!!!completed orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 390,
+      "line": 393,
       "column": 23,
-      "index": 16294
+      "index": 16537
     },
     "end": {
-      "line": 393,
+      "line": 396,
       "column": 3,
-      "index": 16379
+      "index": 16622
     }
   },
   {
@@ -949,14 +949,14 @@
     "defaultMessage": "!!!open orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 394,
+      "line": 397,
       "column": 18,
-      "index": 16399
+      "index": 16642
     },
     "end": {
-      "line": 397,
+      "line": 400,
       "column": 3,
-      "index": 16474
+      "index": 16717
     }
   },
   {
@@ -964,14 +964,14 @@
     "defaultMessage": "!!!Confirm order cancellation",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 398,
+      "line": 401,
       "column": 24,
-      "index": 16500
+      "index": 16743
     },
     "end": {
-      "line": 401,
+      "line": 404,
       "column": 3,
-      "index": 16597
+      "index": 16840
     }
   },
   {
@@ -979,14 +979,14 @@
     "defaultMessage": "!!!Cancel order",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 402,
+      "line": 405,
       "column": 29,
-      "index": 16628
+      "index": 16871
     },
     "end": {
-      "line": 405,
+      "line": 408,
       "column": 3,
-      "index": 16715
+      "index": 16958
     }
   },
   {
@@ -994,14 +994,14 @@
     "defaultMessage": "!!!Are you sure you want to cancel this order?",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 406,
+      "line": 409,
       "column": 31,
-      "index": 16748
+      "index": 16991
     },
     "end": {
-      "line": 409,
+      "line": 412,
       "column": 3,
-      "index": 16869
+      "index": 17112
     }
   },
   {
@@ -1009,14 +1009,14 @@
     "defaultMessage": "!!!Learn more about swap orders in Yoroi",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 410,
+      "line": 413,
       "column": 23,
-      "index": 16894
+      "index": 17137
     },
     "end": {
-      "line": 413,
+      "line": 416,
       "column": 3,
-      "index": 17001
+      "index": 17244
     }
   },
   {
@@ -1024,14 +1024,14 @@
     "defaultMessage": "!!!Asset price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 414,
+      "line": 417,
       "column": 29,
-      "index": 17032
+      "index": 17275
     },
     "end": {
-      "line": 417,
+      "line": 420,
       "column": 3,
-      "index": 17119
+      "index": 17362
     }
   },
   {
@@ -1039,14 +1039,14 @@
     "defaultMessage": "!!!Asset amount",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 418,
+      "line": 421,
       "column": 30,
-      "index": 17151
+      "index": 17394
     },
     "end": {
-      "line": 421,
+      "line": 424,
       "column": 3,
-      "index": 17240
+      "index": 17483
     }
   },
   {
@@ -1054,14 +1054,14 @@
     "defaultMessage": "!!!Total returned",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 422,
+      "line": 425,
       "column": 32,
-      "index": 17274
+      "index": 17517
     },
     "end": {
-      "line": 425,
+      "line": 428,
       "column": 3,
-      "index": 17367
+      "index": 17610
     }
   },
   {
@@ -1069,14 +1069,14 @@
     "defaultMessage": "!!!Cancellation Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 426,
+      "line": 429,
       "column": 34,
-      "index": 17403
+      "index": 17646
     },
     "end": {
-      "line": 429,
+      "line": 432,
       "column": 3,
-      "index": 17500
+      "index": 17743
     }
   },
   {
@@ -1084,14 +1084,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 430,
+      "line": 433,
       "column": 26,
-      "index": 17528
+      "index": 17771
     },
     "end": {
-      "line": 433,
+      "line": 436,
       "column": 3,
-      "index": 17608
+      "index": 17851
     }
   },
   {
@@ -1099,14 +1099,14 @@
     "defaultMessage": "!!!Back",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 434,
+      "line": 437,
       "column": 23,
-      "index": 17633
+      "index": 17876
     },
     "end": {
-      "line": 437,
+      "line": 440,
       "column": 3,
-      "index": 17707
+      "index": 17950
     }
   },
   {
@@ -1114,14 +1114,14 @@
     "defaultMessage": "!!!Total",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 438,
+      "line": 441,
       "column": 19,
-      "index": 17728
+      "index": 17971
     },
     "end": {
-      "line": 441,
+      "line": 444,
       "column": 3,
-      "index": 17798
+      "index": 18041
     }
   },
   {
@@ -1129,14 +1129,14 @@
     "defaultMessage": "!!!Liquidity Pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 442,
+      "line": 445,
       "column": 27,
-      "index": 17827
+      "index": 18070
     },
     "end": {
-      "line": 445,
+      "line": 448,
       "column": 3,
-      "index": 17914
+      "index": 18157
     }
   },
   {
@@ -1144,14 +1144,14 @@
     "defaultMessage": "!!!Time Created",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 446,
+      "line": 449,
       "column": 25,
-      "index": 17941
+      "index": 18184
     },
     "end": {
-      "line": 449,
+      "line": 452,
       "column": 3,
-      "index": 18024
+      "index": 18267
     }
   },
   {
@@ -1159,14 +1159,14 @@
     "defaultMessage": "!!!Time Completed",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 450,
+      "line": 453,
       "column": 27,
-      "index": 18053
+      "index": 18296
     },
     "end": {
-      "line": 453,
+      "line": 456,
       "column": 3,
-      "index": 18140
+      "index": 18383
     }
   },
   {
@@ -1174,14 +1174,14 @@
     "defaultMessage": "!!!Transaction ID",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 454,
+      "line": 457,
       "column": 18,
-      "index": 18160
+      "index": 18403
     },
     "end": {
-      "line": 457,
+      "line": 460,
       "column": 3,
-      "index": 18238
+      "index": 18481
     }
   },
   {
@@ -1189,14 +1189,14 @@
     "defaultMessage": "!!!Choose Connection Method",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 458,
+      "line": 461,
       "column": 26,
-      "index": 18266
+      "index": 18509
     },
     "end": {
-      "line": 461,
+      "line": 464,
       "column": 3,
-      "index": 18384
+      "index": 18627
     }
   },
   {
@@ -1204,14 +1204,14 @@
     "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X or S using an on-the-go USB cable adaptor:",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 462,
+      "line": 465,
       "column": 18,
-      "index": 18404
+      "index": 18647
     },
     "end": {
-      "line": 467,
+      "line": 470,
       "column": 3,
-      "index": 18633
+      "index": 18876
     }
   },
   {
@@ -1219,14 +1219,14 @@
     "defaultMessage": "!!!Connect with USB",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 468,
+      "line": 471,
       "column": 13,
-      "index": 18648
+      "index": 18891
     },
     "end": {
-      "line": 471,
+      "line": 474,
       "column": 3,
-      "index": 18762
+      "index": 19005
     }
   },
   {
@@ -1234,14 +1234,14 @@
     "defaultMessage": "!!! USB connection is blocked by iOS devices",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 472,
+      "line": 475,
       "column": 26,
-      "index": 18790
+      "index": 19033
     },
     "end": {
-      "line": 475,
+      "line": 478,
       "column": 3,
-      "index": 18942
+      "index": 19185
     }
   },
   {
@@ -1249,14 +1249,14 @@
     "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X through Bluetooth:",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 476,
+      "line": 479,
       "column": 24,
-      "index": 18968
+      "index": 19211
     },
     "end": {
-      "line": 479,
+      "line": 482,
       "column": 3,
-      "index": 19162
+      "index": 19405
     }
   },
   {
@@ -1264,14 +1264,14 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 480,
+      "line": 483,
       "column": 19,
-      "index": 19183
+      "index": 19426
     },
     "end": {
-      "line": 483,
+      "line": 486,
       "column": 3,
-      "index": 19309
+      "index": 19552
     }
   },
   {
@@ -1279,14 +1279,14 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 484,
+      "line": 487,
       "column": 18,
-      "index": 19329
+      "index": 19572
     },
     "end": {
-      "line": 487,
+      "line": 490,
       "column": 3,
-      "index": 19439
+      "index": 19682
     }
   },
   {
@@ -1294,14 +1294,14 @@
     "defaultMessage": "!!!You have",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 490,
+      "line": 493,
       "column": 11,
-      "index": 19498
+      "index": 19741
     },
     "end": {
-      "line": 493,
+      "line": 496,
       "column": 3,
-      "index": 19593
+      "index": 19836
     }
   },
   {
@@ -1309,14 +1309,14 @@
     "defaultMessage": "!!!No assets found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 494,
+      "line": 497,
       "column": 12,
-      "index": 19607
+      "index": 19850
     },
     "end": {
-      "line": 497,
+      "line": 500,
       "column": 3,
-      "index": 19710
+      "index": 19953
     }
   },
   {
@@ -1324,14 +1324,14 @@
     "defaultMessage": "!!!found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 498,
+      "line": 501,
       "column": 9,
-      "index": 19721
+      "index": 19964
     },
     "end": {
-      "line": 501,
+      "line": 504,
       "column": 3,
-      "index": 19811
+      "index": 20054
     }
   },
   {
@@ -1339,14 +1339,14 @@
     "defaultMessage": "!!!Search tokens",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 502,
+      "line": 505,
       "column": 16,
-      "index": 19829
+      "index": 20072
     },
     "end": {
-      "line": 505,
+      "line": 508,
       "column": 3,
-      "index": 19925
+      "index": 20168
     }
   },
   {
@@ -1354,14 +1354,14 @@
     "defaultMessage": "!!!Select asset",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 506,
+      "line": 509,
       "column": 20,
-      "index": 19947
+      "index": 20190
     },
     "end": {
-      "line": 509,
+      "line": 512,
       "column": 3,
-      "index": 20036
+      "index": 20279
     }
   },
   {
@@ -1369,14 +1369,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 510,
+      "line": 513,
       "column": 11,
-      "index": 20049
+      "index": 20292
     },
     "end": {
-      "line": 513,
+      "line": 516,
       "column": 3,
-      "index": 20143
+      "index": 20386
     }
   },
   {
@@ -1384,14 +1384,14 @@
     "defaultMessage": "!!!Assign collateral",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 514,
+      "line": 517,
       "column": 20,
-      "index": 20165
+      "index": 20408
     },
     "end": {
-      "line": 517,
+      "line": 520,
       "column": 3,
-      "index": 20272
+      "index": 20515
     }
   },
   {
@@ -1399,14 +1399,14 @@
     "defaultMessage": "!!!Collateral not found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 518,
+      "line": 521,
       "column": 22,
-      "index": 20296
+      "index": 20539
     },
     "end": {
-      "line": 521,
+      "line": 524,
       "column": 3,
-      "index": 20408
+      "index": 20651
     }
   },
   {
@@ -1414,14 +1414,14 @@
     "defaultMessage": "!!!You don't have an active collateral utxo",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 522,
+      "line": 525,
       "column": 22,
-      "index": 20432
+      "index": 20675
     },
     "end": {
-      "line": 525,
+      "line": 528,
       "column": 3,
-      "index": 20564
+      "index": 20807
     }
   },
   {
@@ -1429,14 +1429,14 @@
     "defaultMessage": "!!!Transaction failed",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 526,
+      "line": 529,
       "column": 17,
-      "index": 20583
+      "index": 20826
     },
     "end": {
-      "line": 529,
+      "line": 532,
       "column": 3,
-      "index": 20685
+      "index": 20928
     }
   },
   {
@@ -1444,14 +1444,14 @@
     "defaultMessage": "!!!Your transaction has not been processed properly due to technical issues",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 530,
+      "line": 533,
       "column": 16,
-      "index": 20703
+      "index": 20946
     },
     "end": {
-      "line": 533,
+      "line": 536,
       "column": 3,
-      "index": 20858
+      "index": 21101
     }
   },
   {
@@ -1459,14 +1459,14 @@
     "defaultMessage": "!!!Try again",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 534,
+      "line": 537,
       "column": 18,
-      "index": 20878
+      "index": 21121
     },
     "end": {
-      "line": 537,
+      "line": 540,
       "column": 3,
-      "index": 20972
+      "index": 21215
     }
   },
   {
@@ -1474,14 +1474,14 @@
     "defaultMessage": "!!!Not enough balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 538,
+      "line": 541,
       "column": 20,
-      "index": 20994
+      "index": 21237
     },
     "end": {
-      "line": 541,
+      "line": 544,
       "column": 3,
-      "index": 21088
+      "index": 21331
     }
   },
   {
@@ -1489,14 +1489,14 @@
     "defaultMessage": "!!!Not enough supply in the pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 542,
+      "line": 545,
       "column": 19,
-      "index": 21109
+      "index": 21352
     },
     "end": {
-      "line": 545,
+      "line": 548,
       "column": 3,
-      "index": 21213
+      "index": 21456
     }
   },
   {
@@ -1504,14 +1504,14 @@
     "defaultMessage": "!!!Not enough balance, please consider the fees",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 546,
+      "line": 549,
       "column": 23,
-      "index": 21238
+      "index": 21481
     },
     "end": {
-      "line": 549,
+      "line": 552,
       "column": 3,
-      "index": 21361
+      "index": 21604
     }
   },
   {
@@ -1519,14 +1519,14 @@
     "defaultMessage": "!!! This pair is not available in any liquidity pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 550,
+      "line": 553,
       "column": 10,
-      "index": 21373
+      "index": 21616
     },
     "end": {
-      "line": 553,
+      "line": 556,
       "column": 3,
-      "index": 21488
+      "index": 21731
     }
   },
   {
@@ -1534,14 +1534,59 @@
     "defaultMessage": "!!!Continue on Ledger",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 554,
+      "line": 557,
       "column": 20,
-      "index": 21510
+      "index": 21753
     },
     "end": {
-      "line": 557,
+      "line": 560,
+      "column": 3,
+      "index": 21853
+    }
+  },
+  {
+    "id": "swap.slippage.slippageWarningTitle",
+    "defaultMessage": "!!!Slippage Warning",
+    "file": "src/features/Swap/common/strings.ts",
+    "start": {
+      "line": 561,
+      "column": 24,
+      "index": 21879
+    },
+    "end": {
+      "line": 564,
+      "column": 3,
+      "index": 21973
+    }
+  },
+  {
+    "id": "swap.slippage.slippageWarningText",
+    "defaultMessage": "!!!Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+    "file": "src/features/Swap/common/strings.ts",
+    "start": {
+      "line": 565,
+      "column": 23,
+      "index": 21998
+    },
+    "end": {
+      "line": 569,
+      "column": 3,
+      "index": 22201
+    }
+  },
+  {
+    "id": "swap.slippage.yourSlippage",
+    "defaultMessage": "!!!Your slippage tolerance",
+    "file": "src/features/Swap/common/strings.ts",
+    "start": {
+      "line": 570,
+      "column": 31,
+      "index": 22234
+    },
+    "end": {
+      "line": 573,
       "column": 3,
-      "index": 21610
+      "index": 22327
     }
   }
 ]
\ No newline at end of file

From 70d0e0581843968f6c0b94f9571e4fb1ff3e8ed8 Mon Sep 17 00:00:00 2001
From: Michal <miso.szorad@gmail.com>
Date: Wed, 1 Nov 2023 18:05:38 +0100
Subject: [PATCH 05/40] fix(swap): Fix button font weight and paddings (#2863)

---
 .../features/Swap/common/ButtonGroup/ButtonGroup.tsx   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Swap/common/ButtonGroup/ButtonGroup.tsx b/apps/wallet-mobile/src/features/Swap/common/ButtonGroup/ButtonGroup.tsx
index 3c8581c989..8a64ecde11 100644
--- a/apps/wallet-mobile/src/features/Swap/common/ButtonGroup/ButtonGroup.tsx
+++ b/apps/wallet-mobile/src/features/Swap/common/ButtonGroup/ButtonGroup.tsx
@@ -36,16 +36,18 @@ const styles = StyleSheet.create({
     paddingRight: 8,
   },
   button: {
-    paddingHorizontal: 12,
+    paddingHorizontal: 8,
     paddingVertical: 8,
-    borderRadius: 4,
-    fontFamily: 'Rubik-Medium',
-    fontWeight: '500',
+    borderRadius: 8,
   },
   selected: {
     backgroundColor: COLORS.BORDER_GRAY,
   },
   label: {
     color: COLORS.BLACK,
+    fontFamily: 'Rubik-Medium',
+    fontWeight: '500',
+    lineHeight: 24,
+    fontSize: 16,
   },
 })

From ddc0392858fd3568ddc7a92edab387dbb36c4aea Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Wed, 1 Nov 2023 14:17:44 -0400
Subject: [PATCH 06/40] chore: v bumper (#2865)

---
 apps/wallet-mobile/package.json | 16 ++++++++--------
 packages/api/package.json       |  6 +++---
 packages/banxa/package.json     |  2 +-
 packages/common/package.json    |  4 ++--
 packages/openswap/package.json  |  2 +-
 packages/swap/package.json      |  8 ++++----
 packages/types/package.json     |  2 +-
 scripts/bump-pkgs.sh            | 26 +++++++++++++++++++++++++
 scripts/install-pkgs.sh         | 34 +++++++++++++++++++++++++++++++++
 9 files changed, 80 insertions(+), 20 deletions(-)
 create mode 100644 scripts/bump-pkgs.sh
 create mode 100644 scripts/install-pkgs.sh

diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index bedd9df657..c145c9ed22 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -25,9 +25,9 @@
     "release:ios:nightly": "bundle exec fastlane ios release --env nightly",
     "prerelease:ios:production": "bundle install && ./scripts/update-commit.sh && npx pod-install",
     "release:ios:production": "bundle exec fastlane ios release --env production",
+    "reset": "yarn reset:android && yarn reset:ios",
     "reset:android": "cd android && ./gradlew clean && cd ..",
     "reset:ios": "yarn pod-install",
-    "reset": "yarn reset:android && yarn reset:ios",
     "run:android:dev:debug": "ENVFILE=.env react-native run-android --mode=devDebug --appIdSuffix=dev --verbose",
     "run:android:nightly:debug": "ENVFILE=.env.nightly react-native run-android --mode=nightlyDebug --appIdSuffix=nightly --verbose",
     "run:android:nightly:release": "ENVFILE=.env.nightly react-native run-android --mode=nightlyRelease --appIdSuffix=nightly --verbose",
@@ -56,11 +56,11 @@
   },
   "jest": {
     "cacheDirectory": ".jest/cache",
+    "collectCoverage": true,
     "collectCoverageFrom": [
       "src/**/*.{js,jsx,ts,tsx}",
       "!src/**/*.d.ts"
     ],
-    "collectCoverage": true,
     "coverageReporters": [
       "text-summary",
       "html"
@@ -119,10 +119,10 @@
     "@sentry/react-native": "^5.8.0",
     "@shopify/flash-list": "^1.4.1",
     "@unstoppabledomains/resolution": "6.0.3",
-    "@yoroi/banxa": "1.2.0",
-    "@yoroi/api": "1.2.0",
-    "@yoroi/common": "1.2.0",
-    "@yoroi/swap": "1.2.0",
+    "@yoroi/api": "1.3.0",
+    "@yoroi/banxa": "1.3.0",
+    "@yoroi/common": "1.3.0",
+    "@yoroi/swap": "1.3.0",
     "add": "2.0.6",
     "assert": "^2.0.0",
     "base-64": "^1.0.0",
@@ -236,7 +236,7 @@
     "@wdio/mocha-framework": "^7.16.6",
     "@wdio/selenium-standalone-service": "^7.25.1",
     "@wdio/spec-reporter": "^7.16.4",
-    "@yoroi/types": "1.2.0",
+    "@yoroi/types": "1.3.0",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^29.2.1",
     "babel-loader": "8.2.2",
@@ -287,4 +287,4 @@
       "module": "commonjs"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/api/package.json b/packages/api/package.json
index 0f189d77ee..26fb8c4da6 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yoroi/api",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "The API package of Yoroi SDK",
   "keywords": [
     "yoroi",
@@ -133,7 +133,7 @@
   },
   "dependencies": {
     "@emurgo/cip14-js": "^3.0.1",
-    "@yoroi/common": "1.2.0",
+    "@yoroi/common": "1.3.0",
     "axios": "^1.5.0",
     "zod": "^3.22.1"
   },
@@ -149,7 +149,7 @@
     "@types/jest": "^28.1.2",
     "@types/react": "18.2.0",
     "@types/react-native": "0.71.6",
-    "@yoroi/types": "1.2.0",
+    "@yoroi/types": "1.3.0",
     "axios-mock-adapter": "^1.21.5",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
diff --git a/packages/banxa/package.json b/packages/banxa/package.json
index 6d7b64812e..36640fae9b 100644
--- a/packages/banxa/package.json
+++ b/packages/banxa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yoroi/banxa",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "The Banxa integration package of Yoroi SDK",
   "keywords": [
     "yoroi",
diff --git a/packages/common/package.json b/packages/common/package.json
index 5d9329e733..e2733cbb8b 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yoroi/common",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "The Common package of Yoroi SDK",
   "keywords": [
     "yoroi",
@@ -147,7 +147,7 @@
     "@types/jest": "^28.1.2",
     "@types/react": "18.2.0",
     "@types/react-native": "0.71.6",
-    "@yoroi/types": "1.2.0",
+    "@yoroi/types": "1.3.0",
     "axios-mock-adapter": "^1.21.5",
     "commitlint": "^17.0.2",
     "del-cli": "^5.0.0",
diff --git a/packages/openswap/package.json b/packages/openswap/package.json
index a20f46ad02..4b5a5878cc 100644
--- a/packages/openswap/package.json
+++ b/packages/openswap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yoroi/openswap",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "repository": {
     "type": "github",
     "url": "https://github.com/Emurgo/yoroi.git",
diff --git a/packages/swap/package.json b/packages/swap/package.json
index 6f0b7d440f..304e8f5dfa 100644
--- a/packages/swap/package.json
+++ b/packages/swap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yoroi/swap",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "The Swap package of Yoroi SDK",
   "keywords": [
     "yoroi",
@@ -135,8 +135,8 @@
   },
   "dependencies": {
     "@emurgo/cip14-js": "^3.0.1",
-    "@yoroi/api": "1.2.0",
-    "@yoroi/openswap": "1.2.0",
+    "@yoroi/api": "1.3.0",
+    "@yoroi/openswap": "1.3.0",
     "immer": "^10.0.2"
   },
   "devDependencies": {
@@ -149,7 +149,7 @@
     "@types/jest": "^28.1.2",
     "@types/react": "18.2.0",
     "@types/react-native": "0.71.6",
-    "@yoroi/types": "1.2.0",
+    "@yoroi/types": "1.3.0",
     "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 e528448b99..2601df2917 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yoroi/types",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "The Yoroi Types package of Yoroi SDK",
   "keywords": [
     "yoroi",
diff --git a/scripts/bump-pkgs.sh b/scripts/bump-pkgs.sh
new file mode 100644
index 0000000000..2f24584df4
--- /dev/null
+++ b/scripts/bump-pkgs.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# Verify the presence of the packages directory in the current path
+if [[ ! -d "packages" ]]; then
+    echo "Error: 'packages' directory not found in the current path."
+    return 1
+fi
+
+# Verify argument
+if [[ "$1" != "--patch" && "$1" != "--minor" && "$1" != "--major" ]]; then
+    echo "Usage: $0 [--patch | --minor | --major]"
+    return 1
+fi
+
+# Iterate over each package and bump its version
+for pkg in packages/*; do
+    if [[ -d "$pkg" && ! -L "$pkg" && -f "$pkg/package.json" ]]; then
+        echo "Bumping version for $pkg..."
+        (
+            cd "$pkg"
+            yarn version "$1"
+        )
+    fi
+done
+
+echo "Version bump complete."
\ No newline at end of file
diff --git a/scripts/install-pkgs.sh b/scripts/install-pkgs.sh
new file mode 100644
index 0000000000..c0a0439f82
--- /dev/null
+++ b/scripts/install-pkgs.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# Verify the presence of the packages directory in the current path
+if [[ ! -d "packages" ]]; then
+    echo "Error: 'packages' directory not found in the current path."
+    return 1
+fi
+
+# Verify argument
+if [[ -z "$1" ]]; then
+    echo "Usage: $0 1.20.0"
+    return 1
+fi
+
+# common 
+yarn workspace @yoroi/common add -D @yoroi/types@"$1"
+
+# api
+yarn workspace @yoroi/api add -D @yoroi/types@"$1"
+yarn workspace @yoroi/api add @yoroi/common@"$1"
+
+# swap
+yarn workspace @yoroi/swap add -D @yoroi/types@"$1"
+yarn workspace @yoroi/swap add @yoroi/api@"$1"
+yarn workspace @yoroi/swap add @yoroi/openswap@"$1"
+
+# wallet-mobile
+yarn workspace @yoroi/wallet-mobile add -D @yoroi/types@"$1"
+yarn workspace @yoroi/wallet-mobile add @yoroi/banxa@"$1"
+yarn workspace @yoroi/wallet-mobile add @yoroi/api@"$1"
+yarn workspace @yoroi/wallet-mobile add @yoroi/common@"$1"
+yarn workspace @yoroi/wallet-mobile add @yoroi/swap@"$1"
+
+echo "Using new packages..."
\ No newline at end of file

From d7d3cf5e4fc30cb3ebb2c96918e9be354c5a5c1f Mon Sep 17 00:00:00 2001
From: Ruslan Dudin <vantuz-subhuman@yandex.ru>
Date: Wed, 1 Nov 2023 21:18:06 +0300
Subject: [PATCH 07/40] chore: New Crowdin updates (#2864)

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

diff --git a/apps/wallet-mobile/src/i18n/locales/bn-BD.json b/apps/wallet-mobile/src/i18n/locales/bn-BD.json
index f80fb6c28f..90d4b2950e 100644
--- a/apps/wallet-mobile/src/i18n/locales/bn-BD.json
+++ b/apps/wallet-mobile/src/i18n/locales/bn-BD.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Copied",
diff --git a/apps/wallet-mobile/src/i18n/locales/cs-CZ.json b/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
index 61eea2998d..4795bfcefa 100644
--- a/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
+++ b/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Zkopírováno",
diff --git a/apps/wallet-mobile/src/i18n/locales/de-DE.json b/apps/wallet-mobile/src/i18n/locales/de-DE.json
index 269dfe6762..ed8f9b80e7 100644
--- a/apps/wallet-mobile/src/i18n/locales/de-DE.json
+++ b/apps/wallet-mobile/src/i18n/locales/de-DE.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Ableitungspfad",
   "components.receive.addressmodal.copiedLabel": "Kopiert",
diff --git a/apps/wallet-mobile/src/i18n/locales/el-GR.json b/apps/wallet-mobile/src/i18n/locales/el-GR.json
index ed9e5e0dc3..5976ebb680 100644
--- a/apps/wallet-mobile/src/i18n/locales/el-GR.json
+++ b/apps/wallet-mobile/src/i18n/locales/el-GR.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Αντιγράφηκε",
diff --git a/apps/wallet-mobile/src/i18n/locales/es-ES.json b/apps/wallet-mobile/src/i18n/locales/es-ES.json
index 24f881f172..63d978c898 100644
--- a/apps/wallet-mobile/src/i18n/locales/es-ES.json
+++ b/apps/wallet-mobile/src/i18n/locales/es-ES.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Ruta de derivación",
   "components.receive.addressmodal.copiedLabel": "Copiado",
diff --git a/apps/wallet-mobile/src/i18n/locales/fil-PH.json b/apps/wallet-mobile/src/i18n/locales/fil-PH.json
index f80fb6c28f..90d4b2950e 100644
--- a/apps/wallet-mobile/src/i18n/locales/fil-PH.json
+++ b/apps/wallet-mobile/src/i18n/locales/fil-PH.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Copied",
diff --git a/apps/wallet-mobile/src/i18n/locales/fr-FR.json b/apps/wallet-mobile/src/i18n/locales/fr-FR.json
index fbd871618d..91891186e6 100644
--- a/apps/wallet-mobile/src/i18n/locales/fr-FR.json
+++ b/apps/wallet-mobile/src/i18n/locales/fr-FR.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Le prix de marché",
   "swap.swapScreen.limitPriceWarningBack": "Revenir ",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Galerie",
   "components.receive.addressmodal.BIP32path": "Voie de dérivation",
   "components.receive.addressmodal.copiedLabel": "Copié",
diff --git a/apps/wallet-mobile/src/i18n/locales/hr-HR.json b/apps/wallet-mobile/src/i18n/locales/hr-HR.json
index 5258c562b6..c7c94f8d7c 100644
--- a/apps/wallet-mobile/src/i18n/locales/hr-HR.json
+++ b/apps/wallet-mobile/src/i18n/locales/hr-HR.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Copied",
diff --git a/apps/wallet-mobile/src/i18n/locales/hu-HU.json b/apps/wallet-mobile/src/i18n/locales/hu-HU.json
index 44b42590d4..f4d82f485b 100644
--- a/apps/wallet-mobile/src/i18n/locales/hu-HU.json
+++ b/apps/wallet-mobile/src/i18n/locales/hu-HU.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Deriválási útvonal",
   "components.receive.addressmodal.copiedLabel": "Másolva",
diff --git a/apps/wallet-mobile/src/i18n/locales/id-ID.json b/apps/wallet-mobile/src/i18n/locales/id-ID.json
index 3803a07e9c..87e902b646 100644
--- a/apps/wallet-mobile/src/i18n/locales/id-ID.json
+++ b/apps/wallet-mobile/src/i18n/locales/id-ID.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Disalin",
diff --git a/apps/wallet-mobile/src/i18n/locales/it-IT.json b/apps/wallet-mobile/src/i18n/locales/it-IT.json
index 11ecfe87ff..6e8d9a853f 100644
--- a/apps/wallet-mobile/src/i18n/locales/it-IT.json
+++ b/apps/wallet-mobile/src/i18n/locales/it-IT.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Percorso di derivazione",
   "components.receive.addressmodal.copiedLabel": "Copiato",
diff --git a/apps/wallet-mobile/src/i18n/locales/ja-JP.json b/apps/wallet-mobile/src/i18n/locales/ja-JP.json
index 67cdcdd359..bf31a3ee84 100644
--- a/apps/wallet-mobile/src/i18n/locales/ja-JP.json
+++ b/apps/wallet-mobile/src/i18n/locales/ja-JP.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "コピーされました",
diff --git a/apps/wallet-mobile/src/i18n/locales/ko-KR.json b/apps/wallet-mobile/src/i18n/locales/ko-KR.json
index 1401607d99..4cddfc9c83 100644
--- a/apps/wallet-mobile/src/i18n/locales/ko-KR.json
+++ b/apps/wallet-mobile/src/i18n/locales/ko-KR.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "복사완료",
diff --git a/apps/wallet-mobile/src/i18n/locales/nl-NL.json b/apps/wallet-mobile/src/i18n/locales/nl-NL.json
index 3d27f03e9b..ac2d556be0 100644
--- a/apps/wallet-mobile/src/i18n/locales/nl-NL.json
+++ b/apps/wallet-mobile/src/i18n/locales/nl-NL.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT galerij",
   "components.receive.addressmodal.BIP32path": "herkomst pad",
   "components.receive.addressmodal.copiedLabel": "Gekopieerd",
diff --git a/apps/wallet-mobile/src/i18n/locales/pl-PL.json b/apps/wallet-mobile/src/i18n/locales/pl-PL.json
index f80fb6c28f..90d4b2950e 100644
--- a/apps/wallet-mobile/src/i18n/locales/pl-PL.json
+++ b/apps/wallet-mobile/src/i18n/locales/pl-PL.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Copied",
diff --git a/apps/wallet-mobile/src/i18n/locales/pt-BR.json b/apps/wallet-mobile/src/i18n/locales/pt-BR.json
index 7f6f5b8c00..1d2b6308c1 100644
--- a/apps/wallet-mobile/src/i18n/locales/pt-BR.json
+++ b/apps/wallet-mobile/src/i18n/locales/pt-BR.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "Galeria",
   "components.receive.addressmodal.BIP32path": "Caminho de derivação",
   "components.receive.addressmodal.copiedLabel": "Copiado",
diff --git a/apps/wallet-mobile/src/i18n/locales/ru-RU.json b/apps/wallet-mobile/src/i18n/locales/ru-RU.json
index da4dced4ca..af74c2338c 100644
--- a/apps/wallet-mobile/src/i18n/locales/ru-RU.json
+++ b/apps/wallet-mobile/src/i18n/locales/ru-RU.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "Галерея NFT",
   "components.receive.addressmodal.BIP32path": "Начало пути",
   "components.receive.addressmodal.copiedLabel": "Скопировано",
diff --git a/apps/wallet-mobile/src/i18n/locales/sk-SK.json b/apps/wallet-mobile/src/i18n/locales/sk-SK.json
index 4dff4ad961..fcea90d550 100644
--- a/apps/wallet-mobile/src/i18n/locales/sk-SK.json
+++ b/apps/wallet-mobile/src/i18n/locales/sk-SK.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Skopírované",
diff --git a/apps/wallet-mobile/src/i18n/locales/sl-SI.json b/apps/wallet-mobile/src/i18n/locales/sl-SI.json
index f80fb6c28f..90d4b2950e 100644
--- a/apps/wallet-mobile/src/i18n/locales/sl-SI.json
+++ b/apps/wallet-mobile/src/i18n/locales/sl-SI.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Copied",
diff --git a/apps/wallet-mobile/src/i18n/locales/sv-SE.json b/apps/wallet-mobile/src/i18n/locales/sv-SE.json
index f80fb6c28f..90d4b2950e 100644
--- a/apps/wallet-mobile/src/i18n/locales/sv-SE.json
+++ b/apps/wallet-mobile/src/i18n/locales/sv-SE.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Copied",
diff --git a/apps/wallet-mobile/src/i18n/locales/sw-KE.json b/apps/wallet-mobile/src/i18n/locales/sw-KE.json
index f80fb6c28f..90d4b2950e 100644
--- a/apps/wallet-mobile/src/i18n/locales/sw-KE.json
+++ b/apps/wallet-mobile/src/i18n/locales/sw-KE.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Copied",
diff --git a/apps/wallet-mobile/src/i18n/locales/tr-TR.json b/apps/wallet-mobile/src/i18n/locales/tr-TR.json
index bbfc4c4466..be7a130a05 100644
--- a/apps/wallet-mobile/src/i18n/locales/tr-TR.json
+++ b/apps/wallet-mobile/src/i18n/locales/tr-TR.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Copied",
diff --git a/apps/wallet-mobile/src/i18n/locales/uk-UA.json b/apps/wallet-mobile/src/i18n/locales/uk-UA.json
index f80fb6c28f..90d4b2950e 100644
--- a/apps/wallet-mobile/src/i18n/locales/uk-UA.json
+++ b/apps/wallet-mobile/src/i18n/locales/uk-UA.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Copied",
diff --git a/apps/wallet-mobile/src/i18n/locales/vi-VN.json b/apps/wallet-mobile/src/i18n/locales/vi-VN.json
index 6dcad32837..cda6e603f6 100644
--- a/apps/wallet-mobile/src/i18n/locales/vi-VN.json
+++ b/apps/wallet-mobile/src/i18n/locales/vi-VN.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "Phòng trưng bày NFT",
   "components.receive.addressmodal.BIP32path": "Đường dẫn phái sinh",
   "components.receive.addressmodal.copiedLabel": "Đã sao lưu",
diff --git a/apps/wallet-mobile/src/i18n/locales/zh-Hans.json b/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
index ff46ea024a..c6d4b7647d 100644
--- a/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
+++ b/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "偏移路径：",
   "components.receive.addressmodal.copiedLabel": "已复制",
diff --git a/apps/wallet-mobile/src/i18n/locales/zh-Hant.json b/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
index 8f240784a4..dbb9c75aa6 100644
--- a/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
+++ b/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
@@ -195,6 +195,9 @@
   "swap.swapScreen.limitPriceWarningMarketPrice": "Market price",
   "swap.swapScreen.limitPriceWarningBack": "Back",
   "swap.swapScreen.limitPriceWarningConfirm": "Swap",
+  "swap.slippage.slippageWarningTitle": "Slippage Warning",
+  "swap.slippage.slippageWarningText": "Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
+  "swap.slippage.yourSlippage": "Your slippage tolerance",
   "components.common.navigation.nftGallery": "NFT Gallery",
   "components.receive.addressmodal.BIP32path": "Derivation path",
   "components.receive.addressmodal.copiedLabel": "Copied",

From fe8e82b3022324d7df827ae9ec465c5fd941d614 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Wed, 1 Nov 2023 16:58:12 -0400
Subject: [PATCH 08/40] fix: avoid calc same token selection (#2867)

---
 .../SelectBuyTokenFromListScreen.tsx                | 13 ++++++++-----
 .../SelectSellTokenFromListScreen.tsx               | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
index 75e3544c3b..901a8ea6d4 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
@@ -144,16 +144,19 @@ const SelectableToken = ({wallet, tokenInfo, walletTokenIds}: SelectableTokenPro
 
   const isDisabled = id === orderData.amounts.sell.tokenId && isSellTouched
   const inUserWallet = walletTokenIds.includes(tokenInfo.id)
+  const isSameToken = id === orderData.amounts.buy.tokenId
 
   const handleOnTokenSelection = () => {
     track.swapAssetToChanged({
       to_asset: [{asset_name: name, asset_ticker: ticker, policy_id: group}],
     })
-    buyTokenInfoChanged({
-      decimals: decimals ?? 0,
-      id: id,
-    })
-    buyTouched()
+    if (!isSameToken) {
+      buyTokenInfoChanged({
+        decimals: decimals ?? 0,
+        id: id,
+      })
+      buyTouched()
+    }
     navigateTo.startSwap()
     closeSearch()
   }
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSellAmount/SelectSellTokenFromListScreen/SelectSellTokenFromListScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSellAmount/SelectSellTokenFromListScreen/SelectSellTokenFromListScreen.tsx
index 0b8339439f..e0d14aa49a 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSellAmount/SelectSellTokenFromListScreen/SelectSellTokenFromListScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSellAmount/SelectSellTokenFromListScreen/SelectSellTokenFromListScreen.tsx
@@ -98,16 +98,19 @@ const SelectableToken = ({tokenInfo, wallet}: SelectableTokenProps) => {
 
   const balanceAvailable = useBalance({wallet, tokenId: tokenInfo.id})
   const isDisabled = tokenInfo.id === orderData.amounts.buy.tokenId && isBuyTouched
+  const isSameToken = tokenInfo.id === orderData.amounts.sell.tokenId
 
   const handleOnTokenSelection = () => {
     track.swapAssetFromChanged({
       from_asset: [{asset_name: tokenInfo.name, asset_ticker: tokenInfo.ticker, policy_id: tokenInfo.group}],
     })
-    sellTouched()
-    sellTokenInfoChanged({
-      id: tokenInfo.id,
-      decimals: tokenInfo.decimals ?? 0,
-    })
+    if (!isSameToken) {
+      sellTouched()
+      sellTokenInfoChanged({
+        id: tokenInfo.id,
+        decimals: tokenInfo.decimals ?? 0,
+      })
+    }
     navigateTo.startSwap()
     closeSearch()
   }

From c9e100d11673323343cc6b9269e1995c6eb109ef Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Thu, 2 Nov 2023 16:07:35 +0100
Subject: [PATCH 09/40] Fix: Use react-native-localize for language detection
 and decimal separator (#2868)

---
 apps/wallet-mobile/jestSetup.ts               | 28 +++++++++
 apps/wallet-mobile/package.json               |  1 +
 apps/wallet-mobile/src/i18n/getRegion.test.ts | 20 -------
 apps/wallet-mobile/src/i18n/getRegion.ts      | 20 -------
 apps/wallet-mobile/src/i18n/initialization.ts | 21 ++-----
 apps/wallet-mobile/src/i18n/languages.ts      | 59 ++-----------------
 .../i18n/transformers/asYoroiLocale.test.ts   | 14 -----
 .../src/i18n/transformers/asYoroiLocale.ts    | 18 ------
 yarn.lock                                     |  5 ++
 9 files changed, 42 insertions(+), 144 deletions(-)
 delete mode 100644 apps/wallet-mobile/src/i18n/getRegion.test.ts
 delete mode 100644 apps/wallet-mobile/src/i18n/getRegion.ts
 delete mode 100644 apps/wallet-mobile/src/i18n/transformers/asYoroiLocale.test.ts
 delete mode 100644 apps/wallet-mobile/src/i18n/transformers/asYoroiLocale.ts

diff --git a/apps/wallet-mobile/jestSetup.ts b/apps/wallet-mobile/jestSetup.ts
index 592b5fb99f..d9f7427bad 100644
--- a/apps/wallet-mobile/jestSetup.ts
+++ b/apps/wallet-mobile/jestSetup.ts
@@ -31,6 +31,34 @@ jest.mock('react-native-reanimated', () => {
   Reanimated.default.call = () => {}
   return Reanimated
 })
+jest.mock('react-native-localize', () => ({
+  getLocales: () => [
+    // extend if needed, add the locales you want
+    {countryCode: 'US', languageTag: 'en-US', languageCode: 'en', isRTL: false},
+    {countryCode: 'FR', languageTag: 'fr-FR', languageCode: 'fr', isRTL: false},
+  ],
+
+  // use a provided translation, or return undefined to test your fallback
+  findBestLanguageTag: () => ({
+    languageTag: 'en-US',
+    isRTL: false,
+  }),
+
+  getNumberFormatSettings: () => ({
+    decimalSeparator: '.',
+    groupingSeparator: ',',
+  }),
+
+  getCalendar: () => 'gregorian', // the calendar identifier you want
+  getCountry: () => 'US', // the country code you want
+  getCurrencies: () => ['USD', 'EUR'], // can be empty array
+  getTemperatureUnit: () => 'celsius', // or "fahrenheit"
+  getTimeZone: () => 'Europe/Paris', // the timezone you want
+  uses24HourClock: () => true,
+  usesMetricSystem: () => true,
+  usesAutoDateAndTime: () => true,
+  usesAutoTimeZone: () => true,
+}))
 
 Logger.setLogLevel(LogLevel.Nothing)
 YoroiLogging.Logger.setLogLevel(YoroiLogging.LogLevel.Nothing)
diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index c145c9ed22..6e4bf2bfc5 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -156,6 +156,7 @@
     "react-native-gesture-handler": "^2.9.0",
     "react-native-keychain": "7.0.0",
     "react-native-linear-gradient": "2.5.6",
+    "react-native-localize": "^3.0.2",
     "react-native-markdown-display": "^7.0.0-alpha.2",
     "react-native-pager-view": "^6.2.0",
     "react-native-paper": "^4.12.0",
diff --git a/apps/wallet-mobile/src/i18n/getRegion.test.ts b/apps/wallet-mobile/src/i18n/getRegion.test.ts
deleted file mode 100644
index 0e931b0035..0000000000
--- a/apps/wallet-mobile/src/i18n/getRegion.test.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {getRegion} from './getRegion'
-
-describe('getRegion', () => {
-  it.each`
-    input      | expected
-    ${'en-US'} | ${'US'}
-    ${'pt-BR'} | ${'BR'}
-    ${'pt-PT'} | ${'US'}
-    ${'es-ES'} | ${'ES'}
-    ${'fr-FR'} | ${'FR'}
-    ${'de-DE'} | ${'DE'}
-    ${'it-IT'} | ${'IT'}
-    ${'ru-RU'} | ${'RU'}
-    ${'zh-CN'} | ${'US'}
-    ${'ja-JP'} | ${'JP'}
-    ${'po'}    | ${'US'}
-  `(`extract the region $expected from the $input or fallback to US`, ({input, expected}) => {
-    expect(getRegion(input)).toBe(expected)
-  })
-})
diff --git a/apps/wallet-mobile/src/i18n/getRegion.ts b/apps/wallet-mobile/src/i18n/getRegion.ts
deleted file mode 100644
index 8750d1713a..0000000000
--- a/apps/wallet-mobile/src/i18n/getRegion.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {RegionCode, REGIONS} from './languages'
-
-/**
- * Extracts the region segment from a locale or region string, or returns 'US' as fallback.
- *
- * @param {string} localeOrRegion - A string representing a locale or region, typically in the format of "language_region" or "language-region".
- * @returns {string} The extracted region segment if found, otherwise returns 'US' as fallback.
- * @example getRegion('en-US') // 'US'
- * @example getRegion('pt_BR') // 'BR'
- * @example getRegion('po') // 'US'
- */
-export const getRegion = (localeOrRegion: string) => {
-  const match = /[_-](\w+)/.exec(localeOrRegion) ?? []
-  const [, region] = match
-  return isSupportedRegion(region) ? region : 'US'
-}
-
-export const isSupportedRegion = (region: string): region is RegionCode => {
-  return Object.values(REGIONS).includes(region as RegionCode)
-}
diff --git a/apps/wallet-mobile/src/i18n/initialization.ts b/apps/wallet-mobile/src/i18n/initialization.ts
index 88e8490120..24e8321df8 100644
--- a/apps/wallet-mobile/src/i18n/initialization.ts
+++ b/apps/wallet-mobile/src/i18n/initialization.ts
@@ -1,23 +1,10 @@
 import BigNumber from 'bignumber.js'
-import {NativeModules, Platform} from 'react-native'
+import {findBestLanguageTag, getNumberFormatSettings} from 'react-native-localize'
 
-import {getRegion} from './getRegion'
-import {numberLocales} from './languages'
-import {asYoroiLocale} from './transformers/asYoroiLocale'
+import {decimalComma, decimalDot, supportedLanguagesCodes} from './languages'
 
-const systemLanguageCode =
-  process.env.NODE_ENV === 'test'
-    ? 'en-US'
-    : Platform.select({
-        ios: () =>
-          NativeModules.SettingsManager.settings.AppleLocale ??
-          NativeModules.SettingsManager.settings.AppleLanguages[0],
-        android: () => NativeModules.I18nManager.localeIdentifier,
-        default: () => 'en-US',
-      })()
-
-export const systemLocale = asYoroiLocale(systemLanguageCode)
-export const numberLocale = numberLocales[getRegion(systemLanguageCode)]
+export const systemLocale = findBestLanguageTag(supportedLanguagesCodes)?.languageTag ?? 'en-US'
+export const numberLocale = getNumberFormatSettings().decimalSeparator === '.' ? decimalDot : decimalComma
 
 BigNumber.config({
   FORMAT: numberLocale,
diff --git a/apps/wallet-mobile/src/i18n/languages.ts b/apps/wallet-mobile/src/i18n/languages.ts
index ccfe440e3b..b1a8c06b2a 100644
--- a/apps/wallet-mobile/src/i18n/languages.ts
+++ b/apps/wallet-mobile/src/i18n/languages.ts
@@ -24,6 +24,8 @@ export const supportedLanguages = [
   {code: 'zh-Hans', label: '简体中文'},
 ] as const
 
+export const supportedLanguagesCodes = supportedLanguages.map(({code}) => code)
+
 export const LANGUAGES = {
   BENGALI: 'bn-BD',
   BRAZILIAN: 'pt-BR',
@@ -58,33 +60,6 @@ type EqualityGuard<A, B> = Exclude<A, B> | Exclude<B, A>
 const assert = <T extends never>() => null as T
 assert<EqualityGuard<LanguageCode, SupportedLanguageCode>>()
 
-export const REGIONS = {
-  BENGALI: 'BD',
-  BRAZILIAN: 'BR',
-  CHINESE_SIMPLIFIED: 'Hans',
-  CZECH: 'CZ',
-  DUTCH: 'NL',
-  ENGLISH: 'US',
-  FILIPINO: 'PH',
-  FRENCH: 'FR',
-  GERMAN: 'DE',
-  HUNGARIAN: 'HU',
-  INDONESIAN: 'ID',
-  ITALIAN: 'IT',
-  JAPANESE: 'JP',
-  KENYAN: 'KE',
-  KOREAN: 'KR',
-  POLISH: 'PL',
-  RUSSIAN: 'RU',
-  SLOVAK: 'SK',
-  SLOVENIAN: 'SI',
-  SPANISH: 'ES',
-  SWEDISH: 'SE',
-  UKRAINIAN: 'UA',
-  VIETNAMESE: 'VN',
-} as const
-export type RegionCode = (typeof REGIONS)[keyof typeof REGIONS]
-
 export type NumberLocale = {
   prefix: string
   decimalSeparator: string
@@ -96,7 +71,7 @@ export type NumberLocale = {
   suffix: string
 }
 
-const decimalComma: NumberLocale = {
+export const decimalComma: NumberLocale = {
   prefix: '',
   decimalSeparator: ',',
   groupSeparator: ' ',
@@ -107,34 +82,8 @@ const decimalComma: NumberLocale = {
   suffix: '',
 } as const
 
-const decimalDot: NumberLocale = {
+export const decimalDot: NumberLocale = {
   ...decimalComma,
   decimalSeparator: '.',
   groupSeparator: ',',
 } as const
-
-export const numberLocales = {
-  [REGIONS.BENGALI]: decimalComma,
-  [REGIONS.BRAZILIAN]: decimalComma,
-  [REGIONS.CHINESE_SIMPLIFIED]: decimalDot,
-  [REGIONS.CZECH]: decimalComma,
-  [REGIONS.DUTCH]: decimalDot,
-  [REGIONS.ENGLISH]: decimalDot,
-  [REGIONS.FILIPINO]: decimalComma,
-  [REGIONS.FRENCH]: decimalComma,
-  [REGIONS.GERMAN]: decimalComma,
-  [REGIONS.HUNGARIAN]: decimalComma,
-  [REGIONS.INDONESIAN]: decimalComma,
-  [REGIONS.ITALIAN]: decimalComma,
-  [REGIONS.JAPANESE]: decimalDot,
-  [REGIONS.KENYAN]: decimalDot,
-  [REGIONS.KOREAN]: decimalDot,
-  [REGIONS.POLISH]: decimalComma,
-  [REGIONS.RUSSIAN]: decimalComma,
-  [REGIONS.SLOVAK]: decimalComma,
-  [REGIONS.SLOVENIAN]: decimalComma,
-  [REGIONS.SPANISH]: decimalComma,
-  [REGIONS.SWEDISH]: decimalComma,
-  [REGIONS.UKRAINIAN]: decimalComma,
-  [REGIONS.VIETNAMESE]: decimalComma,
-} as const
diff --git a/apps/wallet-mobile/src/i18n/transformers/asYoroiLocale.test.ts b/apps/wallet-mobile/src/i18n/transformers/asYoroiLocale.test.ts
deleted file mode 100644
index 704564bb20..0000000000
--- a/apps/wallet-mobile/src/i18n/transformers/asYoroiLocale.test.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import {asYoroiLocale} from './asYoroiLocale'
-
-describe('asYoroiLocale', () => {
-  it.each`
-    locale     | expected
-    ${'en_US'} | ${'en-US'}
-    ${'pt_BR'} | ${'pt-BR'}
-    ${'fr-FR'} | ${'fr-FR'}
-    ${''}      | ${'en-US'}
-    ${'xx_YZ'} | ${'en-US'}
-  `('should convert $locale to $expected', ({locale, expected}) => {
-    expect(asYoroiLocale(locale)).toEqual(expected)
-  })
-})
diff --git a/apps/wallet-mobile/src/i18n/transformers/asYoroiLocale.ts b/apps/wallet-mobile/src/i18n/transformers/asYoroiLocale.ts
deleted file mode 100644
index d871258ebc..0000000000
--- a/apps/wallet-mobile/src/i18n/transformers/asYoroiLocale.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import {LanguageCode, LANGUAGES} from '../languages'
-
-/**
- * Converts a locale string from using underscores to using hyphens Yoroi uses BCP 47 (IETF language tag) standard, or defaults to 'en-US' if the input is not a supported locale.
- *
- * @param {string} locale - The input locale string with underscores (e.g., 'en_US').
- * @returns {string} The converted locale string with hyphens (e.g., 'en-US'), it will default to 'en-US' if the input is not a supported locale.
- * @example asYoroiLocale('en_US') // 'en-US'
- * @example asYoroiLocale('pt_BR') // 'pt-BR'
- */
-export const asYoroiLocale = (locale: string): LanguageCode => {
-  const parsedLocale = locale.replace('_', '-')
-  return isSupportedLocale(parsedLocale) ? parsedLocale : 'en-US'
-}
-
-export const isSupportedLocale = (locale: string): locale is LanguageCode => {
-  return Object.values(LANGUAGES).includes(locale as LanguageCode)
-}
diff --git a/yarn.lock b/yarn.lock
index 31365c3264..cae3b61eb6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20397,6 +20397,11 @@ react-native-linear-gradient@2.5.6:
   resolved "https://registry.yarnpkg.com/react-native-linear-gradient/-/react-native-linear-gradient-2.5.6.tgz#96215cbc5ec7a01247a20890888aa75b834d44a0"
   integrity sha512-HDwEaXcQIuXXCV70O+bK1rizFong3wj+5Q/jSyifKFLg0VWF95xh8XQgfzXwtq0NggL9vNjPKXa016KuFu+VFg==
 
+react-native-localize@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/react-native-localize/-/react-native-localize-3.0.2.tgz#43fa75c0097dbdb24a54ff320b3c8ad732407365"
+  integrity sha512-/l/oE1LVNgIRRhLbhmfFMHiWV0xhUn0A0iz1ytLVRYywL7FTp8Rx2vkJS/q/RpExDvV7yLw2493XZBYIM1dnLQ==
+
 react-native-markdown-display@^7.0.0-alpha.2:
   version "7.0.0-alpha.2"
   resolved "https://registry.yarnpkg.com/react-native-markdown-display/-/react-native-markdown-display-7.0.0-alpha.2.tgz#a48a70d3cb5c510a52ecf7f1509a4a3d14d728aa"

From ef909d3bef57bb3e9fba703d4e9b82c3f42c0d88 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Tue, 31 Oct 2023 13:51:03 +0000
Subject: [PATCH 10/40] chore: bump version 4.23.0-rc.2 builds

---
 apps/wallet-mobile/android/app/build.gradle            | 4 ++--
 apps/wallet-mobile/ios/nightly.plist                   | 2 +-
 apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj | 8 ++++----
 apps/wallet-mobile/ios/yoroi/Info.plist                | 2 +-
 apps/wallet-mobile/ios/yoroiTests/Info.plist           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/wallet-mobile/android/app/build.gradle b/apps/wallet-mobile/android/app/build.gradle
index eaa50a5302..bd91906cfb 100644
--- a/apps/wallet-mobile/android/app/build.gradle
+++ b/apps/wallet-mobile/android/app/build.gradle
@@ -108,8 +108,8 @@ android {
         applicationId "com.emurgo"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 531
-        versionName "4.20.0"
+        versionCode 533
+        versionName "4.23.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
diff --git a/apps/wallet-mobile/ios/nightly.plist b/apps/wallet-mobile/ios/nightly.plist
index b765042976..afe0e01ebf 100644
--- a/apps/wallet-mobile/ios/nightly.plist
+++ b/apps/wallet-mobile/ios/nightly.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>471</string>
+	<string>476</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
index 8ecc0cdd40..a4684e9e4e 100644
--- a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
+++ b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
@@ -818,7 +818,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 471;
+				CURRENT_PROJECT_VERSION = 476;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				ENVFILE = "$(PODS_ROOT)/../../.env";
@@ -857,7 +857,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 471;
+				CURRENT_PROJECT_VERSION = 476;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.production";
 				INFOPLIST_FILE = yoroi/Info.plist;
@@ -1046,7 +1046,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 471;
+				CURRENT_PROJECT_VERSION = 476;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
@@ -1085,7 +1085,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 471;
+				CURRENT_PROJECT_VERSION = 476;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
 				INFOPLIST_FILE = nightly.plist;
diff --git a/apps/wallet-mobile/ios/yoroi/Info.plist b/apps/wallet-mobile/ios/yoroi/Info.plist
index f7d6da1edc..74bfff9977 100644
--- a/apps/wallet-mobile/ios/yoroi/Info.plist
+++ b/apps/wallet-mobile/ios/yoroi/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>471</string>
+	<string>476</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/apps/wallet-mobile/ios/yoroiTests/Info.plist b/apps/wallet-mobile/ios/yoroiTests/Info.plist
index f8052e3c29..16b506add5 100644
--- a/apps/wallet-mobile/ios/yoroiTests/Info.plist
+++ b/apps/wallet-mobile/ios/yoroiTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>471</string>
+	<string>476</string>
 </dict>
 </plist>

From eb0daa9e79867eb7a19f46cc518e826757e6b3df Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Tue, 31 Oct 2023 14:00:53 +0000
Subject: [PATCH 11/40] chore: set fefee wallet to openswap clearing

---
 apps/wallet-mobile/.env            | 2 +-
 apps/wallet-mobile/.env.nightly    | 2 +-
 apps/wallet-mobile/.env.production | 2 +-
 apps/wallet-mobile/.env.staging    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/wallet-mobile/.env b/apps/wallet-mobile/.env
index fc95b8231d..480d93a9c7 100644
--- a/apps/wallet-mobile/.env
+++ b/apps/wallet-mobile/.env
@@ -15,5 +15,5 @@ WALLET_2_MNEMONIC=abandon abandon abandon abandon abandon abandon abandon abando
 
 BANXA_TEST_WALLET=addr1qyfuspldlchc5kechfe5jzdrr9jms2s9w0tq4hggy9zgkhxssydveuc8xyx4zh27fwcmr62mraeezjwf24hzkyejwfmq7yptmd
 
-FRONTEND_FEE_ADDRESS_MAINNET=addr1q9uak5m68fe5hlpra0yzkly03fhwegd3znuqf8dax94xn8574qy7723r6rpcflu85nqvqh7l4dmzup950dvd0pp23aaq9j5xvh
+FRONTEND_FEE_ADDRESS_MAINNET=addr1q9ry6jfdgm0lcrtfpgwrgxg7qfahv80jlghhrthy6w8hmyjuw9ngccy937pm7yw0jjnxasm7hzxjrf8rzkqcj26788lqws5fke
 FRONTEND_FEE_ADDRESS_PREPROD=addr_test1qrgpjmyy8zk9nuza24a0f4e7mgp9gd6h3uayp0rqnjnkl54v4dlyj0kwfs0x4e38a7047lymzp37tx0y42glslcdtzhqzp57km
\ No newline at end of file
diff --git a/apps/wallet-mobile/.env.nightly b/apps/wallet-mobile/.env.nightly
index 39d18b37de..8ed075ee43 100644
--- a/apps/wallet-mobile/.env.nightly
+++ b/apps/wallet-mobile/.env.nightly
@@ -6,5 +6,5 @@ DISABLE_LOGBOX=true
 
 BANXA_TEST_WALLET=addr1qyfuspldlchc5kechfe5jzdrr9jms2s9w0tq4hggy9zgkhxssydveuc8xyx4zh27fwcmr62mraeezjwf24hzkyejwfmq7yptmd
 
-FRONTEND_FEE_ADDRESS_MAINNET=addr1q9uak5m68fe5hlpra0yzkly03fhwegd3znuqf8dax94xn8574qy7723r6rpcflu85nqvqh7l4dmzup950dvd0pp23aaq9j5xvh
+FRONTEND_FEE_ADDRESS_MAINNET=addr1q9ry6jfdgm0lcrtfpgwrgxg7qfahv80jlghhrthy6w8hmyjuw9ngccy937pm7yw0jjnxasm7hzxjrf8rzkqcj26788lqws5fke
 FRONTEND_FEE_ADDRESS_PREPROD=addr_test1qrgpjmyy8zk9nuza24a0f4e7mgp9gd6h3uayp0rqnjnkl54v4dlyj0kwfs0x4e38a7047lymzp37tx0y42glslcdtzhqzp57km
\ No newline at end of file
diff --git a/apps/wallet-mobile/.env.production b/apps/wallet-mobile/.env.production
index 54b1a6fbc6..1502fa04de 100644
--- a/apps/wallet-mobile/.env.production
+++ b/apps/wallet-mobile/.env.production
@@ -3,5 +3,5 @@ COMMIT=cc2ffa0d
 BUILD_VARIANT=PROD
 SENTRY_DSN=https://7f7c6cb60a6f429facd34f491dfc5133@o1138840.ingest.sentry.io/6783228
 
-FRONTEND_FEE_ADDRESS_MAINNET=addr1q9uak5m68fe5hlpra0yzkly03fhwegd3znuqf8dax94xn8574qy7723r6rpcflu85nqvqh7l4dmzup950dvd0pp23aaq9j5xvh
+FRONTEND_FEE_ADDRESS_MAINNET=addr1q9ry6jfdgm0lcrtfpgwrgxg7qfahv80jlghhrthy6w8hmyjuw9ngccy937pm7yw0jjnxasm7hzxjrf8rzkqcj26788lqws5fke
 FRONTEND_FEE_ADDRESS_PREPROD=addr_test1qrgpjmyy8zk9nuza24a0f4e7mgp9gd6h3uayp0rqnjnkl54v4dlyj0kwfs0x4e38a7047lymzp37tx0y42glslcdtzhqzp57km
\ No newline at end of file
diff --git a/apps/wallet-mobile/.env.staging b/apps/wallet-mobile/.env.staging
index bec45ac0ba..71dbc42e12 100644
--- a/apps/wallet-mobile/.env.staging
+++ b/apps/wallet-mobile/.env.staging
@@ -15,5 +15,5 @@ WALLET_2_MNEMONIC=abandon abandon abandon abandon abandon abandon abandon abando
 
 BANXA_TEST_WALLET=addr1qyfuspldlchc5kechfe5jzdrr9jms2s9w0tq4hggy9zgkhxssydveuc8xyx4zh27fwcmr62mraeezjwf24hzkyejwfmq7yptmd
 
-FRONTEND_FEE_ADDRESS_MAINNET=addr1q9uak5m68fe5hlpra0yzkly03fhwegd3znuqf8dax94xn8574qy7723r6rpcflu85nqvqh7l4dmzup950dvd0pp23aaq9j5xvh
+FRONTEND_FEE_ADDRESS_MAINNET=addr1q9ry6jfdgm0lcrtfpgwrgxg7qfahv80jlghhrthy6w8hmyjuw9ngccy937pm7yw0jjnxasm7hzxjrf8rzkqcj26788lqws5fke
 FRONTEND_FEE_ADDRESS_PREPROD=addr_test1qrgpjmyy8zk9nuza24a0f4e7mgp9gd6h3uayp0rqnjnkl54v4dlyj0kwfs0x4e38a7047lymzp37tx0y42glslcdtzhqzp57km
\ No newline at end of file

From a514b42cf5a57a345a7fabbbfd2ea31697f4d35e Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Tue, 31 Oct 2023 18:05:38 +0000
Subject: [PATCH 12/40] chore: bump csl to 5.1.3

---
 .tool-versions                    | 2 +-
 apps/wallet-mobile/.tool-versions | 2 +-
 apps/wallet-mobile/package.json   | 2 +-
 yarn.lock                         | 7 +++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index ae6b5dca0b..909950232f 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,5 +1,5 @@
 nodejs 16.19.0
-rust 1.65.0
+rust 1.69.0
 java adoptopenjdk-11.0.18+10
 ruby 2.7.6
 python 3.11.3
diff --git a/apps/wallet-mobile/.tool-versions b/apps/wallet-mobile/.tool-versions
index ae6b5dca0b..909950232f 100644
--- a/apps/wallet-mobile/.tool-versions
+++ b/apps/wallet-mobile/.tool-versions
@@ -1,5 +1,5 @@
 nodejs 16.19.0
-rust 1.65.0
+rust 1.69.0
 java adoptopenjdk-11.0.18+10
 ruby 2.7.6
 python 3.11.3
diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index 6e4bf2bfc5..279bf810fd 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -94,7 +94,7 @@
     "@emurgo/cip4-js": "1.0.7",
     "@emurgo/cross-csl-core": "^3.1.0",
     "@emurgo/cross-csl-mobile": "^3.1.0",
-    "@emurgo/csl-mobile-bridge": "^5.1.2",
+    "@emurgo/csl-mobile-bridge": "5.1.3-beta.2",
     "@emurgo/react-native-blockies-svg": "^0.0.2",
     "@emurgo/react-native-hid": "^5.15.6",
     "@emurgo/yoroi-lib": "^0.11.0",
diff --git a/yarn.lock b/yarn.lock
index cae3b61eb6..01d4326d5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2087,6 +2087,13 @@
     "@emurgo/cardano-serialization-lib-nodejs" "^11.5.0"
     "@emurgo/cross-csl-core" "^3.1.0"
 
+"@emurgo/csl-mobile-bridge@5.1.3-beta.2":
+  version "5.1.3-beta.2"
+  resolved "https://registry.yarnpkg.com/@emurgo/csl-mobile-bridge/-/csl-mobile-bridge-5.1.3-beta.2.tgz#d08f295ff9c51645d9cb46d774f5a5a69be50f57"
+  integrity sha512-z1eL71DpdyB0pm+2dVw8E1EWC3NmdSx45c3M/e5Yb7yqgBnH2GCJ6QKIHe/EREyZEfM5uOvXupWOyyMBaOtaUQ==
+  dependencies:
+    base-64 "0.1.0"
+
 "@emurgo/csl-mobile-bridge@^5.1.2":
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/@emurgo/csl-mobile-bridge/-/csl-mobile-bridge-5.1.2.tgz#726282a490cf39326135b22c0f4acaeb73ae3d73"

From e65ffa7a6c6aa77ef490f7e7b1e194493b56ec4c Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Tue, 31 Oct 2023 18:16:33 +0000
Subject: [PATCH 13/40] chore: bump version 4.23.0-rc.3 builds

---
 apps/wallet-mobile/.env                                | 2 +-
 apps/wallet-mobile/.env.nightly                        | 2 +-
 apps/wallet-mobile/.env.production                     | 2 +-
 apps/wallet-mobile/.env.staging                        | 2 +-
 apps/wallet-mobile/android/app/build.gradle            | 2 +-
 apps/wallet-mobile/ios/nightly.plist                   | 2 +-
 apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj | 8 ++++----
 apps/wallet-mobile/ios/yoroi/Info.plist                | 2 +-
 apps/wallet-mobile/ios/yoroiTests/Info.plist           | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/wallet-mobile/.env b/apps/wallet-mobile/.env
index 480d93a9c7..836951df7b 100644
--- a/apps/wallet-mobile/.env
+++ b/apps/wallet-mobile/.env
@@ -1,4 +1,4 @@
-COMMIT=cc2ffa0d
+COMMIT=85e6b822f
 
 BUILD_VARIANT=STAGING
 SENTRY_DSN=https://fb3745d47d994059917e358dae581466@o1138840.ingest.sentry.io/4505319746764800
diff --git a/apps/wallet-mobile/.env.nightly b/apps/wallet-mobile/.env.nightly
index 8ed075ee43..22cfc3733b 100644
--- a/apps/wallet-mobile/.env.nightly
+++ b/apps/wallet-mobile/.env.nightly
@@ -1,4 +1,4 @@
-COMMIT=cc2ffa0d
+COMMIT=85e6b822f
 
 BUILD_VARIANT=NIGHTLY
 SENTRY_DSN=https://59637d7dcb274b6a9e9f708e0082b3d5@o1138840.ingest.sentry.io/6260389
diff --git a/apps/wallet-mobile/.env.production b/apps/wallet-mobile/.env.production
index 1502fa04de..daeb2741d4 100644
--- a/apps/wallet-mobile/.env.production
+++ b/apps/wallet-mobile/.env.production
@@ -1,4 +1,4 @@
-COMMIT=cc2ffa0d
+COMMIT=85e6b822f
 
 BUILD_VARIANT=PROD
 SENTRY_DSN=https://7f7c6cb60a6f429facd34f491dfc5133@o1138840.ingest.sentry.io/6783228
diff --git a/apps/wallet-mobile/.env.staging b/apps/wallet-mobile/.env.staging
index 71dbc42e12..6d898318c0 100644
--- a/apps/wallet-mobile/.env.staging
+++ b/apps/wallet-mobile/.env.staging
@@ -1,4 +1,4 @@
-COMMIT=cc2ffa0d
+COMMIT=85e6b822f
 
 BUILD_VARIANT=STAGING
 SENTRY_DSN=https://fb3745d47d994059917e358dae581466@o1138840.ingest.sentry.io/4505319746764800
diff --git a/apps/wallet-mobile/android/app/build.gradle b/apps/wallet-mobile/android/app/build.gradle
index bd91906cfb..4539fc6653 100644
--- a/apps/wallet-mobile/android/app/build.gradle
+++ b/apps/wallet-mobile/android/app/build.gradle
@@ -108,7 +108,7 @@ android {
         applicationId "com.emurgo"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 533
+        versionCode 534
         versionName "4.23.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/apps/wallet-mobile/ios/nightly.plist b/apps/wallet-mobile/ios/nightly.plist
index afe0e01ebf..52fa41ed1f 100644
--- a/apps/wallet-mobile/ios/nightly.plist
+++ b/apps/wallet-mobile/ios/nightly.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>476</string>
+	<string>477</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
index a4684e9e4e..27d4d546d4 100644
--- a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
+++ b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
@@ -818,7 +818,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 476;
+				CURRENT_PROJECT_VERSION = 477;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				ENVFILE = "$(PODS_ROOT)/../../.env";
@@ -857,7 +857,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 476;
+				CURRENT_PROJECT_VERSION = 477;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.production";
 				INFOPLIST_FILE = yoroi/Info.plist;
@@ -1046,7 +1046,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 476;
+				CURRENT_PROJECT_VERSION = 477;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
@@ -1085,7 +1085,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 476;
+				CURRENT_PROJECT_VERSION = 477;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
 				INFOPLIST_FILE = nightly.plist;
diff --git a/apps/wallet-mobile/ios/yoroi/Info.plist b/apps/wallet-mobile/ios/yoroi/Info.plist
index 74bfff9977..8ed34f9d0c 100644
--- a/apps/wallet-mobile/ios/yoroi/Info.plist
+++ b/apps/wallet-mobile/ios/yoroi/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>476</string>
+	<string>477</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/apps/wallet-mobile/ios/yoroiTests/Info.plist b/apps/wallet-mobile/ios/yoroiTests/Info.plist
index 16b506add5..5cffa5de21 100644
--- a/apps/wallet-mobile/ios/yoroiTests/Info.plist
+++ b/apps/wallet-mobile/ios/yoroiTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>476</string>
+	<string>477</string>
 </dict>
 </plist>

From fe91efb36ba37d8601e12dab54abdeb208a8caa9 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Tue, 31 Oct 2023 22:24:07 +0000
Subject: [PATCH 14/40] chore: bump version 4.23.0-rc.4 builds

---
 apps/wallet-mobile/.env                                | 2 +-
 apps/wallet-mobile/.env.nightly                        | 2 +-
 apps/wallet-mobile/.env.production                     | 2 +-
 apps/wallet-mobile/.env.staging                        | 2 +-
 apps/wallet-mobile/android/app/build.gradle            | 2 +-
 apps/wallet-mobile/ios/nightly.plist                   | 2 +-
 apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj | 8 ++++----
 apps/wallet-mobile/ios/yoroi/Info.plist                | 2 +-
 apps/wallet-mobile/ios/yoroiTests/Info.plist           | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/wallet-mobile/.env b/apps/wallet-mobile/.env
index 836951df7b..9fe20e2b3c 100644
--- a/apps/wallet-mobile/.env
+++ b/apps/wallet-mobile/.env
@@ -1,4 +1,4 @@
-COMMIT=85e6b822f
+COMMIT=093dec95a
 
 BUILD_VARIANT=STAGING
 SENTRY_DSN=https://fb3745d47d994059917e358dae581466@o1138840.ingest.sentry.io/4505319746764800
diff --git a/apps/wallet-mobile/.env.nightly b/apps/wallet-mobile/.env.nightly
index 22cfc3733b..f01172cf46 100644
--- a/apps/wallet-mobile/.env.nightly
+++ b/apps/wallet-mobile/.env.nightly
@@ -1,4 +1,4 @@
-COMMIT=85e6b822f
+COMMIT=093dec95a
 
 BUILD_VARIANT=NIGHTLY
 SENTRY_DSN=https://59637d7dcb274b6a9e9f708e0082b3d5@o1138840.ingest.sentry.io/6260389
diff --git a/apps/wallet-mobile/.env.production b/apps/wallet-mobile/.env.production
index daeb2741d4..729f3ffb33 100644
--- a/apps/wallet-mobile/.env.production
+++ b/apps/wallet-mobile/.env.production
@@ -1,4 +1,4 @@
-COMMIT=85e6b822f
+COMMIT=093dec95a
 
 BUILD_VARIANT=PROD
 SENTRY_DSN=https://7f7c6cb60a6f429facd34f491dfc5133@o1138840.ingest.sentry.io/6783228
diff --git a/apps/wallet-mobile/.env.staging b/apps/wallet-mobile/.env.staging
index 6d898318c0..65dcd903dc 100644
--- a/apps/wallet-mobile/.env.staging
+++ b/apps/wallet-mobile/.env.staging
@@ -1,4 +1,4 @@
-COMMIT=85e6b822f
+COMMIT=093dec95a
 
 BUILD_VARIANT=STAGING
 SENTRY_DSN=https://fb3745d47d994059917e358dae581466@o1138840.ingest.sentry.io/4505319746764800
diff --git a/apps/wallet-mobile/android/app/build.gradle b/apps/wallet-mobile/android/app/build.gradle
index 4539fc6653..7d58744f73 100644
--- a/apps/wallet-mobile/android/app/build.gradle
+++ b/apps/wallet-mobile/android/app/build.gradle
@@ -108,7 +108,7 @@ android {
         applicationId "com.emurgo"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 534
+        versionCode 535
         versionName "4.23.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/apps/wallet-mobile/ios/nightly.plist b/apps/wallet-mobile/ios/nightly.plist
index 52fa41ed1f..958ae245ac 100644
--- a/apps/wallet-mobile/ios/nightly.plist
+++ b/apps/wallet-mobile/ios/nightly.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>477</string>
+	<string>478</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
index 27d4d546d4..2c726177eb 100644
--- a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
+++ b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
@@ -818,7 +818,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 477;
+				CURRENT_PROJECT_VERSION = 478;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				ENVFILE = "$(PODS_ROOT)/../../.env";
@@ -857,7 +857,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 477;
+				CURRENT_PROJECT_VERSION = 478;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.production";
 				INFOPLIST_FILE = yoroi/Info.plist;
@@ -1046,7 +1046,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 477;
+				CURRENT_PROJECT_VERSION = 478;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
@@ -1085,7 +1085,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 477;
+				CURRENT_PROJECT_VERSION = 478;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
 				INFOPLIST_FILE = nightly.plist;
diff --git a/apps/wallet-mobile/ios/yoroi/Info.plist b/apps/wallet-mobile/ios/yoroi/Info.plist
index 8ed34f9d0c..af6acf62e7 100644
--- a/apps/wallet-mobile/ios/yoroi/Info.plist
+++ b/apps/wallet-mobile/ios/yoroi/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>477</string>
+	<string>478</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/apps/wallet-mobile/ios/yoroiTests/Info.plist b/apps/wallet-mobile/ios/yoroiTests/Info.plist
index 5cffa5de21..7f73a4dcbe 100644
--- a/apps/wallet-mobile/ios/yoroiTests/Info.plist
+++ b/apps/wallet-mobile/ios/yoroiTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>477</string>
+	<string>478</string>
 </dict>
 </plist>

From ef30d8b41d6a6270f9b83e9021c80deea1e9a65f Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Wed, 1 Nov 2023 08:23:55 +0000
Subject: [PATCH 15/40] chore: bump csl to 5.1.3

---
 apps/wallet-mobile/package.json | 2 +-
 yarn.lock                       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
index 279bf810fd..9fa100f839 100644
--- a/apps/wallet-mobile/package.json
+++ b/apps/wallet-mobile/package.json
@@ -94,7 +94,7 @@
     "@emurgo/cip4-js": "1.0.7",
     "@emurgo/cross-csl-core": "^3.1.0",
     "@emurgo/cross-csl-mobile": "^3.1.0",
-    "@emurgo/csl-mobile-bridge": "5.1.3-beta.2",
+    "@emurgo/csl-mobile-bridge": "5.1.3",
     "@emurgo/react-native-blockies-svg": "^0.0.2",
     "@emurgo/react-native-hid": "^5.15.6",
     "@emurgo/yoroi-lib": "^0.11.0",
diff --git a/yarn.lock b/yarn.lock
index 01d4326d5b..8aff31d4be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2087,10 +2087,10 @@
     "@emurgo/cardano-serialization-lib-nodejs" "^11.5.0"
     "@emurgo/cross-csl-core" "^3.1.0"
 
-"@emurgo/csl-mobile-bridge@5.1.3-beta.2":
-  version "5.1.3-beta.2"
-  resolved "https://registry.yarnpkg.com/@emurgo/csl-mobile-bridge/-/csl-mobile-bridge-5.1.3-beta.2.tgz#d08f295ff9c51645d9cb46d774f5a5a69be50f57"
-  integrity sha512-z1eL71DpdyB0pm+2dVw8E1EWC3NmdSx45c3M/e5Yb7yqgBnH2GCJ6QKIHe/EREyZEfM5uOvXupWOyyMBaOtaUQ==
+"@emurgo/csl-mobile-bridge@5.1.3":
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/@emurgo/csl-mobile-bridge/-/csl-mobile-bridge-5.1.3.tgz#91515b34fd8e4fbf507520690258d83a1e94f0d2"
+  integrity sha512-3cxjvlNJ6p9jn7GlJDcO3j8W1B/F6oLvb71TPWtXfS5/kp9iasUZAX0vg5m5X8YH7LAqZzickOoYd5ZWGO3ehQ==
   dependencies:
     base-64 "0.1.0"
 

From e129d898b919059bb04ffe9ffb63b50037940b32 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Wed, 1 Nov 2023 13:21:34 +0000
Subject: [PATCH 16/40] chore: bump version 4.23.0-rc.5 builds

---
 apps/wallet-mobile/android/app/build.gradle            | 2 +-
 apps/wallet-mobile/ios/nightly.plist                   | 2 +-
 apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj | 8 ++++----
 apps/wallet-mobile/ios/yoroi/Info.plist                | 2 +-
 apps/wallet-mobile/ios/yoroiTests/Info.plist           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/wallet-mobile/android/app/build.gradle b/apps/wallet-mobile/android/app/build.gradle
index 7d58744f73..2e5ce73b2d 100644
--- a/apps/wallet-mobile/android/app/build.gradle
+++ b/apps/wallet-mobile/android/app/build.gradle
@@ -108,7 +108,7 @@ android {
         applicationId "com.emurgo"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 535
+        versionCode 536
         versionName "4.23.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/apps/wallet-mobile/ios/nightly.plist b/apps/wallet-mobile/ios/nightly.plist
index 958ae245ac..9208f17370 100644
--- a/apps/wallet-mobile/ios/nightly.plist
+++ b/apps/wallet-mobile/ios/nightly.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>478</string>
+	<string>479</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
index 2c726177eb..03dd1f4023 100644
--- a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
+++ b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
@@ -818,7 +818,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 478;
+				CURRENT_PROJECT_VERSION = 479;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				ENVFILE = "$(PODS_ROOT)/../../.env";
@@ -857,7 +857,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 478;
+				CURRENT_PROJECT_VERSION = 479;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.production";
 				INFOPLIST_FILE = yoroi/Info.plist;
@@ -1046,7 +1046,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 478;
+				CURRENT_PROJECT_VERSION = 479;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
@@ -1085,7 +1085,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 478;
+				CURRENT_PROJECT_VERSION = 479;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
 				INFOPLIST_FILE = nightly.plist;
diff --git a/apps/wallet-mobile/ios/yoroi/Info.plist b/apps/wallet-mobile/ios/yoroi/Info.plist
index af6acf62e7..147e2e7c00 100644
--- a/apps/wallet-mobile/ios/yoroi/Info.plist
+++ b/apps/wallet-mobile/ios/yoroi/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>478</string>
+	<string>479</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/apps/wallet-mobile/ios/yoroiTests/Info.plist b/apps/wallet-mobile/ios/yoroiTests/Info.plist
index 7f73a4dcbe..abd307a5f5 100644
--- a/apps/wallet-mobile/ios/yoroiTests/Info.plist
+++ b/apps/wallet-mobile/ios/yoroiTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>478</string>
+	<string>479</string>
 </dict>
 </plist>

From 7e2ee652bb52cf141996dc1728f7d441fe9ab0b1 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Wed, 1 Nov 2023 18:29:12 +0000
Subject: [PATCH 17/40] chore: podfile csl

---
 apps/wallet-mobile/ios/Podfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/wallet-mobile/ios/Podfile.lock b/apps/wallet-mobile/ios/Podfile.lock
index f4adb7585a..ed4c82472f 100644
--- a/apps/wallet-mobile/ios/Podfile.lock
+++ b/apps/wallet-mobile/ios/Podfile.lock
@@ -383,7 +383,7 @@ PODS:
     - react-native-config/App (= 1.5.1)
   - react-native-config/App (1.5.1):
     - React-Core
-  - react-native-haskell-shelley (5.1.2):
+  - react-native-haskell-shelley (5.1.3):
     - React
   - react-native-pager-view (6.2.0):
     - React-Core
@@ -895,7 +895,7 @@ SPEC CHECKSUMS:
   react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
   react-native-ble-plx: f10240444452dfb2d2a13a0e4f58d7783e92d76e
   react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8
-  react-native-haskell-shelley: 8fded9eb467321c6f3d9ceaf5aaec20ca7304003
+  react-native-haskell-shelley: 92544de7277b53cda2393528d530b526c81b48a6
   react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df
   react-native-quick-base64: 62290829c619fbabca4c41cfec75ae759d08fc1c
   react-native-randombytes: b6677f7d495c27e9ee0dbd77ebc97b3c59173729

From 1d6d3ab41f3f1de56daa680957b8a95b2c5527e1 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Wed, 1 Nov 2023 20:54:47 +0000
Subject: [PATCH 18/40] chore: bump version 4.23.0-rc.6 builds

---
 apps/wallet-mobile/android/app/build.gradle            | 2 +-
 apps/wallet-mobile/ios/nightly.plist                   | 2 +-
 apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj | 8 ++++----
 apps/wallet-mobile/ios/yoroi/Info.plist                | 2 +-
 apps/wallet-mobile/ios/yoroiTests/Info.plist           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/wallet-mobile/android/app/build.gradle b/apps/wallet-mobile/android/app/build.gradle
index 2e5ce73b2d..da4c17e7de 100644
--- a/apps/wallet-mobile/android/app/build.gradle
+++ b/apps/wallet-mobile/android/app/build.gradle
@@ -108,7 +108,7 @@ android {
         applicationId "com.emurgo"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 536
+        versionCode 537
         versionName "4.23.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/apps/wallet-mobile/ios/nightly.plist b/apps/wallet-mobile/ios/nightly.plist
index 9208f17370..783ff68741 100644
--- a/apps/wallet-mobile/ios/nightly.plist
+++ b/apps/wallet-mobile/ios/nightly.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>479</string>
+	<string>480</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
index 03dd1f4023..966c1153a7 100644
--- a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
+++ b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
@@ -818,7 +818,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 479;
+				CURRENT_PROJECT_VERSION = 480;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				ENVFILE = "$(PODS_ROOT)/../../.env";
@@ -857,7 +857,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 479;
+				CURRENT_PROJECT_VERSION = 480;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.production";
 				INFOPLIST_FILE = yoroi/Info.plist;
@@ -1046,7 +1046,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 479;
+				CURRENT_PROJECT_VERSION = 480;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
@@ -1085,7 +1085,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-nightly";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 479;
+				CURRENT_PROJECT_VERSION = 480;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
 				INFOPLIST_FILE = nightly.plist;
diff --git a/apps/wallet-mobile/ios/yoroi/Info.plist b/apps/wallet-mobile/ios/yoroi/Info.plist
index 147e2e7c00..ec0d81f574 100644
--- a/apps/wallet-mobile/ios/yoroi/Info.plist
+++ b/apps/wallet-mobile/ios/yoroi/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>479</string>
+	<string>480</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/apps/wallet-mobile/ios/yoroiTests/Info.plist b/apps/wallet-mobile/ios/yoroiTests/Info.plist
index abd307a5f5..271a947c99 100644
--- a/apps/wallet-mobile/ios/yoroiTests/Info.plist
+++ b/apps/wallet-mobile/ios/yoroiTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>479</string>
+	<string>480</string>
 </dict>
 </plist>

From 0b299943733bd7f17693c0f3b2a028edb845e08b Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Thu, 2 Nov 2023 15:26:06 +0000
Subject: [PATCH 19/40] chore: upd Podfile

---
 apps/wallet-mobile/ios/Podfile.lock | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/wallet-mobile/ios/Podfile.lock b/apps/wallet-mobile/ios/Podfile.lock
index ed4c82472f..b789250ff4 100644
--- a/apps/wallet-mobile/ios/Podfile.lock
+++ b/apps/wallet-mobile/ios/Podfile.lock
@@ -501,6 +501,8 @@ PODS:
     - React-Core
   - RNKeychain (7.0.0):
     - React-Core
+  - RNLocalize (3.0.2):
+    - React-Core
   - RNPermissions (3.8.4):
     - React-Core
   - RNReanimated (3.3.0):
@@ -651,6 +653,7 @@ DEPENDENCIES:
   - "RNFlashList (from `../../../node_modules/@shopify/flash-list`)"
   - RNGestureHandler (from `../../../node_modules/react-native-gesture-handler`)
   - RNKeychain (from `../../../node_modules/react-native-keychain`)
+  - RNLocalize (from `../../../node_modules/react-native-localize`)
   - RNPermissions (from `../../../node_modules/react-native-permissions`)
   - RNReanimated (from `../../../node_modules/react-native-reanimated`)
   - RNScreens (from `../../../node_modules/react-native-screens`)
@@ -825,6 +828,8 @@ EXTERNAL SOURCES:
     :path: "../../../node_modules/react-native-gesture-handler"
   RNKeychain:
     :path: "../../../node_modules/react-native-keychain"
+  RNLocalize:
+    :path: "../../../node_modules/react-native-localize"
   RNPermissions:
     :path: "../../../node_modules/react-native-permissions"
   RNReanimated:
@@ -925,6 +930,7 @@ SPEC CHECKSUMS:
   RNFlashList: ade81b4e928ebd585dd492014d40fb8d0e848aab
   RNGestureHandler: dec4645026e7401a0899f2846d864403478ff6a5
   RNKeychain: f75b8c8b2f17d3b2aa1f25b4a0ac5b83d947ff8f
+  RNLocalize: dbea38dcb344bf80ff18a1757b1becf11f70cae4
   RNPermissions: f1b49dd05fa9b83993cd05a9ee115247944d8f1a
   RNReanimated: d6b4b867b6d1ee0798f5fb372708fa4bb8d66029
   RNScreens: 50ffe2fa2342eabb2d0afbe19f7c1af286bc7fb3

From 805c8552be51460218ccc9217638432a50924d00 Mon Sep 17 00:00:00 2001
From: Michal <miso.szorad@gmail.com>
Date: Fri, 3 Nov 2023 15:00:57 +0100
Subject: [PATCH 20/40] fix(slippage): Increase bottom padding in slippage
 warning (#2869)

---
 .../Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx   | 2 +-
 .../CreateOrder/SlippageWarning/SlippageWarning.tsx             | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx
index 2c656a6715..341f3f7c23 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx
@@ -229,7 +229,7 @@ export const CreateOrder = () => {
           slippage={orderData.slippage}
           ticker={buyTokenInfo.ticker ?? buyTokenInfo.name ?? ''}
         />,
-        300,
+        350,
       )
       return
     }
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.tsx
index 721e012c06..bc82263b97 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/SlippageWarning/SlippageWarning.tsx
@@ -62,6 +62,8 @@ export const SlippageWarning = ({onSubmit, slippage, ticker}: Props) => {
           containerStyle={styles.buttonContainer}
         />
       </View>
+
+      <Spacer height={23} />
     </View>
   )
 }

From 1ed4a75a47d712dc89516ae1a4b3199d0de280b9 Mon Sep 17 00:00:00 2001
From: Michal <miso.szorad@gmail.com>
Date: Fri, 3 Nov 2023 16:22:55 +0100
Subject: [PATCH 21/40] fix(swap): Change order details font sizes (#2871)

---
 .../StartSwapScreen/CreateOrder/EditPool/ShowPoolActions.tsx  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditPool/ShowPoolActions.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditPool/ShowPoolActions.tsx
index effddccdde..e8075dd867 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditPool/ShowPoolActions.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditPool/ShowPoolActions.tsx
@@ -272,10 +272,14 @@ const styles = StyleSheet.create({
     color: COLORS.BLACK,
     fontWeight: '400',
     fontFamily: 'Rubik-Regular',
+    fontSize: 16,
+    lineHeight: 24,
   },
   bolder: {
     color: COLORS.BLACK,
     fontWeight: '500',
     fontFamily: 'Rubik-Medium',
+    fontSize: 16,
+    lineHeight: 24,
   },
 })

From 12f5c076a4a3dcdbfd7342ddb3509c1bf9be1de8 Mon Sep 17 00:00:00 2001
From: Michal <miso.szorad@gmail.com>
Date: Fri, 3 Nov 2023 18:48:34 +0100
Subject: [PATCH 22/40] fix(banxa): Fix modal content line height and modal
 height (#2870)

---
 .../src/TxHistory/ActionsBanner.tsx           | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx b/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx
index 9f3ca3883d..3c57f694e2 100644
--- a/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx
+++ b/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx
@@ -1,7 +1,7 @@
 import {useNavigation} from '@react-navigation/native'
 import {banxaModuleMaker} from '@yoroi/banxa'
 import {useSwap} from '@yoroi/swap'
-import React from 'react'
+import React, {ReactNode} from 'react'
 import {useIntl} from 'react-intl'
 import {Linking, StyleSheet, TouchableOpacity, View} from 'react-native'
 
@@ -41,10 +41,19 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
 
   const handleOnBuy = () => {
     track.walletPageExchangeBottomSheetClicked()
+
+    const modalHeight = 300
+    const modalTextFormattingOptions: BuyInfoFormattingOptions = {
+      b: (text) => <Text style={[styles.buyInfo, styles.bold]}>{text}</Text>,
+      textComponent: (text) => <Text style={styles.buyInfo}>{text}</Text>,
+    }
+
     openModal(
       strings.buyTitle,
       <View style={styles.buyModalContent}>
-        <Text style={styles.buyInfo}>{strings.buyInfo}</Text>
+        <Text style={styles.buyInfo}>{strings.buyInfo(modalTextFormattingOptions)}</Text>
+
+        <Spacer height={32} />
 
         <Button
           shelleyTheme
@@ -68,7 +77,10 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
             closeModal()
           }}
         />
+
+        <Spacer height={23} />
       </View>,
+      modalHeight,
     )
   }
 
@@ -200,31 +212,36 @@ const styles = StyleSheet.create({
   buyInfo: {
     fontSize: 16,
     color: '#000000',
-    fontFamily: 'Rubik',
+    fontFamily: 'Rubik-Regular',
     lineHeight: 24,
   },
+  bold: {
+    fontWeight: '500',
+    fontFamily: 'Rubik-Medium',
+  },
   disabled: {
     opacity: 0.5,
   },
-  buyModalContent: {flex: 1, flexDirection: 'column', justifyContent: 'space-between', paddingBottom: 26},
+  buyModalContent: {flex: 1, flexDirection: 'column'},
 })
 
 const useStrings = () => {
   const intl = useIntl()
-  const bold = {b: (text) => <Text bold>{text}</Text>}
 
   return {
     sendLabel: intl.formatMessage(actionMessages.send),
     receiveLabel: intl.formatMessage(actionMessages.receive),
     buyLabel: intl.formatMessage(actionMessages.buy),
     buyTitle: intl.formatMessage(actionMessages.buyTitle),
-    buyInfo: intl.formatMessage(actionMessages.buyInfo, bold),
+    buyInfo: (options: BuyInfoFormattingOptions) => intl.formatMessage(actionMessages.buyInfo, options),
     proceed: intl.formatMessage(actionMessages.proceed),
     swapLabel: intl.formatMessage(actionMessages.swap),
     messageBuy: intl.formatMessage(actionMessages.soon),
   }
 }
 
+type BuyInfoFormattingOptions = Record<'b' | 'textComponent', (text: ReactNode[]) => ReactNode>
+
 const useNavigateTo = () => {
   const navigation = useNavigation<TxHistoryRouteNavigation>()
 

From bf7c8b9ffbc7af39f11072fa05902fa20370e727 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Tue, 7 Nov 2023 09:51:02 +0100
Subject: [PATCH 23/40] fix: Incorrect change pair order behaviour (#2872)

---
 .../Swap/common/AmountCard/AmountCard.tsx     |  2 +-
 .../features/Swap/common/SwapFormProvider.tsx | 19 +++++++++++++------
 .../EditBuyAmount/EditBuyAmount.tsx           |  2 --
 .../EditSellAmount/EditSellAmount.tsx         |  1 -
 .../Swap/common/AmountCard/AmountCard.json    |  8 ++++----
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx b/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
index 08cc0d5236..631f68eecf 100644
--- a/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
+++ b/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
@@ -73,7 +73,7 @@ export const AmountCard = ({
               style={styles.amountInput}
               underlineColorAndroid="transparent"
               ref={inputRef}
-              editable={inputEditable}
+              editable={inputEditable && touched}
               selectTextOnFocus
               onFocus={() => setIsFocused(true)}
               onBlur={() => setIsFocused(false)}
diff --git a/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx b/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx
index 9c788cc4e2..8955518940 100644
--- a/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx
+++ b/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx
@@ -61,11 +61,15 @@ export const SwapFormProvider = ({
     ...defaultState,
     buyQuantity: {
       ...defaultState.buyQuantity,
-      displayValue: Quantities.format(buyQuantity, buyTokenInfo.decimals ?? 0),
+      ...(defaultState.buyQuantity.isTouched && {
+        displayValue: Quantities.format(buyQuantity, buyTokenInfo.decimals ?? 0),
+      }),
     },
     sellQuantity: {
       ...defaultState.sellQuantity,
-      displayValue: Quantities.format(sellQuantity, sellTokenInfo.decimals ?? 0),
+      ...(defaultState.sellQuantity.isTouched && {
+        displayValue: Quantities.format(sellQuantity, sellTokenInfo.decimals ?? 0),
+      }),
     },
     ...initialState,
   })
@@ -196,8 +200,9 @@ export const SwapFormProvider = ({
     }
 
     if (
-      (!Quantities.isZero(buyQuantity) && !hasBuyTokenSupply) ||
-      (state.sellQuantity.isTouched && state.buyQuantity.isTouched && pool === undefined)
+      state.sellQuantity.isTouched &&
+      state.buyQuantity.isTouched &&
+      (pool === undefined || (!Quantities.isZero(buyQuantity) && !hasBuyTokenSupply))
     ) {
       actions.buyAmountErrorChanged(strings.notEnoughSupply)
       return
@@ -331,6 +336,8 @@ const swapFormReducer = (state: SwapFormState, action: SwapFormAction) => {
       case SwapFormActionType.SwitchTouched:
         draft.sellQuantity.isTouched = state.buyQuantity.isTouched
         draft.buyQuantity.isTouched = state.sellQuantity.isTouched
+        draft.sellQuantity.displayValue = ''
+        draft.buyQuantity.displayValue = ''
         draft.sellQuantity.error = undefined
         draft.buyQuantity.error = undefined
 
@@ -358,12 +365,12 @@ const swapFormReducer = (state: SwapFormState, action: SwapFormAction) => {
         break
 
       case SwapFormActionType.SellInputValueChanged:
-        draft.sellQuantity.displayValue = action.value
+        if (state.sellQuantity.isTouched) draft.sellQuantity.displayValue = action.value
 
         break
 
       case SwapFormActionType.BuyInputValueChanged:
-        draft.buyQuantity.displayValue = action.value
+        if (state.buyQuantity.isTouched) draft.buyQuantity.displayValue = action.value
 
         break
 
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/EditBuyAmount.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/EditBuyAmount.tsx
index 2aac51f319..1a8f599e4b 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/EditBuyAmount.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/EditBuyAmount.tsx
@@ -18,7 +18,6 @@ export const EditBuyAmount = () => {
     onChangeBuyQuantity,
     buyInputRef,
   } = useSwapForm()
-  const pool = orderData.selectedPoolCalculation?.pool
   const {tokenId} = orderData.amounts.buy
   const balance = useBalance({wallet, tokenId})
 
@@ -32,7 +31,6 @@ export const EditBuyAmount = () => {
       navigateTo={navigate.selectBuyToken}
       touched={isBuyTouched}
       inputRef={buyInputRef}
-      inputEditable={pool !== undefined}
       error={buyError}
     />
   )
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSellAmount/EditSellAmount.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSellAmount/EditSellAmount.tsx
index 76722e1af2..9067ac05f9 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSellAmount/EditSellAmount.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSellAmount/EditSellAmount.tsx
@@ -32,7 +32,6 @@ export const EditSellAmount = () => {
       touched={isSellTouched}
       inputRef={sellInputRef}
       error={error}
-      // inputEditable={orderData.selectedPoolCalculation?.pool !== undefined}
     />
   )
 }
diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
index d127348e65..56d4732094 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 128,
       "column": 15,
-      "index": 4075
+      "index": 4086
     },
     "end": {
       "line": 131,
       "column": 3,
-      "index": 4158
+      "index": 4169
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 132,
       "column": 18,
-      "index": 4178
+      "index": 4189
     },
     "end": {
       "line": 135,
       "column": 3,
-      "index": 4267
+      "index": 4278
     }
   }
 ]
\ No newline at end of file

From 0c59d94c8555b468db2ab98571d38bce49c0eaf2 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Tue, 7 Nov 2023 10:05:26 +0100
Subject: [PATCH 24/40] fix: Reset form errors when changing token (#2873)

---
 .../wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx b/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx
index 8955518940..eda5b3bb6a 100644
--- a/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx
+++ b/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx
@@ -325,11 +325,13 @@ const swapFormReducer = (state: SwapFormState, action: SwapFormAction) => {
     switch (action.type) {
       case SwapFormActionType.SellTouched:
         draft.sellQuantity.isTouched = true
+        draft.sellQuantity.error = undefined
 
         break
 
       case SwapFormActionType.BuyTouched:
         draft.buyQuantity.isTouched = true
+        draft.buyQuantity.error = undefined
 
         break
 

From 1c0366bfce58d98d532cc791f9c7da83522b21f7 Mon Sep 17 00:00:00 2001
From: Michal <miso.szorad@gmail.com>
Date: Tue, 7 Nov 2023 14:38:34 +0000
Subject: [PATCH 25/40] feat(screen-share): Create screen-share setting (#2879)

---
 .../main/java/com/emurgo/MainActivity.java    |   1 -
 apps/wallet-mobile/src/Catalyst/QrCode.tsx    |  22 +--
 apps/wallet-mobile/src/InitApp.tsx            |   5 +-
 .../src/components/Icon/Icon.stories.tsx      |   2 +
 .../src/components/Icon/Share.tsx             |  25 +++
 .../src/components/Icon/index.ts              |   2 +
 .../ApplicationSettingsScreen.tsx             |  47 +++++-
 .../Settings/ScreenShare/ScreenShare.ts       |  63 ++++++++
 .../features/Settings/ScreenShare/index.ts    |   1 +
 .../wallet-mobile/src/i18n/locales/en-US.json |   2 +
 apps/wallet-mobile/src/utils/utils.ts         |  21 +++
 .../messages/src/Catalyst/QrCode.json         |  48 +++---
 .../ApplicationSettingsScreen.json            | 150 +++++++++++-------
 13 files changed, 282 insertions(+), 107 deletions(-)
 create mode 100644 apps/wallet-mobile/src/components/Icon/Share.tsx
 create mode 100644 apps/wallet-mobile/src/features/Settings/ScreenShare/ScreenShare.ts
 create mode 100644 apps/wallet-mobile/src/features/Settings/ScreenShare/index.ts

diff --git a/apps/wallet-mobile/android/app/src/main/java/com/emurgo/MainActivity.java b/apps/wallet-mobile/android/app/src/main/java/com/emurgo/MainActivity.java
index 52ea598fe1..f816cf7293 100644
--- a/apps/wallet-mobile/android/app/src/main/java/com/emurgo/MainActivity.java
+++ b/apps/wallet-mobile/android/app/src/main/java/com/emurgo/MainActivity.java
@@ -27,7 +27,6 @@ protected String getMainComponentName() {
   protected void onCreate(Bundle savedInstanceState) {
     RNBootSplash.init(this);
     super.onCreate(savedInstanceState); // or super.onCreate(null) with react-native-screens
-    getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
   }
 
   /**
diff --git a/apps/wallet-mobile/src/Catalyst/QrCode.tsx b/apps/wallet-mobile/src/Catalyst/QrCode.tsx
index e02815693e..6375e5114d 100644
--- a/apps/wallet-mobile/src/Catalyst/QrCode.tsx
+++ b/apps/wallet-mobile/src/Catalyst/QrCode.tsx
@@ -1,7 +1,6 @@
-import {useFocusEffect} from '@react-navigation/native'
 import React, {useState} from 'react'
 import {defineMessages, useIntl} from 'react-intl'
-import {NativeModules, Platform, ScrollView, StyleSheet, View} from 'react-native'
+import {ScrollView, StyleSheet, View} from 'react-native'
 import QRCodeSVG from 'react-native-qrcode-svg'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
@@ -9,15 +8,14 @@ import {Button, CopyButton, ProgressStep, Spacer, Text} from '../components'
 import {confirmationMessages} from '../i18n/global-messages'
 import {useBlockGoBack} from '../navigation'
 import {COLORS} from '../theme'
+import {useAllowScreenshots} from '../utils'
 import {Actions, Description, Title} from './components'
 import {useCountdown} from './hooks'
 import {VotingRegistrationBackupCheckModal} from './VotingRegistrationBackupCheckModal'
 
-const {FlagSecure} = NativeModules
-
 export const QrCode = ({onNext, votingKeyEncrypted}: {onNext: () => void; votingKeyEncrypted: string}) => {
   useBlockGoBack()
-  useAllowScreenshot()
+  useAllowScreenshots()
   const strings = useStrings()
 
   const [showBackupWarningModal, setShowBackupWarningModal] = useState(false)
@@ -165,17 +163,3 @@ const useStrings = () => {
     completeButton: intl.formatMessage(confirmationMessages.commonButtons.completeButton),
   }
 }
-
-const useAllowScreenshot = () => {
-  useFocusEffect(
-    React.useCallback(() => {
-      if (Platform.OS === 'android') {
-        FlagSecure.deactivate()
-
-        return () => {
-          FlagSecure.activate()
-        }
-      }
-    }, []),
-  )
-}
diff --git a/apps/wallet-mobile/src/InitApp.tsx b/apps/wallet-mobile/src/InitApp.tsx
index f827feccc8..4a48cc64e3 100644
--- a/apps/wallet-mobile/src/InitApp.tsx
+++ b/apps/wallet-mobile/src/InitApp.tsx
@@ -7,6 +7,7 @@ import * as Sentry from 'sentry-expo'
 import uuid from 'uuid'
 
 import {AppNavigator} from './AppNavigator'
+import {useInitScreenShare} from './features/Settings/ScreenShare'
 import {CONFIG, isProduction} from './legacy/config'
 import {useCrashReportsEnabled} from './yoroi-wallets/hooks'
 import {walletManager} from './yoroi-wallets/walletManager'
@@ -31,6 +32,8 @@ const useInitApp = () => {
   const storage = useStorage()
   const crashReportsEnabled = useCrashReportsEnabled()
 
+  const {initialised: screenShareInitialized} = useInitScreenShare()
+
   useInitSentry({enabled: crashReportsEnabled})
 
   useEffect(() => {
@@ -42,7 +45,7 @@ const useInitApp = () => {
     load()
   }, [storage])
 
-  return loaded
+  return loaded && screenShareInitialized
 }
 
 const initInstallationId = async (storage: App.Storage) => {
diff --git a/apps/wallet-mobile/src/components/Icon/Icon.stories.tsx b/apps/wallet-mobile/src/components/Icon/Icon.stories.tsx
index a42ed33581..f8d556d942 100644
--- a/apps/wallet-mobile/src/components/Icon/Icon.stories.tsx
+++ b/apps/wallet-mobile/src/components/Icon/Icon.stories.tsx
@@ -232,6 +232,8 @@ storiesOf('Icon', module).add('Gallery', () => {
         <Item icon={<Icon.Resync />} title="Resync" />
 
         <Item icon={<Icon.Danger />} title="Danger" />
+
+        <Item icon={<Icon.Share />} title="Share" />
       </ScrollView>
     </FilterProvider>
   )
diff --git a/apps/wallet-mobile/src/components/Icon/Share.tsx b/apps/wallet-mobile/src/components/Icon/Share.tsx
new file mode 100644
index 0000000000..370cf830c3
--- /dev/null
+++ b/apps/wallet-mobile/src/components/Icon/Share.tsx
@@ -0,0 +1,25 @@
+import React from 'react'
+import Svg, {Path} from 'react-native-svg'
+
+type Props = {
+  size?: number
+  color?: string
+}
+
+export const Share = ({size = 36, color = '#000000'}: Props) => {
+  return (
+    <Svg width={size} height={size} viewBox="0 0 24 25" fill="none">
+      <Path
+        d="M11.293 8.793a1 1 0 011.414 0l3 3a1 1 0 01-1.414 1.414L13 11.914V15.5a1 1 0 11-2 0v-3.586l-1.293 1.293a1 1 0 01-1.414-1.414l3-3z"
+        fill={color}
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M4 5.3c0-1.643 1.445-2.8 3-2.8h10c1.555 0 3 1.157 3 2.8v14.4c0 1.643-1.445 2.8-3 2.8H7c-1.555 0-3-1.157-3-2.8V5.3zm3-.8c-.654 0-1 .455-1 .8v14.4c0 .345.346.8 1 .8h10c.654 0 1-.455 1-.8V5.3c0-.345-.346-.8-1-.8H7z"
+        fill={color}
+      />
+    </Svg>
+  )
+}
diff --git a/apps/wallet-mobile/src/components/Icon/index.ts b/apps/wallet-mobile/src/components/Icon/index.ts
index 3d4835a0a6..86939659db 100644
--- a/apps/wallet-mobile/src/components/Icon/index.ts
+++ b/apps/wallet-mobile/src/components/Icon/index.ts
@@ -68,6 +68,7 @@ import {RewardWithdrawn} from './RewardWithdrawn'
 import {Sandbox} from './Sandbox'
 import {Send} from './Send'
 import {Settings} from './Settings'
+import {Share} from './Share'
 import {SliderSettings} from './SliderSettings'
 import {SortTable} from './SortTable'
 import {SpectrumSwap} from './SpectrumSwap'
@@ -206,4 +207,5 @@ export const Icon = {
   VyfiSwap,
   SpectrumSwap,
   Danger,
+  Share,
 }
diff --git a/apps/wallet-mobile/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx b/apps/wallet-mobile/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx
index a6362e1073..f09a0b108b 100644
--- a/apps/wallet-mobile/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx
@@ -1,17 +1,19 @@
+import {isBoolean} from '@yoroi/common'
 import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
-import {ScrollView, StyleSheet, Switch} from 'react-native'
+import {Platform, ScrollView, StyleSheet, Switch} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
 import {Icon, Spacer, StatusBar} from '../../../components'
 import {useLanguage} from '../../../i18n'
-import {CONFIG} from '../../../legacy/config'
+import {CONFIG, isProduction} from '../../../legacy/config'
 import {lightPalette} from '../../../theme'
 import {useAuthOsEnabled, useAuthSetting, useAuthWithOs} from '../../../yoroi-wallets/auth'
 import {useCrashReports} from '../../../yoroi-wallets/hooks'
 import {usePrivacyMode} from '../../Settings/PrivacyMode/PrivacyMode'
 import {useNavigateTo} from '../common/navigation'
 import {useCurrencyContext} from '../Currency'
+import {useChangeScreenShareSetting, useScreenShareSettingEnabled} from '../ScreenShare'
 import {NavigatedSettingsItem, SettingsItem, SettingsSection} from '../SettingsItems'
 
 const iconProps = {
@@ -34,6 +36,10 @@ export const ApplicationSettingsScreen = () => {
   const navigateTo = useNavigateTo()
   const {authWithOs} = useAuthWithOs({onSuccess: navigateTo.enableLoginWithPin})
 
+  const {data: screenShareEnabled} = useScreenShareSettingEnabled()
+
+  const displayScreenShareSetting = Platform.OS === 'android' && !isProduction()
+
   const onToggleAuthWithOs = () => {
     if (authSetting === 'os') {
       authWithOs()
@@ -125,6 +131,19 @@ export const ApplicationSettingsScreen = () => {
           >
             <CrashReportsSwitch crashReportEnabled={crashReportEnabled} />
           </SettingsItem>
+
+          {displayScreenShareSetting && (
+            <SettingsItem
+              icon={<Icon.Share {...iconProps} />}
+              label={strings.screenSharing}
+              info={strings.screenSharingInfo}
+            >
+              <ScreenSharingSwitch
+                screenSharingEnabled={screenShareEnabled ?? false}
+                disabled={!isBoolean(screenShareEnabled)}
+              />
+            </SettingsItem>
+          )}
         </SettingsSection>
 
         <Spacer height={24} />
@@ -173,6 +192,19 @@ const CrashReportsSwitch = ({crashReportEnabled}: {crashReportEnabled: boolean})
   return <Switch value={isLocalEnabled} onValueChange={onToggleCrashReports} disabled={CONFIG.FORCE_CRASH_REPORTS} />
 }
 
+// to avoid switch jumps
+const ScreenSharingSwitch = ({screenSharingEnabled, disabled}: {screenSharingEnabled: boolean; disabled?: boolean}) => {
+  const {changeScreenShareSettings} = useChangeScreenShareSetting()
+  const [isLocalEnabled, setIsLocalEnabled] = React.useState(screenSharingEnabled)
+
+  const onToggle = (enabled: boolean) => {
+    changeScreenShareSettings(enabled)
+    setIsLocalEnabled(enabled)
+  }
+
+  return <Switch value={isLocalEnabled} onValueChange={onToggle} disabled={disabled} />
+}
+
 const useStrings = () => {
   const intl = useIntl()
 
@@ -192,6 +224,8 @@ const useStrings = () => {
     crashReportingInfo: intl.formatMessage(messages.crashReportingInfo),
     analytics: intl.formatMessage(messages.analytics),
     privacyPolicy: intl.formatMessage(messages.privacyPolicy),
+    screenSharing: intl.formatMessage(messages.screenSharing),
+    screenSharingInfo: intl.formatMessage(messages.screenSharingInfo),
   }
 }
 
@@ -256,6 +290,15 @@ const messages = defineMessages({
     id: 'components.settings.applicationsettingsscreen.privacyPolicy',
     defaultMessage: '!!!Privacy Policy',
   },
+  screenSharing: {
+    id: 'components.settings.applicationsettingsscreen.screenSharing',
+    defaultMessage: '!!!Enable screensharing',
+  },
+  screenSharingInfo: {
+    id: 'components.settings.applicationsettingsscreen.screenSharingInfo',
+    defaultMessage:
+      '!!!Changes to this option will enable you to make screenshots as well share your screen via third party apps',
+  },
 })
 
 const styles = StyleSheet.create({
diff --git a/apps/wallet-mobile/src/features/Settings/ScreenShare/ScreenShare.ts b/apps/wallet-mobile/src/features/Settings/ScreenShare/ScreenShare.ts
new file mode 100644
index 0000000000..be8a7ccf8c
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Settings/ScreenShare/ScreenShare.ts
@@ -0,0 +1,63 @@
+import {isBoolean, useStorage} from '@yoroi/common'
+import {useEffect, useState} from 'react'
+import {NativeModules, Platform} from 'react-native'
+import {useQuery} from 'react-query'
+
+import {useMutationWithInvalidations} from '../../../yoroi-wallets/hooks'
+
+const {FlagSecure} = NativeModules
+
+export const useChangeScreenShareSetting = () => {
+  const storage = useStorage()
+
+  const mutation = useMutationWithInvalidations({
+    mutationFn: async (screenShareEnabled: boolean) => {
+      await storage.join('appSettings/').setItem('screenShareEnabled', screenShareEnabled)
+      if (Platform.OS === 'android') {
+        changeScreenShareNativeSettingOnAndroid(screenShareEnabled)
+      }
+    },
+    invalidateQueries: [['screenShareEnabled']],
+  })
+
+  return {
+    ...mutation,
+    changeScreenShareSettings: mutation.mutate,
+  }
+}
+
+export const useScreenShareSettingEnabled = () => {
+  const storage = useStorage()
+
+  return useQuery('screenShareEnabled', async () => {
+    if (Platform.OS === 'android') {
+      return (await storage.join('appSettings/').getItem<boolean>('screenShareEnabled')) ?? false
+    }
+    return true
+  })
+}
+
+export const useInitScreenShare = () => {
+  const {data: screenShareEnabled} = useScreenShareSettingEnabled()
+  const [initialised, setInitialised] = useState(false)
+
+  useEffect(() => {
+    if (!isBoolean(screenShareEnabled) || initialised) return
+
+    if (Platform.OS === 'android') {
+      changeScreenShareNativeSettingOnAndroid(screenShareEnabled)
+    }
+
+    setInitialised(true)
+  }, [screenShareEnabled, initialised])
+
+  return {initialised}
+}
+
+export const changeScreenShareNativeSettingOnAndroid = (screenShareEnabled: boolean) => {
+  if (screenShareEnabled) {
+    FlagSecure.deactivate()
+  } else {
+    FlagSecure.activate()
+  }
+}
diff --git a/apps/wallet-mobile/src/features/Settings/ScreenShare/index.ts b/apps/wallet-mobile/src/features/Settings/ScreenShare/index.ts
new file mode 100644
index 0000000000..63469df5b4
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Settings/ScreenShare/index.ts
@@ -0,0 +1 @@
+export {useChangeScreenShareSetting, useInitScreenShare, useScreenShareSettingEnabled} from './ScreenShare'
diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json
index fe86ca505e..3bcf41f379 100644
--- a/apps/wallet-mobile/src/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/i18n/locales/en-US.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/utils/utils.ts b/apps/wallet-mobile/src/utils/utils.ts
index 69c3d859af..1250b368b6 100644
--- a/apps/wallet-mobile/src/utils/utils.ts
+++ b/apps/wallet-mobile/src/utils/utils.ts
@@ -1,4 +1,11 @@
+import {useFocusEffect} from '@react-navigation/native'
+import {isBoolean} from '@yoroi/common'
 import {isEmpty} from 'lodash'
+import React from 'react'
+import {Platform} from 'react-native'
+
+import {useScreenShareSettingEnabled} from '../features/Settings/ScreenShare'
+import {changeScreenShareNativeSettingOnAndroid} from '../features/Settings/ScreenShare/ScreenShare'
 
 export function isEmptyString(value: string | null | undefined): value is '' | null | undefined {
   return isEmpty(value)
@@ -17,3 +24,17 @@ export function promiseAny<T>(promises: Promise<T>[]): Promise<T> {
     }
   })
 }
+
+export const useAllowScreenshots = () => {
+  const {data: screenShareSettingEnabled} = useScreenShareSettingEnabled()
+  const callback = React.useCallback(() => {
+    if (Platform.OS !== 'android') return
+    if (!isBoolean(screenShareSettingEnabled) || screenShareSettingEnabled) return
+
+    changeScreenShareNativeSettingOnAndroid(true)
+    return () => {
+      changeScreenShareNativeSettingOnAndroid(false)
+    }
+  }, [screenShareSettingEnabled])
+  useFocusEffect(callback)
+}
diff --git a/apps/wallet-mobile/translations/messages/src/Catalyst/QrCode.json b/apps/wallet-mobile/translations/messages/src/Catalyst/QrCode.json
index 4819b0dfa5..eda76bc388 100644
--- a/apps/wallet-mobile/translations/messages/src/Catalyst/QrCode.json
+++ b/apps/wallet-mobile/translations/messages/src/Catalyst/QrCode.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Backup Catalyst Code",
     "file": "src/Catalyst/QrCode.tsx",
     "start": {
-      "line": 94,
+      "line": 92,
       "column": 12,
-      "index": 2961
+      "index": 2890
     },
     "end": {
-      "line": 97,
+      "line": 95,
       "column": 3,
-      "index": 3059
+      "index": 2988
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Please take a screenshot of this QR code.",
     "file": "src/Catalyst/QrCode.tsx",
     "start": {
-      "line": 98,
+      "line": 96,
       "column": 15,
-      "index": 3076
+      "index": 3005
     },
     "end": {
-      "line": 101,
+      "line": 99,
       "column": 3,
-      "index": 3198
+      "index": 3127
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!We strongly recommend you to save your Catalyst secret code in plain text too, so that you can re-create your QR code if necessary.",
     "file": "src/Catalyst/QrCode.tsx",
     "start": {
-      "line": 102,
+      "line": 100,
       "column": 16,
-      "index": 3216
+      "index": 3145
     },
     "end": {
-      "line": 107,
+      "line": 105,
       "column": 3,
-      "index": 3446
+      "index": 3375
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Then, send the QR code to an external device, as you will need toscan it with your phone using the Catalyst mobile app.",
     "file": "src/Catalyst/QrCode.tsx",
     "start": {
-      "line": 108,
+      "line": 106,
       "column": 16,
-      "index": 3464
+      "index": 3393
     },
     "end": {
-      "line": 113,
+      "line": 111,
       "column": 3,
-      "index": 3682
+      "index": 3611
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Keep it — you won’t be able to access this code after tapping on Complete.",
     "file": "src/Catalyst/QrCode.tsx",
     "start": {
-      "line": 114,
+      "line": 112,
       "column": 8,
-      "index": 3692
+      "index": 3621
     },
     "end": {
-      "line": 117,
+      "line": 115,
       "column": 3,
-      "index": 3840
+      "index": 3769
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Secret Code",
     "file": "src/Catalyst/QrCode.tsx",
     "start": {
-      "line": 118,
+      "line": 116,
       "column": 14,
-      "index": 3856
+      "index": 3785
     },
     "end": {
-      "line": 121,
+      "line": 119,
       "column": 3,
-      "index": 3947
+      "index": 3876
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.json
index 779f2bef53..3638d77f81 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!General",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 199,
+      "line": 233,
       "column": 11,
-      "index": 6731
+      "index": 8119
     },
     "end": {
-      "line": 202,
+      "line": 236,
       "column": 3,
-      "index": 6841
+      "index": 8229
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Security & Reporting",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 203,
+      "line": 237,
       "column": 21,
-      "index": 6864
+      "index": 8252
     },
     "end": {
-      "line": 206,
+      "line": 240,
       "column": 3,
-      "index": 6997
+      "index": 8385
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Language",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 207,
+      "line": 241,
       "column": 18,
-      "index": 7017
+      "index": 8405
     },
     "end": {
-      "line": 210,
+      "line": 244,
       "column": 3,
-      "index": 7129
+      "index": 8517
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Fiat Currency",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 211,
+      "line": 245,
       "column": 22,
-      "index": 7153
+      "index": 8541
     },
     "end": {
-      "line": 214,
+      "line": 248,
       "column": 3,
-      "index": 7274
+      "index": 8662
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!About",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 215,
+      "line": 249,
       "column": 9,
-      "index": 7285
+      "index": 8673
     },
     "end": {
-      "line": 218,
+      "line": 252,
       "column": 3,
-      "index": 7385
+      "index": 8773
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Terms of Service Agreement",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 219,
+      "line": 253,
       "column": 18,
-      "index": 7405
+      "index": 8793
     },
     "end": {
-      "line": 222,
+      "line": 256,
       "column": 3,
-      "index": 7532
+      "index": 8920
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Change PIN",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 223,
+      "line": 257,
       "column": 13,
-      "index": 7547
+      "index": 8935
     },
     "end": {
-      "line": 226,
+      "line": 260,
       "column": 3,
-      "index": 7656
+      "index": 9044
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Hide balance",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 227,
+      "line": 261,
       "column": 15,
-      "index": 7673
+      "index": 9061
     },
     "end": {
-      "line": 230,
+      "line": 264,
       "column": 3,
-      "index": 7786
+      "index": 9174
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!This function will be applied to all wallets in your app",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 231,
+      "line": 265,
       "column": 19,
-      "index": 7807
+      "index": 9195
     },
     "end": {
-      "line": 234,
+      "line": 268,
       "column": 3,
-      "index": 7968
+      "index": 9356
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Sign in with your biometrics",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 235,
+      "line": 269,
       "column": 20,
-      "index": 7990
+      "index": 9378
     },
     "end": {
-      "line": 238,
+      "line": 272,
       "column": 3,
-      "index": 8124
+      "index": 9512
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Changes to this option will be reflected after restarting the application",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 239,
+      "line": 273,
       "column": 24,
-      "index": 8150
+      "index": 9538
     },
     "end": {
-      "line": 242,
+      "line": 276,
       "column": 3,
-      "index": 8333
+      "index": 9721
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Send crash report to Emurgo",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 243,
+      "line": 277,
       "column": 18,
-      "index": 8353
+      "index": 9741
     },
     "end": {
-      "line": 246,
+      "line": 280,
       "column": 3,
-      "index": 8484
+      "index": 9872
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Changes to this option will be reflected after restarting the application",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 247,
+      "line": 281,
       "column": 22,
-      "index": 8508
+      "index": 9896
     },
     "end": {
-      "line": 250,
+      "line": 284,
       "column": 3,
-      "index": 8689
+      "index": 10077
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Analytics",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 251,
+      "line": 285,
       "column": 13,
-      "index": 8704
+      "index": 10092
     },
     "end": {
-      "line": 254,
+      "line": 288,
       "column": 3,
-      "index": 8812
+      "index": 10200
     }
   },
   {
@@ -214,14 +214,44 @@
     "defaultMessage": "!!!Privacy Policy",
     "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
     "start": {
-      "line": 255,
+      "line": 289,
       "column": 17,
-      "index": 8831
+      "index": 10219
     },
     "end": {
-      "line": 258,
+      "line": 292,
       "column": 3,
-      "index": 8948
+      "index": 10336
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.screenSharing",
+    "defaultMessage": "!!!Enable screensharing",
+    "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 293,
+      "column": 17,
+      "index": 10355
+    },
+    "end": {
+      "line": 296,
+      "column": 3,
+      "index": 10478
+    }
+  },
+  {
+    "id": "components.settings.applicationsettingsscreen.screenSharingInfo",
+    "defaultMessage": "!!!Changes to this option will enable you to make screenshots as well share your screen via third party apps",
+    "file": "src/features/Settings/ApplicationSettings/ApplicationSettingsScreen.tsx",
+    "start": {
+      "line": 297,
+      "column": 21,
+      "index": 10501
+    },
+    "end": {
+      "line": 301,
+      "column": 3,
+      "index": 10719
     }
   }
 ]
\ No newline at end of file

From 6b24668b84cdb723911ee986bcecdf06b87daba7 Mon Sep 17 00:00:00 2001
From: Sorin Chis <kish.sorin@yahoo.com>
Date: Tue, 7 Nov 2023 16:39:07 +0200
Subject: [PATCH 26/40] swap: update/fix design (#2880)

---
 .../src/TxHistory/PairedBalance.tsx           |  2 +-
 .../src/components/AmountItem/AmountItem.tsx  |  4 +-
 .../SelectPoolFromList/SelectPoolFromList.tsx | 10 +++--
 .../ShowSubmittedTxScreen.tsx                 | 45 ++++++++++---------
 .../SelectPoolFromListScreen.tsx              | 20 +++------
 .../EditSlippageScreen/EditSlippageScreen.tsx |  1 +
 .../ListOrders/CompletedOrders.tsx            |  3 +-
 .../Swap/common/AmountCard/AmountCard.json    | 16 +++----
 8 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx b/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx
index b41ff8f368..32cb9e7294 100644
--- a/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx
+++ b/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx
@@ -98,7 +98,7 @@ const useStrings = () => {
 
 const styles = StyleSheet.create({
   pairedBalanceText: {
-    fontSize: 14,
+    fontSize: 12,
     lineHeight: 24,
     fontFamily: 'Rubik-Regular',
     color: COLORS.TEXT_INPUT,
diff --git a/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx b/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx
index 60fb652b9d..515d0cab87 100644
--- a/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx
+++ b/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx
@@ -120,7 +120,7 @@ const styles = StyleSheet.create({
   },
   name: {
     color: COLORS.DARK_TEXT,
-    fontSize: 14,
+    fontSize: 16,
     lineHeight: 22,
     fontWeight: '500',
     fontFamily: 'Rubik-Medium',
@@ -134,6 +134,8 @@ const styles = StyleSheet.create({
   quantity: {
     color: COLORS.DARK_TEXT,
     textAlign: 'right',
+    fontSize: 16,
+    fontFamily: 'Rubik-Regular',
   },
   row: {
     flexDirection: 'row',
diff --git a/apps/wallet-mobile/src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.tsx b/apps/wallet-mobile/src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.tsx
index b654a819dc..0c4195a91a 100644
--- a/apps/wallet-mobile/src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.tsx
+++ b/apps/wallet-mobile/src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.tsx
@@ -16,7 +16,7 @@ import {PoolIcon} from '../../PoolIcon/PoolIcon'
 import {useStrings} from '../../strings'
 import {useSwapForm} from '../../SwapFormProvider'
 
-const PRECISION = 14
+const PRECISION = 10
 
 type Props = {
   pools?: ReadonlyArray<Swap.Pool>
@@ -59,6 +59,7 @@ export const SelectPoolFromList = ({pools = []}: Props) => {
         const formattedTvl = Quantities.format(tvl, decimals, 0)
         const formattedBatcherFeeInPt = Quantities.format(pool.batcherFee.quantity, decimals, decimals)
         const marketPrice = getMarketPrice(pool, orderData.amounts.sell.tokenId)
+        const selectedPoolId = selectedCardIndex ?? orderData?.bestPoolCalculation?.pool?.poolId ?? null
 
         return (
           <View key={pool.poolId}>
@@ -66,7 +67,7 @@ export const SelectPoolFromList = ({pools = []}: Props) => {
 
             <View style={[styles.shadowProp]}>
               <LinearGradient
-                colors={pool.poolId === selectedCardIndex ? ['#E4E8F7', '#C6F7F7'] : [COLORS.WHITE, COLORS.WHITE]}
+                colors={pool.poolId === selectedPoolId ? ['#E4E8F7', '#C6F7F7'] : [COLORS.WHITE, COLORS.WHITE]}
                 style={styles.linearGradient}
               >
                 <TouchableOpacity key={pool.poolId} onPress={() => handleOnPoolSelection(pool)} style={[styles.card]}>
@@ -190,6 +191,9 @@ const styles = StyleSheet.create({
   },
   infoLabel: {
     color: '#6B7384',
+    fontSize: 16,
+  },
+  infoValue: {
+    fontSize: 16,
   },
-  infoValue: {},
 })
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx
index 985fce3f52..40ae21b0cb 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx
@@ -1,6 +1,7 @@
 import {createTypeGuardFromSchema, isString} from '@yoroi/common'
 import React from 'react'
 import {Linking, StyleSheet, View} from 'react-native'
+import {SafeAreaView} from 'react-native-safe-area-context'
 import {z} from 'zod'
 
 import {Button, Spacer, Text} from '../../../../../components'
@@ -30,33 +31,35 @@ export const ShowSubmittedTxScreen = () => {
   }
 
   return (
-    <View style={styles.container}>
-      <SubmittedTxImage />
+    <SafeAreaView style={{flex: 1}} edges={['left', 'right', 'bottom']}>
+      <View style={styles.container}>
+        <SubmittedTxImage />
 
-      <Text style={styles.title}>{strings.transactionSigned}</Text>
+        <Text style={styles.title}>{strings.transactionSigned}</Text>
 
-      <Text style={styles.text}>{strings.transactionDisplay}</Text>
+        <Text style={styles.text}>{strings.transactionDisplay}</Text>
 
-      <Spacer height={20} />
+        <Spacer height={20} />
 
-      {isString(params?.txId) && (
-        <Button
-          onPress={navigateToExplorer}
-          title={strings.seeOnExplorer}
-          style={styles.explorerButton}
-          outlineShelley
-        />
-      )}
+        {isString(params?.txId) && (
+          <Button
+            onPress={navigateToExplorer}
+            title={strings.seeOnExplorer}
+            style={styles.explorerButton}
+            outlineShelley
+          />
+        )}
 
-      <View style={styles.bottomFixed}>
-        <Button
-          onPress={() => navigate.swapOpenOrders()}
-          title={strings.goToOrders}
-          style={styles.button}
-          shelleyTheme
-        />
+        <View style={styles.bottomFixed}>
+          <Button
+            onPress={() => navigate.swapOpenOrders()}
+            title={strings.goToOrders}
+            style={styles.button}
+            shelleyTheme
+          />
+        </View>
       </View>
-    </View>
+    </SafeAreaView>
   )
 }
 
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditPool/SelectPoolFromListScreen/SelectPoolFromListScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditPool/SelectPoolFromListScreen/SelectPoolFromListScreen.tsx
index 151fd21bd5..902c4a75a6 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditPool/SelectPoolFromListScreen/SelectPoolFromListScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditPool/SelectPoolFromListScreen/SelectPoolFromListScreen.tsx
@@ -1,6 +1,7 @@
 import {useSwap} from '@yoroi/swap'
 import React from 'react'
-import {ScrollView, StyleSheet} from 'react-native'
+import {ScrollView} from 'react-native'
+import {SafeAreaView} from 'react-native-safe-area-context'
 
 import {Counter} from '../../../../../common/Counter/Counter'
 import {SelectPoolFromList} from '../../../../../common/SelectPool/SelectPoolFromList/SelectPoolFromList'
@@ -15,23 +16,12 @@ export const SelectPoolFromListScreen = () => {
   const poolCounter = Array.isArray(pools) ? pools.length : 0
 
   return (
-    <>
+    <SafeAreaView style={{flex: 1}} edges={['left', 'right', 'bottom']}>
       <ScrollView>
         <SelectPoolFromList pools={pools} />
       </ScrollView>
 
-      <Counter
-        counter={poolCounter}
-        unitsText={strings.pools(poolCounter)}
-        closingText={strings.available}
-        style={styles.counter}
-      />
-    </>
+      <Counter counter={poolCounter} unitsText={strings.pools(poolCounter)} closingText={strings.available} />
+    </SafeAreaView>
   )
 }
-
-const styles = StyleSheet.create({
-  counter: {
-    paddingVertical: 16,
-  },
-})
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx
index e62e5afa0b..60f6c7cd99 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSlippage/EditSlippageScreen/EditSlippageScreen.tsx
@@ -140,6 +140,7 @@ export const EditSlippageScreen = () => {
               autoFocus={isInputEnabled}
               style={styles.input}
               keyboardType="numeric"
+              selectionColor="#242838"
             />
 
             <Text style={styles.percentLabel}>%</Text>
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
index 098a26cc7f..e140526418 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
@@ -100,6 +100,7 @@ export const CompletedOrders = () => {
     <>
       <View style={styles.container}>
         <FlatList
+          contentContainerStyle={{paddingTop: 10, paddingHorizontal: 16}}
           data={completeOrders}
           renderItem={({item}: {item: MappedRawOrder}) => <ExpandableOrder order={item} />}
           keyExtractor={(item) => item.id}
@@ -300,8 +301,6 @@ const styles = StyleSheet.create({
   container: {
     flex: 1,
     backgroundColor: COLORS.WHITE,
-    paddingTop: 10,
-    paddingHorizontal: 16,
   },
   flex: {
     flex: 1,
diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
index 56d4732094..5da5766666 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Select token",
     "file": "src/features/Swap/common/AmountCard/AmountCard.tsx",
     "start": {
-      "line": 128,
+      "line": 129,
       "column": 15,
-      "index": 4086
+      "index": 4125
     },
     "end": {
-      "line": 131,
+      "line": 132,
       "column": 3,
-      "index": 4169
+      "index": 4208
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Current Balance",
     "file": "src/features/Swap/common/AmountCard/AmountCard.tsx",
     "start": {
-      "line": 132,
+      "line": 133,
       "column": 18,
-      "index": 4189
+      "index": 4228
     },
     "end": {
-      "line": 135,
+      "line": 136,
       "column": 3,
-      "index": 4278
+      "index": 4317
     }
   }
 ]
\ No newline at end of file

From 21f097f0e6af21cbeb94e4ee355a4192cacf4da0 Mon Sep 17 00:00:00 2001
From: banklesss <105349292+banklesss@users.noreply.github.com>
Date: Tue, 7 Nov 2023 15:42:43 +0100
Subject: [PATCH 27/40] fix(swap): modal swip down gesture (#2877)

---
 .../src/components/Modal/ModalContext.tsx      | 11 +++++++++--
 .../src/components/Modal/ModalScreen.tsx       | 18 ++++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/apps/wallet-mobile/src/components/Modal/ModalContext.tsx b/apps/wallet-mobile/src/components/Modal/ModalContext.tsx
index 40ecc097f6..314c6fc6b6 100644
--- a/apps/wallet-mobile/src/components/Modal/ModalContext.tsx
+++ b/apps/wallet-mobile/src/components/Modal/ModalContext.tsx
@@ -3,6 +3,7 @@ import React from 'react'
 
 type ModalState = {
   height: number
+  isOpen: boolean
   title: string
   content: React.ReactNode
 }
@@ -53,7 +54,13 @@ type ModalAction =
 const modalReducer = (state: ModalState, action: ModalAction) => {
   switch (action.type) {
     case 'open':
-      return {...state, content: action.content, height: action.height ?? defaultState.height, title: action.title}
+      return {
+        ...state,
+        content: action.content,
+        height: action.height ?? defaultState.height,
+        title: action.title,
+        isOpen: true,
+      }
 
     case 'close':
       return {...defaultState}
@@ -63,4 +70,4 @@ const modalReducer = (state: ModalState, action: ModalAction) => {
   }
 }
 
-const defaultState: ModalState = Object.freeze({content: undefined, height: 350, title: ''})
+const defaultState: ModalState = Object.freeze({content: undefined, height: 350, title: '', isOpen: false})
diff --git a/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx b/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx
index 3d4d3846fe..8c4a7df543 100644
--- a/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx
+++ b/apps/wallet-mobile/src/components/Modal/ModalScreen.tsx
@@ -16,22 +16,16 @@ import {useModal} from './ModalContext'
 
 export const ModalScreen = () => {
   const {current} = useCardAnimation()
-  const {height, closeModal, content} = useModal()
+  const {height, closeModal, content, isOpen} = useModal()
   const [swipeLocationY, setSwipeLocationY] = React.useState(height)
-  const [downDirectionCount, setDownDirectionCount] = React.useState(0)
-
-  const cleanDirectionCount = () => {
-    setDownDirectionCount(0)
-  }
 
   const onResponderMove = ({nativeEvent}: GestureResponderEvent) => {
-    if (swipeLocationY < nativeEvent.locationY) {
-      const newState = downDirectionCount + 1
-      if (newState > 4) {
-        closeModal()
-        cleanDirectionCount()
-      } else setDownDirectionCount(newState)
+    if (swipeLocationY < nativeEvent.locationY && isOpen) {
+      setSwipeLocationY(height)
+      closeModal()
+      return
     }
+
     setSwipeLocationY(nativeEvent.locationY)
   }
 

From 1252a93ae3c1b6e035db07b4a52134ae63a28197 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Tue, 7 Nov 2023 15:47:47 +0100
Subject: [PATCH 28/40] fix: Go to select token when clicking disabled input
 (#2876)

Signed-off-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Co-authored-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
---
 .../src/features/Swap/common/AmountCard/AmountCard.tsx    | 5 +++--
 .../src/features/Swap/common/SwapFormProvider.tsx         | 2 ++
 .../src/features/Swap/common/AmountCard/AmountCard.json   | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx b/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
index 631f68eecf..ec95208422 100644
--- a/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
+++ b/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
@@ -60,7 +60,7 @@ export const AmountCard = ({
         {label != null && <Text style={[styles.label, !isEmptyString(error) && styles.labelError]}>{label}</Text>}
 
         <View style={styles.content}>
-          <Pressable style={styles.amountWrapper} onPress={focusInput}>
+          <Pressable style={styles.amountWrapper} onPress={() => (noTokenSelected ? navigateTo?.() : focusInput())}>
             <TextInput
               keyboardType="numeric"
               autoComplete="off"
@@ -77,13 +77,14 @@ export const AmountCard = ({
               selectTextOnFocus
               onFocus={() => setIsFocused(true)}
               onBlur={() => setIsFocused(false)}
+              {...(noTokenSelected && {onPressIn: navigateTo})}
             />
           </Pressable>
 
           <Spacer width={7} />
 
           <View style={styles.rightSection}>
-            <TouchableOpacity onPress={() => navigateTo?.()}>
+            <TouchableOpacity onPress={navigateTo}>
               <View style={styles.sectionContainer}>
                 <Boundary loading={{fallback: <TokenIconPlaceholder />}} error={{fallback}}>
                   {noTokenSelected ? (
diff --git a/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx b/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx
index eda5b3bb6a..3a990cf688 100644
--- a/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx
+++ b/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx
@@ -325,12 +325,14 @@ const swapFormReducer = (state: SwapFormState, action: SwapFormAction) => {
     switch (action.type) {
       case SwapFormActionType.SellTouched:
         draft.sellQuantity.isTouched = true
+        draft.sellQuantity.displayValue = ''
         draft.sellQuantity.error = undefined
 
         break
 
       case SwapFormActionType.BuyTouched:
         draft.buyQuantity.isTouched = true
+        draft.buyQuantity.displayValue = ''
         draft.buyQuantity.error = undefined
 
         break
diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
index 5da5766666..3753efa868 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 129,
       "column": 15,
-      "index": 4125
+      "index": 4188
     },
     "end": {
       "line": 132,
       "column": 3,
-      "index": 4208
+      "index": 4271
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 133,
       "column": 18,
-      "index": 4228
+      "index": 4291
     },
     "end": {
       "line": 136,
       "column": 3,
-      "index": 4317
+      "index": 4380
     }
   }
 ]
\ No newline at end of file

From fe3abfb1af531b07fba5fac78d44cc9d76f2d066 Mon Sep 17 00:00:00 2001
From: Ruslan Dudin <vantuz-subhuman@yandex.ru>
Date: Tue, 7 Nov 2023 17:52:17 +0300
Subject: [PATCH 29/40] chore: New Crowdin updates (#2881)

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

diff --git a/apps/wallet-mobile/src/i18n/locales/bn-BD.json b/apps/wallet-mobile/src/i18n/locales/bn-BD.json
index 90d4b2950e..ef40a0c682 100644
--- a/apps/wallet-mobile/src/i18n/locales/bn-BD.json
+++ b/apps/wallet-mobile/src/i18n/locales/bn-BD.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/cs-CZ.json b/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
index 4795bfcefa..90fb187a54 100644
--- a/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
+++ b/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/de-DE.json b/apps/wallet-mobile/src/i18n/locales/de-DE.json
index ed8f9b80e7..0e44ccf172 100644
--- a/apps/wallet-mobile/src/i18n/locales/de-DE.json
+++ b/apps/wallet-mobile/src/i18n/locales/de-DE.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/el-GR.json b/apps/wallet-mobile/src/i18n/locales/el-GR.json
index 5976ebb680..123d141ce6 100644
--- a/apps/wallet-mobile/src/i18n/locales/el-GR.json
+++ b/apps/wallet-mobile/src/i18n/locales/el-GR.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/es-ES.json b/apps/wallet-mobile/src/i18n/locales/es-ES.json
index 63d978c898..27b90f46a1 100644
--- a/apps/wallet-mobile/src/i18n/locales/es-ES.json
+++ b/apps/wallet-mobile/src/i18n/locales/es-ES.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/fil-PH.json b/apps/wallet-mobile/src/i18n/locales/fil-PH.json
index 90d4b2950e..ef40a0c682 100644
--- a/apps/wallet-mobile/src/i18n/locales/fil-PH.json
+++ b/apps/wallet-mobile/src/i18n/locales/fil-PH.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/fr-FR.json b/apps/wallet-mobile/src/i18n/locales/fr-FR.json
index 91891186e6..0214babd93 100644
--- a/apps/wallet-mobile/src/i18n/locales/fr-FR.json
+++ b/apps/wallet-mobile/src/i18n/locales/fr-FR.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/hr-HR.json b/apps/wallet-mobile/src/i18n/locales/hr-HR.json
index c7c94f8d7c..c5dd396127 100644
--- a/apps/wallet-mobile/src/i18n/locales/hr-HR.json
+++ b/apps/wallet-mobile/src/i18n/locales/hr-HR.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/hu-HU.json b/apps/wallet-mobile/src/i18n/locales/hu-HU.json
index f4d82f485b..a336d4c850 100644
--- a/apps/wallet-mobile/src/i18n/locales/hu-HU.json
+++ b/apps/wallet-mobile/src/i18n/locales/hu-HU.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/id-ID.json b/apps/wallet-mobile/src/i18n/locales/id-ID.json
index 87e902b646..41079a1d8c 100644
--- a/apps/wallet-mobile/src/i18n/locales/id-ID.json
+++ b/apps/wallet-mobile/src/i18n/locales/id-ID.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/it-IT.json b/apps/wallet-mobile/src/i18n/locales/it-IT.json
index 6e8d9a853f..7986b6e1eb 100644
--- a/apps/wallet-mobile/src/i18n/locales/it-IT.json
+++ b/apps/wallet-mobile/src/i18n/locales/it-IT.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/ja-JP.json b/apps/wallet-mobile/src/i18n/locales/ja-JP.json
index bf31a3ee84..e4eae0eb87 100644
--- a/apps/wallet-mobile/src/i18n/locales/ja-JP.json
+++ b/apps/wallet-mobile/src/i18n/locales/ja-JP.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/ko-KR.json b/apps/wallet-mobile/src/i18n/locales/ko-KR.json
index 4cddfc9c83..442b038f0f 100644
--- a/apps/wallet-mobile/src/i18n/locales/ko-KR.json
+++ b/apps/wallet-mobile/src/i18n/locales/ko-KR.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/nl-NL.json b/apps/wallet-mobile/src/i18n/locales/nl-NL.json
index ac2d556be0..ca8e8bc631 100644
--- a/apps/wallet-mobile/src/i18n/locales/nl-NL.json
+++ b/apps/wallet-mobile/src/i18n/locales/nl-NL.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analyse",
   "components.settings.applicationsettingsscreen.analyticsTitle": "Gebruikersinzichten",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/pl-PL.json b/apps/wallet-mobile/src/i18n/locales/pl-PL.json
index 90d4b2950e..ef40a0c682 100644
--- a/apps/wallet-mobile/src/i18n/locales/pl-PL.json
+++ b/apps/wallet-mobile/src/i18n/locales/pl-PL.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/pt-BR.json b/apps/wallet-mobile/src/i18n/locales/pt-BR.json
index 1d2b6308c1..e9facd2ecf 100644
--- a/apps/wallet-mobile/src/i18n/locales/pt-BR.json
+++ b/apps/wallet-mobile/src/i18n/locales/pt-BR.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Política de Privacidade",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/ru-RU.json b/apps/wallet-mobile/src/i18n/locales/ru-RU.json
index af74c2338c..2eb8ce8183 100644
--- a/apps/wallet-mobile/src/i18n/locales/ru-RU.json
+++ b/apps/wallet-mobile/src/i18n/locales/ru-RU.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Политика конфиденциальности",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/sk-SK.json b/apps/wallet-mobile/src/i18n/locales/sk-SK.json
index fcea90d550..c06e8857c9 100644
--- a/apps/wallet-mobile/src/i18n/locales/sk-SK.json
+++ b/apps/wallet-mobile/src/i18n/locales/sk-SK.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/sl-SI.json b/apps/wallet-mobile/src/i18n/locales/sl-SI.json
index 90d4b2950e..ef40a0c682 100644
--- a/apps/wallet-mobile/src/i18n/locales/sl-SI.json
+++ b/apps/wallet-mobile/src/i18n/locales/sl-SI.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/sv-SE.json b/apps/wallet-mobile/src/i18n/locales/sv-SE.json
index 90d4b2950e..ef40a0c682 100644
--- a/apps/wallet-mobile/src/i18n/locales/sv-SE.json
+++ b/apps/wallet-mobile/src/i18n/locales/sv-SE.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/sw-KE.json b/apps/wallet-mobile/src/i18n/locales/sw-KE.json
index 90d4b2950e..ef40a0c682 100644
--- a/apps/wallet-mobile/src/i18n/locales/sw-KE.json
+++ b/apps/wallet-mobile/src/i18n/locales/sw-KE.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/tr-TR.json b/apps/wallet-mobile/src/i18n/locales/tr-TR.json
index be7a130a05..35327caacb 100644
--- a/apps/wallet-mobile/src/i18n/locales/tr-TR.json
+++ b/apps/wallet-mobile/src/i18n/locales/tr-TR.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/uk-UA.json b/apps/wallet-mobile/src/i18n/locales/uk-UA.json
index 90d4b2950e..ef40a0c682 100644
--- a/apps/wallet-mobile/src/i18n/locales/uk-UA.json
+++ b/apps/wallet-mobile/src/i18n/locales/uk-UA.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/vi-VN.json b/apps/wallet-mobile/src/i18n/locales/vi-VN.json
index cda6e603f6..0521bfcbe0 100644
--- a/apps/wallet-mobile/src/i18n/locales/vi-VN.json
+++ b/apps/wallet-mobile/src/i18n/locales/vi-VN.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/zh-Hans.json b/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
index c6d4b7647d..617d740b00 100644
--- a/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
+++ b/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",
diff --git a/apps/wallet-mobile/src/i18n/locales/zh-Hant.json b/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
index dbb9c75aa6..0660fd230b 100644
--- a/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
+++ b/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
@@ -305,6 +305,8 @@
   "components.settings.applicationsettingsscreen.analytics": "Analytics",
   "components.settings.applicationsettingsscreen.analyticsTitle": "User Insights",
   "components.settings.applicationsettingsscreen.privacyPolicy": "Privacy Policy",
+  "components.settings.applicationsettingsscreen.screenSharing": "Enable screensharing",
+  "components.settings.applicationsettingsscreen.screenSharingInfo": "Changes to this option will enable you to make screenshots as well share your screen via third party apps",
   "components.send.sendscreen.submittedTxTitle": "Transaction submitted",
   "components.send.sendscreen.submittedTxText": "Check this transaction in the list of wallet transactions",
   "components.send.sendscreen.submittedTxButton": "Go to transactions",

From 124cf23a7021338d5c92d4d7749e5043c02e13a3 Mon Sep 17 00:00:00 2001
From: jorbuedo <jorbuedo@users.noreply.github.com>
Date: Tue, 7 Nov 2023 15:58:09 +0100
Subject: [PATCH 30/40] fix: total value in summary (#2878)

---
 .../src/TxHistory/BalanceBanner.tsx           |  2 +-
 .../src/components/AmountItem/AmountItem.tsx  |  2 +-
 .../PairedBalance}/PairedBalance.stories.tsx  |  6 +-
 .../PairedBalance}/PairedBalance.tsx          | 33 +++----
 .../EditAmount/EditAmountScreen.tsx           |  2 +-
 .../ConfirmTxScreen/TransactionSummary.tsx    | 38 ++++++--
 .../messages/src/TxHistory/PairedBalance.json |  8 +-
 .../factories/makeOrderCalculations.test.ts   | 95 +++++++++++++++++++
 .../orders/factories/makeOrderCalculations.ts | 14 +++
 .../src/translators/reactjs/state/state.ts    |  1 +
 10 files changed, 166 insertions(+), 35 deletions(-)
 rename apps/wallet-mobile/src/{TxHistory => components/PairedBalance}/PairedBalance.stories.tsx (93%)
 rename apps/wallet-mobile/src/{TxHistory => components/PairedBalance}/PairedBalance.tsx (68%)

diff --git a/apps/wallet-mobile/src/TxHistory/BalanceBanner.tsx b/apps/wallet-mobile/src/TxHistory/BalanceBanner.tsx
index b6cc9daecb..d9893f7f4a 100644
--- a/apps/wallet-mobile/src/TxHistory/BalanceBanner.tsx
+++ b/apps/wallet-mobile/src/TxHistory/BalanceBanner.tsx
@@ -3,13 +3,13 @@ import {StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 
 import {Boundary, ResetErrorRef, Spacer} from '../components'
 import {Icon} from '../components/Icon'
+import {PairedBalance} from '../components/PairedBalance/PairedBalance'
 import {usePrivacyMode} from '../features/Settings/PrivacyMode/PrivacyMode'
 import {formatTokenWithText, formatTokenWithTextWhenHidden} from '../legacy/format'
 import {useSelectedWallet} from '../SelectedWallet'
 import {COLORS} from '../theme'
 import {useBalances} from '../yoroi-wallets/hooks'
 import {Amounts} from '../yoroi-wallets/utils'
-import {PairedBalance} from './PairedBalance'
 
 export const BalanceBanner = React.forwardRef<ResetErrorRef>((_, ref) => {
   const wallet = useSelectedWallet()
diff --git a/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx b/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx
index 515d0cab87..9aa547e05f 100644
--- a/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx
+++ b/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx
@@ -3,12 +3,12 @@ import * as React from 'react'
 import {StyleSheet, View, ViewProps} from 'react-native'
 
 import {COLORS} from '../../theme'
-import {PairedBalance} from '../../TxHistory/PairedBalance'
 import {isEmptyString} from '../../utils'
 import {YoroiWallet} from '../../yoroi-wallets/cardano/types'
 import {useTokenInfo} from '../../yoroi-wallets/hooks'
 import {Quantities} from '../../yoroi-wallets/utils'
 import {Boundary, Icon, Spacer, Text, TokenIcon, TokenIconPlaceholder} from '..'
+import {PairedBalance} from '../PairedBalance/PairedBalance'
 
 export type AmountItemProps = {
   wallet: YoroiWallet
diff --git a/apps/wallet-mobile/src/TxHistory/PairedBalance.stories.tsx b/apps/wallet-mobile/src/components/PairedBalance/PairedBalance.stories.tsx
similarity index 93%
rename from apps/wallet-mobile/src/TxHistory/PairedBalance.stories.tsx
rename to apps/wallet-mobile/src/components/PairedBalance/PairedBalance.stories.tsx
index c848a0e1a4..95c7713175 100644
--- a/apps/wallet-mobile/src/TxHistory/PairedBalance.stories.tsx
+++ b/apps/wallet-mobile/src/components/PairedBalance/PairedBalance.stories.tsx
@@ -2,9 +2,9 @@ import {storiesOf} from '@storybook/react-native'
 import React from 'react'
 import {View} from 'react-native'
 
-import {QueryProvider} from '../../.storybook/decorators'
-import {SelectedWalletProvider} from '../SelectedWallet'
-import {mocks} from '../yoroi-wallets/mocks'
+import {QueryProvider} from '../../../.storybook/decorators'
+import {SelectedWalletProvider} from '../../SelectedWallet'
+import {mocks} from '../../yoroi-wallets/mocks'
 import {PairedBalance} from './PairedBalance'
 
 storiesOf('PairedBalance', module)
diff --git a/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx b/apps/wallet-mobile/src/components/PairedBalance/PairedBalance.tsx
similarity index 68%
rename from apps/wallet-mobile/src/TxHistory/PairedBalance.tsx
rename to apps/wallet-mobile/src/components/PairedBalance/PairedBalance.tsx
index 32cb9e7294..287597187b 100644
--- a/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx
+++ b/apps/wallet-mobile/src/components/PairedBalance/PairedBalance.tsx
@@ -1,21 +1,22 @@
 import {Balance} from '@yoroi/types'
 import * as React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
-import {StyleSheet, Text} from 'react-native'
+import {StyleSheet, Text, TextStyle} from 'react-native'
 
-import {Boundary, ResetError, ResetErrorRef} from '../components'
-import {useCurrencyContext} from '../features/Settings/Currency'
-import {useSelectedWallet} from '../SelectedWallet'
-import {COLORS} from '../theme'
-import {useExchangeRate} from '../yoroi-wallets/hooks'
-import {CurrencySymbol} from '../yoroi-wallets/types'
-import {Quantities} from '../yoroi-wallets/utils'
+import {useCurrencyContext} from '../../features/Settings/Currency'
+import {useSelectedWallet} from '../../SelectedWallet'
+import {COLORS} from '../../theme'
+import {useExchangeRate} from '../../yoroi-wallets/hooks'
+import {CurrencySymbol} from '../../yoroi-wallets/types'
+import {Quantities} from '../../yoroi-wallets/utils'
+import {Boundary, ResetError, ResetErrorRef} from '..'
 
 type Props = {
   amount: Balance.Amount
   isPrivacyOff?: boolean
+  textStyle?: TextStyle
 }
-export const PairedBalance = React.forwardRef<ResetErrorRef, Props>(({isPrivacyOff, amount}, ref) => {
+export const PairedBalance = React.forwardRef<ResetErrorRef, Props>(({isPrivacyOff, amount, textStyle}, ref) => {
   const {currency} = useCurrencyContext()
 
   return (
@@ -25,18 +26,18 @@ export const PairedBalance = React.forwardRef<ResetErrorRef, Props>(({isPrivacyO
       error={{
         fallback: ({resetErrorBoundary}) => (
           <ResetError resetErrorBoundary={resetErrorBoundary} ref={ref}>
-            <BalanceError />
+            <BalanceError textStyle={textStyle} />
           </ResetError>
         ),
       }}
     >
-      <Amount isPrivacyOff={isPrivacyOff} amount={amount} />
+      <Amount isPrivacyOff={isPrivacyOff} amount={amount} textStyle={textStyle} />
     </Boundary>
   )
 })
 
 const hiddenPairedTotal = '*.**'
-const Amount = ({isPrivacyOff, amount}: Props) => {
+const Amount = ({isPrivacyOff, amount, textStyle}: Props) => {
   const wallet = useSelectedWallet()
   const {currency, config} = useCurrencyContext()
   const rate = useExchangeRate({wallet, to: currency})
@@ -49,7 +50,7 @@ const Amount = ({isPrivacyOff, amount}: Props) => {
 
   if (rate == null)
     return (
-      <Text style={styles.pairedBalanceText} testID="pairedTotalText">
+      <Text style={[styles.pairedBalanceText, textStyle]} testID="pairedTotalText">
         ... {currency}
       </Text>
     )
@@ -64,18 +65,18 @@ const Amount = ({isPrivacyOff, amount}: Props) => {
   )
   const pairedTotal = isPrivacyOff ? hiddenPairedTotal : secondaryExchangeQuantity
   return (
-    <Text style={styles.pairedBalanceText} testID="pairedTotalText">
+    <Text style={[styles.pairedBalanceText, textStyle]} testID="pairedTotalText">
       {`${pairedTotal} ${currency}`}
     </Text>
   )
 }
 
-const BalanceError = () => {
+const BalanceError = ({textStyle}: {textStyle?: TextStyle}) => {
   const strings = useStrings()
   const {currency} = useCurrencyContext()
 
   return (
-    <Text style={styles.pairedBalanceText} testID="pairedTotalText">
+    <Text style={[styles.pairedBalanceText, textStyle]} testID="pairedTotalText">
       {strings.pairedBalanceError(currency)}
     </Text>
   )
diff --git a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
index 2d4a6b9849..1cc4da3a5b 100644
--- a/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
+++ b/apps/wallet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
@@ -13,9 +13,9 @@ import {
 
 import {Button, Spacer, TextInput} from '../../../../../components'
 import {AmountItem} from '../../../../../components/AmountItem/AmountItem'
+import {PairedBalance} from '../../../../../components/PairedBalance/PairedBalance'
 import {useSelectedWallet} from '../../../../../SelectedWallet'
 import {COLORS} from '../../../../../theme'
-import {PairedBalance} from '../../../../../TxHistory/PairedBalance'
 import {selectFtOrThrow} from '../../../../../yoroi-wallets/cardano/utils'
 import {useTokenInfo} from '../../../../../yoroi-wallets/hooks'
 import {Logger} from '../../../../../yoroi-wallets/logging'
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.tsx
index 217b62f01a..24c459a2b9 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/TransactionSummary.tsx
@@ -5,6 +5,7 @@ import {StyleSheet, TouchableOpacity, View} from 'react-native'
 
 import {Icon, Spacer, Text, useModal} from '../../../../components'
 import {AmountItem} from '../../../../components/AmountItem/AmountItem'
+import {PairedBalance} from '../../../../components/PairedBalance/PairedBalance'
 import {useSelectedWallet} from '../../../../SelectedWallet'
 import {COLORS} from '../../../../theme'
 import {useTokenInfo} from '../../../../yoroi-wallets/hooks'
@@ -25,9 +26,18 @@ export const TransactionSummary = () => {
   if (!calculation) throw new Error('No selected pool calculation')
   const {pool, cost} = calculation
 
+  const sellTokenInfo = useTokenInfo({wallet, tokenId: amounts.sell.tokenId})
   const buyTokenInfo = useTokenInfo({wallet, tokenId: amounts.buy.tokenId})
+  const tokenToSellName = sellTokenInfo.ticker ?? sellTokenInfo.name
   const tokenToBuyName = buyTokenInfo.ticker ?? buyTokenInfo.name
-  const label = `${Quantities.format(amounts.buy.quantity, buyTokenInfo.decimals ?? 0)} ${tokenToBuyName}`
+  const isSellPrimary = amounts.sell.tokenId === wallet.primaryTokenInfo.id
+  // Quantities.zero case would only happen on an API error where the price in Ada of Ada were missing
+  const total = isSellPrimary ? calculation.ptTotalValueSpent?.quantity ?? Quantities.zero : amounts.sell.quantity
+  const formattedSellText = `${Quantities.format(total, sellTokenInfo.decimals ?? 0)} ${tokenToSellName}`
+  const formattedFeeText = `${Quantities.format(
+    Quantities.sum([cost.batcherFee.quantity, cost.frontendFeeInfo.fee.quantity]),
+    wallet.primaryTokenInfo.decimals ?? 0,
+  )} ${wallet.primaryTokenInfo.ticker}`
   const poolProviderFormatted = capitalize(pool.provider)
   const poolUrl = getPoolUrlByProvider(pool.provider)
 
@@ -55,10 +65,7 @@ export const TransactionSummary = () => {
     },
     {
       label: strings.swapFeesTitle,
-      value: `${Quantities.format(
-        Quantities.sum([cost.batcherFee.quantity, cost.frontendFeeInfo.fee.quantity]),
-        wallet.primaryTokenInfo.decimals ?? 0,
-      )} ${wallet.primaryTokenInfo.ticker}`,
+      value: formattedFeeText,
       info: strings.swapFees,
     },
   ]
@@ -69,11 +76,23 @@ export const TransactionSummary = () => {
         <Text style={styles.cardText}>{strings.total}</Text>
 
         <View>
-          <Text style={[styles.cardText, styles.cardTextValue]}>{label}</Text>
+          <Text style={[styles.cardText, styles.cardTextValue]}>{formattedSellText}</Text>
+
+          {!isSellPrimary && (
+            <>
+              <Spacer height={6} />
+
+              <Text style={[styles.cardText, styles.cardTextValue]}>{formattedFeeText}</Text>
+            </>
+          )}
 
-          <Spacer height={6} />
+          {!!calculation.ptTotalValueSpent && (
+            <>
+              <Spacer height={6} />
 
-          <Text style={styles.cardTextUSD}></Text>
+              <PairedBalance amount={calculation.ptTotalValueSpent} textStyle={styles.cardTextUSD} />
+            </>
+          )}
         </View>
       </View>
 
@@ -148,11 +167,12 @@ const styles = StyleSheet.create({
   },
   cardTextValue: {
     fontWeight: '500',
+    textAlign: 'right',
   },
   cardTextUSD: {
     fontSize: 14,
     color: COLORS.WHITE,
-    opacity: 0.5,
+    opacity: 0.75,
   },
   flexBetween: {
     flexDirection: 'row',
diff --git a/apps/wallet-mobile/translations/messages/src/TxHistory/PairedBalance.json b/apps/wallet-mobile/translations/messages/src/TxHistory/PairedBalance.json
index b3a9d3c0fb..998db76826 100644
--- a/apps/wallet-mobile/translations/messages/src/TxHistory/PairedBalance.json
+++ b/apps/wallet-mobile/translations/messages/src/TxHistory/PairedBalance.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Error obtaining {currency} pairing",
     "file": "src/TxHistory/PairedBalance.tsx",
     "start": {
-      "line": 85,
+      "line": 86,
       "column": 22,
-      "index": 2521
+      "index": 2649
     },
     "end": {
-      "line": 88,
+      "line": 89,
       "column": 3,
-      "index": 2653
+      "index": 2781
     }
   }
 ]
\ No newline at end of file
diff --git a/packages/swap/src/helpers/orders/factories/makeOrderCalculations.test.ts b/packages/swap/src/helpers/orders/factories/makeOrderCalculations.test.ts
index 0fbd578d91..df7f9179d1 100644
--- a/packages/swap/src/helpers/orders/factories/makeOrderCalculations.test.ts
+++ b/packages/swap/src/helpers/orders/factories/makeOrderCalculations.test.ts
@@ -112,6 +112,10 @@ describe('makeOrderCalculations', () => {
         quantity: '148894355282',
         tokenId: 'tokenB',
       },
+      ptTotalValueSpent: {
+        quantity: '10008000000',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '0.06693552899045170664',
@@ -228,6 +232,10 @@ describe('makeOrderCalculations', () => {
         quantity: '148894355282',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: {
+        quantity: '10008000000',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '0.06693552899045170664',
@@ -345,6 +353,10 @@ describe('makeOrderCalculations', () => {
         quantity: '148894355268',
         tokenId: 'tokenB',
       },
+      ptTotalValueSpent: {
+        quantity: '10008000000',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '0.06693552899045170664',
@@ -462,6 +474,10 @@ describe('makeOrderCalculations', () => {
         quantity: '148894355268',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: {
+        quantity: '10008000000',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '0.06693552899045170664',
@@ -573,6 +589,11 @@ describe('makeOrderCalculations', () => {
         quantity: '50',
         tokenId: 'tokenB',
       },
+      ptTotalValueSpent: {
+        quantity: '100',
+        tokenId: '',
+      },
+
       hasSupply: true,
       prices: {
         base: '0.99009900990099009901',
@@ -683,6 +704,10 @@ describe('makeOrderCalculations', () => {
         quantity: '0',
         tokenId: 'tokenB',
       },
+      ptTotalValueSpent: {
+        quantity: '100',
+        tokenId: '',
+      },
       hasSupply: false,
       prices: {
         base: '0',
@@ -794,6 +819,10 @@ describe('makeOrderCalculations', () => {
         quantity: '0',
         tokenId: 'tokenB',
       },
+      ptTotalValueSpent: {
+        quantity: '100',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '1',
@@ -905,6 +934,10 @@ describe('makeOrderCalculations', () => {
         quantity: '100',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: {
+        quantity: '1',
+        tokenId: '',
+      },
       hasSupply: false,
       prices: {
         base: '1',
@@ -1016,6 +1049,10 @@ describe('makeOrderCalculations', () => {
         quantity: '1',
         tokenId: 'tokenB',
       },
+      ptTotalValueSpent: {
+        quantity: '100',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '0',
@@ -1127,6 +1164,10 @@ describe('makeOrderCalculations', () => {
         quantity: '0',
         tokenId: 'tokenB',
       },
+      ptTotalValueSpent: {
+        quantity: '100',
+        tokenId: '',
+      },
       hasSupply: false,
       prices: {
         base: '0',
@@ -1238,6 +1279,7 @@ describe('makeOrderCalculations', () => {
         quantity: '100',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: undefined,
       hasSupply: false,
       prices: {
         base: '0',
@@ -1349,6 +1391,10 @@ describe('makeOrderCalculations', () => {
         quantity: '100',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: {
+        quantity: '1',
+        tokenId: '',
+      },
       hasSupply: false,
       prices: {
         base: '0',
@@ -1460,6 +1506,10 @@ describe('makeOrderCalculations', () => {
         quantity: '1',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: {
+        quantity: '100',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '0',
@@ -1571,6 +1621,10 @@ describe('makeOrderCalculations', () => {
         quantity: '0',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: {
+        quantity: '100',
+        tokenId: '',
+      },
       hasSupply: false,
       prices: {
         base: '0',
@@ -1682,6 +1736,7 @@ describe('makeOrderCalculations', () => {
         quantity: '100',
         tokenId: 'tokenB',
       },
+      ptTotalValueSpent: undefined,
       hasSupply: false,
       prices: {
         base: '0',
@@ -1793,6 +1848,10 @@ describe('makeOrderCalculations', () => {
         quantity: '100',
         tokenId: 'tokenB',
       },
+      ptTotalValueSpent: {
+        quantity: '1',
+        tokenId: '',
+      },
       hasSupply: false,
       prices: {
         base: '0',
@@ -1904,6 +1963,10 @@ describe('makeOrderCalculations', () => {
         quantity: '100',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: {
+        quantity: '200',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '2',
@@ -2015,6 +2078,10 @@ describe('makeOrderCalculations', () => {
         quantity: '100',
         tokenId: 'tokenB',
       },
+      ptTotalValueSpent: {
+        quantity: '200',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '2',
@@ -2126,6 +2193,10 @@ describe('makeOrderCalculations', () => {
         quantity: '100',
         tokenId: 'tokenB',
       },
+      ptTotalValueSpent: {
+        quantity: '200',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '2',
@@ -2237,6 +2308,10 @@ describe('makeOrderCalculations', () => {
         quantity: '100',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: {
+        quantity: '200',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '2',
@@ -2348,6 +2423,10 @@ describe('makeOrderCalculations', () => {
         quantity: '99999999',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: {
+        quantity: '99999999',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '1',
@@ -2470,6 +2549,10 @@ describe('makeOrderCalculations', () => {
         quantity: '100000000',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: {
+        quantity: '101050000',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '1',
@@ -2592,6 +2675,10 @@ describe('makeOrderCalculations', () => {
         quantity: '100000000',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: {
+        quantity: '101025000',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '1',
@@ -2714,6 +2801,10 @@ describe('makeOrderCalculations', () => {
         quantity: '100000000',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: {
+        quantity: '101020000',
+        tokenId: '',
+      },
       hasSupply: true,
       prices: {
         base: '1',
@@ -2831,6 +2922,7 @@ describe('makeOrderCalculations', () => {
         quantity: '0',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: undefined,
       hasSupply: true,
       prices: {
         base: '1',
@@ -2948,6 +3040,7 @@ describe('makeOrderCalculations', () => {
         quantity: '0',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: undefined,
       hasSupply: true,
       prices: {
         base: '1',
@@ -3063,6 +3156,7 @@ describe('makeOrderCalculations', () => {
         quantity: '0',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: undefined,
       hasSupply: true,
       prices: {
         base: '0.5',
@@ -3179,6 +3273,7 @@ describe('makeOrderCalculations', () => {
         quantity: '199',
         tokenId: 'tokenA',
       },
+      ptTotalValueSpent: undefined,
       hasSupply: true,
       prices: {
         base: '0.5',
diff --git a/packages/swap/src/helpers/orders/factories/makeOrderCalculations.ts b/packages/swap/src/helpers/orders/factories/makeOrderCalculations.ts
index f5a4f88a8c..6ef6409467 100644
--- a/packages/swap/src/helpers/orders/factories/makeOrderCalculations.ts
+++ b/packages/swap/src/helpers/orders/factories/makeOrderCalculations.ts
@@ -154,6 +154,19 @@ export const makeOrderCalculations = ({
       ]),
     }
 
+    const ptTotalValueSpent: Balance.Amount | undefined = Quantities.isZero(
+      sellInPtTerms,
+    )
+      ? undefined
+      : {
+          tokenId: tokens.ptInfo.id,
+          quantity: Quantities.sum([
+            pool.batcherFee.quantity,
+            frontendFeeInfo.fee.quantity,
+            sellInPtTerms,
+          ]),
+        }
+
     const result: SwapOrderCalculation = {
       order: {
         side,
@@ -176,6 +189,7 @@ export const makeOrderCalculations = ({
       },
       buyAmountWithSlippage,
       hasSupply,
+      ptTotalValueSpent,
       prices: {
         base: priceBase,
         market: marketPrice,
diff --git a/packages/swap/src/translators/reactjs/state/state.ts b/packages/swap/src/translators/reactjs/state/state.ts
index b2954ec04c..94b2e4d737 100644
--- a/packages/swap/src/translators/reactjs/state/state.ts
+++ b/packages/swap/src/translators/reactjs/state/state.ts
@@ -38,6 +38,7 @@ export type SwapOrderCalculation = Readonly<{
   }
   hasSupply: boolean
   buyAmountWithSlippage: Balance.Amount
+  ptTotalValueSpent?: Balance.Amount
   cost: {
     liquidityFee: Balance.Amount
     deposit: Balance.Amount

From da476dcaf1f221c1930cc965c828003031a929dd Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Tue, 7 Nov 2023 14:59:47 +0000
Subject: [PATCH 31/40] chore: upd storybook

---
 apps/wallet-mobile/.storybook/storybook.requires.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index 787265e14f..9b76879e74 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -87,6 +87,7 @@ const getStories = () => {
     "./src/components/LoadingOverlay/LoadingOverlay.stories.tsx": require("../src/components/LoadingOverlay/LoadingOverlay.stories.tsx"),
     "./src/components/NftImageGallery/NftImageGallery.stories.tsx": require("../src/components/NftImageGallery/NftImageGallery.stories.tsx"),
     "./src/components/NftPreview/NftPreview.stories.tsx": require("../src/components/NftPreview/NftPreview.stories.tsx"),
+    "./src/components/PairedBalance/PairedBalance.stories.tsx": require("../src/components/PairedBalance/PairedBalance.stories.tsx"),
     "./src/components/QRCodeScanner/QRCodeScanner.stories.tsx": require("../src/components/QRCodeScanner/QRCodeScanner.stories.tsx"),
     "./src/components/StandardModal/StandardModal.stories.tsx": require("../src/components/StandardModal/StandardModal.stories.tsx"),
     "./src/components/TextInput/TextInput.stories.tsx": require("../src/components/TextInput/TextInput.stories.tsx"),
@@ -190,7 +191,6 @@ const getStories = () => {
     "./src/TxHistory/AssetList/ChipButton/ChipButton.stories.tsx": require("../src/TxHistory/AssetList/ChipButton/ChipButton.stories.tsx"),
     "./src/TxHistory/BalanceBanner.stories.tsx": require("../src/TxHistory/BalanceBanner.stories.tsx"),
     "./src/TxHistory/ModalInfo/ModalInfo.stories.tsx": require("../src/TxHistory/ModalInfo/ModalInfo.stories.tsx"),
-    "./src/TxHistory/PairedBalance.stories.tsx": require("../src/TxHistory/PairedBalance.stories.tsx"),
     "./src/TxHistory/TxDetails/AssetList.stories.tsx": require("../src/TxHistory/TxDetails/AssetList.stories.tsx"),
     "./src/TxHistory/TxDetails/TxDetails.stories.tsx": require("../src/TxHistory/TxDetails/TxDetails.stories.tsx"),
     "./src/TxHistory/TxHistory.stories.tsx": require("../src/TxHistory/TxHistory.stories.tsx"),

From 7556f53aefe123e477f0234862c63b4a0d4bff25 Mon Sep 17 00:00:00 2001
From: banklesss <105349292+banklesss@users.noreply.github.com>
Date: Wed, 8 Nov 2023 11:41:32 +0100
Subject: [PATCH 32/40] feature(swap): list orders empty state (#2882)

---
 .../src/Search/SearchContext.tsx              |  99 +-
 .../src/features/Swap/common/strings.ts       |  15 +
 .../CreateOrder/CreateOrder.tsx               |  13 +-
 .../ListOrders/CompletedOrders.tsx            |  96 +-
 .../ListOrders/EmptyCompletedOrdersLogo.tsx   | 848 +++++++++++++++++
 .../ListOrders/EmptyOpenOrdersLogo.tsx        | 853 +++++++++++++++++
 .../StartSwapScreen/ListOrders/ListOrders.tsx |   4 +
 .../StartSwapScreen/ListOrders/OpenOrders.tsx |  82 +-
 .../wallet-mobile/src/i18n/locales/en-US.json |   3 +
 .../PairedBalance/PairedBalance.json          |  17 +
 .../Swap/common/AmountCard/AmountCard.json    |   8 +-
 .../src/features/Swap/common/strings.json     | 893 +++++++++---------
 12 files changed, 2457 insertions(+), 474 deletions(-)
 create mode 100644 apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/EmptyCompletedOrdersLogo.tsx
 create mode 100644 apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/EmptyOpenOrdersLogo.tsx
 create mode 100644 apps/wallet-mobile/translations/messages/src/components/PairedBalance/PairedBalance.json

diff --git a/apps/wallet-mobile/src/Search/SearchContext.tsx b/apps/wallet-mobile/src/Search/SearchContext.tsx
index cf71d6a0ac..e6c32f34f1 100644
--- a/apps/wallet-mobile/src/Search/SearchContext.tsx
+++ b/apps/wallet-mobile/src/Search/SearchContext.tsx
@@ -1,4 +1,4 @@
-import {useNavigation} from '@react-navigation/native'
+import {useFocusEffect, useNavigation} from '@react-navigation/native'
 import {StackNavigationOptions} from '@react-navigation/stack'
 import React, {createContext, ReactNode, useCallback, useContext, useReducer} from 'react'
 import {TextInput, TouchableOpacity, TouchableOpacityProps} from 'react-native'
@@ -93,10 +93,14 @@ export const useSearchOnNavBar = ({
   placeholder,
   title,
   noBack = false,
+  onBack,
+  isChild = false,
 }: {
   placeholder: string
   title: string
   noBack?: boolean
+  onBack?: () => void
+  isChild?: boolean
 }) => {
   const navigation = useNavigation()
 
@@ -116,34 +120,81 @@ export const useSearchOnNavBar = ({
      */
     if (visible) return true
 
-    navigation.goBack()
+    if (onBack) onBack()
+    else navigation.goBack()
 
     return true
-  }, [navigation, visible, handleCloseSearch])
-
-  const withSearchInput: StackNavigationOptions = {
-    ...defaultStackNavigationOptions,
-    headerTitle: () => <InputSearch placeholder={placeholder} />,
-    headerRight: () => (search.length > 0 ? <EraseButton onPress={handleCloseSearch} /> : null),
-    headerLeft: () => <BackButton onPress={handleGoBack} />,
-    headerTitleAlign: 'left',
-    headerTitleContainerStyle: {
-      flex: 1,
-    },
-    headerBackTitleVisible: false,
-  }
+  }, [handleCloseSearch, visible, onBack, navigation])
+
+  const withSearchInput: StackNavigationOptions = React.useMemo(
+    () => ({
+      ...defaultStackNavigationOptions,
+      headerTitle: () => <InputSearch placeholder={placeholder} />,
+      headerRight: () => (search.length > 0 ? <EraseButton onPress={handleCloseSearch} /> : null),
+      headerLeft: () => <BackButton onPress={handleGoBack} />,
+      headerTitleAlign: 'left',
+      headerTitleContainerStyle: {
+        flex: 1,
+      },
+      headerBackTitleVisible: false,
+    }),
+    [handleCloseSearch, handleGoBack, placeholder, search.length],
+  )
 
-  const withSearchButton: StackNavigationOptions = {
-    ...defaultStackNavigationOptions,
-    headerTitle: title,
-    headerRight: () => <SearchButton onPress={() => showSearch()} />,
-    headerLeft: () => <BackButton onPress={handleGoBack} />,
-    ...(noBack ? {headerLeft: () => null} : {}),
-    headerBackTitleVisible: false,
-  }
+  const withSearchButton: StackNavigationOptions = React.useMemo(
+    () => ({
+      ...defaultStackNavigationOptions,
+      headerTitle: title,
+      headerRight: () => <SearchButton onPress={() => showSearch()} />,
+      headerLeft: () => <BackButton onPress={handleGoBack} />,
+      ...(noBack ? {headerLeft: () => null} : {}),
+      headerBackTitleVisible: false,
+    }),
+    [handleGoBack, noBack, showSearch, title],
+  )
+
+  React.useLayoutEffect(() => {
+    if (!isChild) navigation.setOptions(visible ? withSearchInput : withSearchButton)
+  })
+
+  useFocusEffect(
+    React.useCallback(() => {
+      if (isChild) navigation.getParent()?.setOptions(visible ? withSearchInput : withSearchButton)
+    }, [isChild, navigation, visible, withSearchButton, withSearchInput]),
+  )
+}
+
+export const useDisableSearchOnBar = ({
+  title,
+  isChild = false,
+  onBack,
+}: {
+  title: string
+  isChild?: boolean
+  onBack?: () => void
+}) => {
+  const navigation = useNavigation()
+
+  useFocusEffect(
+    React.useCallback(() => {
+      if (isChild)
+        navigation.getParent()?.setOptions({
+          ...defaultStackNavigationOptions,
+          headerLeft: onBack ? () => <BackButton onPress={onBack} /> : undefined,
+          headerRight: undefined,
+          title,
+        })
+    }, [isChild, navigation, onBack, title]),
+  )
 
   React.useLayoutEffect(() => {
-    navigation.setOptions(visible ? withSearchInput : withSearchButton)
+    if (!isChild)
+      navigation.setOptions({
+        ...defaultStackNavigationOptions,
+        headerLeft: onBack ? () => <BackButton onPress={onBack} /> : undefined,
+        headerRight: undefined,
+        title,
+      })
   })
 }
 
diff --git a/apps/wallet-mobile/src/features/Swap/common/strings.ts b/apps/wallet-mobile/src/features/Swap/common/strings.ts
index 9fa44a49c1..d3b3b050c0 100644
--- a/apps/wallet-mobile/src/features/Swap/common/strings.ts
+++ b/apps/wallet-mobile/src/features/Swap/common/strings.ts
@@ -131,6 +131,9 @@ export const useStrings = () => {
     slippageWarningTitle: intl.formatMessage(messages.slippageWarningTitle),
     slippageWarningText: intl.formatMessage(messages.slippageWarningText),
     slippageWarningYourSlippage: intl.formatMessage(messages.slippageWarningYourSlippage),
+    emptyOpenOrders: intl.formatMessage(messages.emptyOpenOrders),
+    emptyOpenOrdersSub: intl.formatMessage(messages.emptyOpenOrdersSub),
+    emptyCompletedOrders: intl.formatMessage(messages.emptyCompletedOrders),
   }
 }
 
@@ -571,4 +574,16 @@ export const messages = defineMessages({
     id: 'swap.slippage.yourSlippage',
     defaultMessage: '!!!Your slippage tolerance',
   },
+  emptyOpenOrders: {
+    id: 'swap.listOrders.emptyOpenOrders',
+    defaultMessage: '!!!No orders avaliable yet',
+  },
+  emptyOpenOrdersSub: {
+    id: 'swap.listOrders.emptyOpenOrdersSub',
+    defaultMessage: '!!!Start doing the swap operations to your open orders here',
+  },
+  emptyCompletedOrders: {
+    id: 'swap.listOrders.emptyCompletedOrders',
+    defaultMessage: '!!!No orders completed yet',
+  },
 })
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx
index 341f3f7c23..56fba2f31d 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx
@@ -9,6 +9,8 @@ import {ScrollView} from 'react-native-gesture-handler'
 
 import {Button, Spacer, useModal} from '../../../../../components'
 import {useMetrics} from '../../../../../metrics/metricsManager'
+import {useWalletNavigation} from '../../../../../navigation'
+import {useDisableSearchOnBar} from '../../../../../Search/SearchContext'
 import {useSelectedWallet} from '../../../../../SelectedWallet'
 import {COLORS} from '../../../../../theme'
 import {NotEnoughMoneyToSendError} from '../../../../../yoroi-wallets/cardano/types'
@@ -36,7 +38,8 @@ const BOTTOM_ACTION_SECTION = 180
 export const CreateOrder = () => {
   const [contentHeight, setContentHeight] = React.useState(0)
   const strings = useStrings()
-  const navigation = useNavigateTo()
+  const navigateTo = useNavigateTo()
+  const {navigateToTxHistory} = useWalletNavigation()
   const {orderData, unsignedTxChanged, poolPairsChanged} = useSwap()
   const wallet = useSelectedWallet()
   const {track} = useMetrics()
@@ -64,6 +67,12 @@ export const CreateOrder = () => {
     },
   )
 
+  useDisableSearchOnBar({
+    title: strings.swapTitle,
+    isChild: true,
+    onBack: navigateToTxHistory,
+  })
+
   const sellTokenInfo = useTokenInfo({
     wallet,
     tokenId: orderData.amounts.sell.tokenId,
@@ -150,7 +159,7 @@ export const CreateOrder = () => {
       ),
     })
 
-    navigation.confirmTx()
+    navigateTo.confirmTx()
   }
 
   const createSwapOrder = (orderData: Swap.CreateOrderData) => {
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
index e140526418..06bc6a36a8 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
@@ -19,15 +19,17 @@ import {
   TokenIcon,
 } from '../../../../../components'
 import {useMetrics} from '../../../../../metrics/metricsManager'
+import {useSearch} from '../../../../../Search/SearchContext'
 import {useSelectedWallet} from '../../../../../SelectedWallet'
 import {COLORS} from '../../../../../theme'
-import {useSync, useTokenInfo, useTransactionInfos} from '../../../../../yoroi-wallets/hooks'
+import {useSync, useTokenInfos, useTransactionInfos} from '../../../../../yoroi-wallets/hooks'
 import {TransactionInfo, TxMetadataInfo} from '../../../../../yoroi-wallets/types'
 import {asQuantity, openInExplorer, Quantities} from '../../../../../yoroi-wallets/utils'
 import {Counter} from '../../../common/Counter/Counter'
 import {parseOrderTxMetadata} from '../../../common/helpers'
 import {PoolIcon} from '../../../common/PoolIcon/PoolIcon'
 import {useStrings} from '../../../common/strings'
+import {EmptyCompletedOrdersLogo} from './EmptyCompletedOrdersLogo'
 
 const PRECISION = 14
 
@@ -79,10 +81,6 @@ export const CompletedOrders = () => {
   const wallet = useSelectedWallet()
   const {sync} = useSync(wallet)
 
-  const transactionsInfos = useTransactionInfos(wallet)
-
-  const completeOrders = findCompletedOrderTx(Object.values(transactionsInfos))
-
   const {track} = useMetrics()
 
   useFocusEffect(
@@ -96,28 +94,52 @@ export const CompletedOrders = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
+  const transactionsInfos = useTransactionInfos(wallet)
+  const completeOrders = findCompletedOrderTx(Object.values(transactionsInfos))
+  const tokenIds = React.useMemo(
+    () => _.uniq(completeOrders?.flatMap((o) => [o.metadata.sellTokenId, o.metadata.buyTokenId])),
+    [completeOrders],
+  )
+  const tokenInfos = useTokenInfos({wallet, tokenIds})
+  const {search} = useSearch()
+
+  const filteredOrders = React.useMemo(
+    () =>
+      completeOrders.filter((order) => {
+        const sellTokenInfo = tokenInfos.find((tokenInfo) => tokenInfo.id === order.metadata.sellTokenId)
+        const buyTokenInfo = tokenInfos.find((tokenInfo) => tokenInfo.id === order.metadata.buyTokenId)
+
+        const sellLabel = sellTokenInfo?.ticker ?? sellTokenInfo?.name ?? '-'
+        const buyLabel = buyTokenInfo?.ticker ?? buyTokenInfo?.name ?? '-'
+        const searchLower = search.toLocaleLowerCase()
+        return sellLabel.toLocaleLowerCase().includes(searchLower) || buyLabel.toLocaleLowerCase().includes(searchLower)
+      }),
+    [completeOrders, search, tokenInfos],
+  )
+
   return (
     <>
       <View style={styles.container}>
         <FlatList
           contentContainerStyle={{paddingTop: 10, paddingHorizontal: 16}}
-          data={completeOrders}
-          renderItem={({item}: {item: MappedRawOrder}) => <ExpandableOrder order={item} />}
+          data={filteredOrders}
+          renderItem={({item}: {item: MappedRawOrder}) => <ExpandableOrder tokenInfos={tokenInfos} order={item} />}
           keyExtractor={(item) => item.id}
+          ListEmptyComponent={<ListEmptyComponent completedOrders={filteredOrders} />}
         />
       </View>
 
       <Counter
         style={styles.counter}
         openingText={strings.youHave}
-        counter={completeOrders?.length ?? 0}
+        counter={filteredOrders?.length ?? 0}
         closingText={strings.listCompletedOrders}
       />
     </>
   )
 }
 
-export const ExpandableOrder = ({order}: {order: MappedRawOrder}) => {
+export const ExpandableOrder = ({order, tokenInfos}: {order: MappedRawOrder; tokenInfos: Array<Balance.TokenInfo>}) => {
   const [hiddenInfoOpenId, setHiddenInfoOpenId] = React.useState<string | null>(null)
   const wallet = useSelectedWallet()
   const intl = useIntl()
@@ -126,12 +148,13 @@ export const ExpandableOrder = ({order}: {order: MappedRawOrder}) => {
   const expanded = id === hiddenInfoOpenId
   const sellIcon = <TokenIcon wallet={wallet} tokenId={metadata.sellTokenId} variant="swap" />
   const buyIcon = <TokenIcon wallet={wallet} tokenId={metadata.buyTokenId} variant="swap" />
-  const buyTokenInfo = useTokenInfo({wallet, tokenId: metadata.buyTokenId})
-  const sellTokenInfo = useTokenInfo({wallet, tokenId: metadata.sellTokenId})
-  const buyQuantity = Quantities.format(metadata.buyQuantity as Balance.Quantity, buyTokenInfo.decimals ?? 0)
-  const sellQuantity = Quantities.format(metadata.sellQuantity as Balance.Quantity, sellTokenInfo.decimals ?? 0)
+  const buyTokenInfo = tokenInfos.find((tokenInfo) => tokenInfo.id === metadata.buyTokenId)
+  const sellTokenInfo = tokenInfos.find((tokenInfo) => tokenInfo.id === metadata.sellTokenId)
+
+  const buyQuantity = Quantities.format(metadata.buyQuantity as Balance.Quantity, buyTokenInfo?.decimals ?? 0)
+  const sellQuantity = Quantities.format(metadata.sellQuantity as Balance.Quantity, sellTokenInfo?.decimals ?? 0)
   const tokenPrice = asQuantity(new BigNumber(metadata.sellQuantity).dividedBy(metadata.buyQuantity).toString())
-  const denomination = (sellTokenInfo.decimals ?? 0) - (buyTokenInfo.decimals ?? 0)
+  const denomination = (sellTokenInfo?.decimals ?? 0) - (buyTokenInfo?.decimals ?? 0)
   const marketPrice = Quantities.format(tokenPrice ?? Quantities.zero, denomination, PRECISION)
   const buyLabel = buyTokenInfo?.ticker ?? buyTokenInfo?.name ?? '-'
   const sellLabel = sellTokenInfo?.ticker ?? sellTokenInfo?.name ?? '-'
@@ -297,6 +320,33 @@ const TxLink = ({onTxPress, txId}: {onTxPress: () => void; txId: string}) => {
   )
 }
 
+const ListEmptyComponent = ({completedOrders}: {completedOrders: Array<MappedRawOrder>}) => {
+  const {search: assetSearchTerm, visible: isSearching} = useSearch()
+
+  if (isSearching && assetSearchTerm.length > 0 && completedOrders.length === 0) return <EmptySearchResult />
+
+  return <NoOrdersYet />
+}
+
+const NoOrdersYet = () => {
+  const strings = useStrings()
+  return (
+    <View style={styles.imageContainer}>
+      <Spacer height={80} />
+
+      <EmptyCompletedOrdersLogo style={styles.image} />
+
+      <Spacer height={25} />
+
+      <Text style={styles.contentText}>{strings.emptyCompletedOrders}</Text>
+    </View>
+  )
+}
+
+const EmptySearchResult = () => {
+  return null
+}
+
 const styles = StyleSheet.create({
   container: {
     flex: 1,
@@ -324,4 +374,22 @@ const styles = StyleSheet.create({
   counter: {
     paddingVertical: 16,
   },
+  image: {
+    flex: 1,
+    alignSelf: 'center',
+    width: 200,
+    height: 228,
+  },
+  imageContainer: {
+    flex: 1,
+    textAlign: 'center',
+  },
+  contentText: {
+    flex: 1,
+    textAlign: 'center',
+    fontFamily: 'Rubik-Medium',
+    fontWeigh: '500',
+    fontSize: 20,
+    color: '#000',
+  },
 })
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/EmptyCompletedOrdersLogo.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/EmptyCompletedOrdersLogo.tsx
new file mode 100644
index 0000000000..40b93adb18
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/EmptyCompletedOrdersLogo.tsx
@@ -0,0 +1,848 @@
+import * as React from 'react'
+import Svg, {Defs, G, LinearGradient, Mask, Path, Stop} from 'react-native-svg'
+
+export const EmptyCompletedOrdersLogo = (props) => {
+  return (
+    <Svg width={281} height={224} viewBox="0 0 281 224" fill="none" xmlns="http://www.w3.org/2000/svg" {...props}>
+      <Path
+        opacity={0.7}
+        d="M96.3 78.686c10.934 6.249 10.934 16.379 0 22.628-10.935 6.248-28.664 6.248-39.599 0-10.935-6.249-10.935-16.379 0-22.628 10.935-6.248 28.664-6.248 39.598 0z"
+        fill="#52FCFF"
+      />
+
+      <Path
+        d="M94.398 84.499c0 4.644-1.368 8.166-3.664 10.208a50.846 50.846 0 01-5.971 4.083c-3.062 1.225-3.41-1.787-7.686-4.257-9.574-5.522-17.352-18.956-17.352-30.01 0-4.206-2.797-4.84-.868-6.952.5-.541 4.981-3.654 5.584-4.083 3.153-2.042 7.634-1.868 12.605 1.02 9.595 5.513 17.352 18.946 17.352 29.99z"
+        fill="url(#paint0_linear_10098_56983)"
+      />
+
+      <Path
+        d="M85.248 98.507c6.767-3.907 6.768-16.573.004-28.29-6.765-11.718-17.734-18.05-24.5-14.143-6.767 3.907-6.768 16.573-.004 28.29 6.765 11.718 17.734 18.05 24.5 14.143z"
+        fill="url(#paint1_linear_10098_56983)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M57.978 68.412c0 4.457 1.473 9.789 4.44 14.928 2.967 5.138 6.847 9.08 10.707 11.309 3.868 2.233 7.647 2.71 10.484 1.072 2.838-1.638 4.313-5.15 4.314-9.617 0-4.456-1.474-9.788-4.44-14.927-2.967-5.139-6.848-9.081-10.707-11.309-3.868-2.233-7.647-2.71-10.484-1.072-2.838 1.638-4.313 5.15-4.314 9.616zm-.704 0c0-4.59 1.518-8.409 4.666-10.226 3.147-1.818 7.213-1.223 11.188 1.072 3.985 2.3 7.947 6.34 10.965 11.567 3.017 5.226 4.534 10.679 4.534 15.28 0 4.59-1.518 8.408-4.666 10.226-3.147 1.817-7.213 1.222-11.188-1.072-3.985-2.3-7.948-6.34-10.965-11.567-3.017-5.227-4.535-10.679-4.534-15.28z"
+        fill="#0CDDB3"
+      />
+
+      <G opacity={0.2} stroke="#1D45BA" strokeWidth={0.5}>
+        <Path d="M98.531 218.428L273.5 123.352M32.042 171.056l163.219-88.69M88.38 71l184.318 100.027M8.5 136.15L163.006 220" />
+      </G>
+
+      <Path
+        opacity={0.7}
+        d="M221.299 167.686c10.935 6.249 10.935 16.379 0 22.628-10.934 6.248-28.663 6.248-39.598 0-10.935-6.249-10.935-16.379 0-22.628 10.935-6.248 28.664-6.248 39.598 0zM243.5 106.928l-15.305 1.896-50.626-29.32a11.152 11.152 0 00-11.186 0l-81.21 47.032-26.673 3.303.882 14.653c0 1.759.868 3.518 2.605 4.525l4.596 2.662 59.095 34.222a8.14 8.14 0 008.169 0l101.307-58.67 4.73-2.741c1.667-.963 2.518-2.636 2.557-4.327l1.059-13.235z"
+        fill="#52FCFF"
+      />
+
+      <Path
+        d="M242.454 99l-14.507 7.163 2.89 2.556-96.001 55.897a8.002 8.002 0 01-3.336 1.061V180a8.002 8.002 0 003.336-1.061l105.08-61.181c1.692-.985 2.538-2.71 2.538-4.435a25.033 25.033 0 000-14.323z"
+        fill="url(#paint2_linear_10098_56983)"
+      />
+
+      <Mask id="a" maskUnits="userSpaceOnUse" x={58} y={122} width={73} height={58}>
+        <Path
+          d="M126.076 164.211l-57.97-33.468 2.36-1.806-10.808-6.086-.199.906a29.37 29.37 0 00.199 13.454c0 1.758.87 3.515 2.61 4.52l63.808 36.838a8.16 8.16 0 004.811 1.063v-14.358a8.16 8.16 0 01-4.811-1.063z"
+          fill="#fff"
+        />
+      </Mask>
+
+      <G mask="url(#a)">
+        <Path
+          d="M126.076 164.211l-57.97-33.468 2.36-1.806-10.808-6.086-.199.906a29.37 29.37 0 00.199 13.454c0 1.758.87 3.515 2.61 4.52l63.808 36.838a8.16 8.16 0 004.811 1.063v-14.358a8.16 8.16 0 01-4.811-1.063z"
+          fill="url(#paint3_linear_10098_56983)"
+        />
+      </G>
+
+      <Path
+        d="M60.022 123.384l-.089.402a29.16 29.16 0 00.197 13.281c.007.03.011.061.011.094 0 1.749.904 3.314 2.418 4.19l63.773 36.841a7.744 7.744 0 004.584 1.013 7.728 7.728 0 003.215-1.013l106.173-61.338a4.704 4.704 0 002.374-4.115c0-.03.004-.061.011-.091a24.483 24.483 0 00.131-13.726l-13.738 6.73 2.49 2.185c.093.081.14.203.129.324a.387.387 0 01-.189.294l-97 56.036a8.455 8.455 0 01-3.529 1.114 8.481 8.481 0 01-5.032-1.114l-57.939-33.468a.388.388 0 01-.19-.306.379.379 0 01.15-.327l1.9-1.456-9.85-5.55zM130.214 180a8.5 8.5 0 01-4.263-1.147l-63.773-36.841a5.546 5.546 0 01-2.798-4.806 29.91 29.91 0 01-.191-13.582l.199-.906a.38.38 0 01.559-.251l10.801 6.085a.384.384 0 01.045.635l-1.905 1.461 57.444 33.185a7.739 7.739 0 004.585 1.013 7.735 7.735 0 003.214-1.013l96.539-55.773-2.521-2.213a.382.382 0 01.084-.628l14.658-7.18a.391.391 0 01.32-.008c.103.045.18.134.213.24a25.222 25.222 0 01.015 14.526 5.453 5.453 0 01-2.754 4.717l-106.173 61.339a8.483 8.483 0 01-3.529 1.112 9.01 9.01 0 01-.769.035z"
+        fill="#0CDDB3"
+      />
+
+      <Path
+        d="M235.5 105.625L134.536 163.91a8.097 8.097 0 01-3.356 1.058 8.117 8.117 0 01-4.786-1.058L67.5 129.912l99.462-57.418a11.145 11.145 0 0111.148 0l57.39 33.131z"
+        fill="#3C3568"
+      />
+
+      <Mask id="b" maskUnits="userSpaceOnUse" x={59} y={56} width={185} height={110}>
+        <Path
+          d="M240.492 102.877l-4.738 2.737-101.494 58.597a8.13 8.13 0 01-3.373 1.063 8.16 8.16 0 01-4.811-1.063l-59.203-34.18-4.605-2.658c-3.48-2.01-3.48-7.031 0-9.041l104.588-60.384a11.204 11.204 0 0111.207 0l62.429 36.043c3.421 1.977 3.421 6.912 0 8.886z"
+          fill="#fff"
+        />
+      </Mask>
+
+      <G mask="url(#b)">
+        <Path
+          d="M240.492 102.877l-4.738 2.737-101.494 58.597a8.13 8.13 0 01-3.373 1.063 8.16 8.16 0 01-4.811-1.063l-59.203-34.18-4.605-2.658c-3.48-2.01-3.48-7.031 0-9.041l104.588-60.384a11.204 11.204 0 0111.207 0l62.429 36.043c3.421 1.977 3.421 6.912 0 8.886z"
+          fill="url(#paint4_linear_10098_56983)"
+        />
+      </G>
+
+      <Path
+        d="M172.583 56.765c-1.87 0-3.74.485-5.408 1.453L62.679 118.809a4.813 4.813 0 00-2.417 4.204c0 1.756.903 3.328 2.417 4.207l63.752 36.966a7.71 7.71 0 004.583 1.016 7.701 7.701 0 003.213-1.016l106.139-61.546a4.719 4.719 0 002.372-4.126 4.717 4.717 0 00-2.372-4.128l-62.375-36.168a10.773 10.773 0 00-5.408-1.453zM130.317 166a8.477 8.477 0 01-4.267-1.153l-63.752-36.966a5.568 5.568 0 01-2.798-4.868 5.566 5.566 0 012.798-4.865l104.496-60.593a11.554 11.554 0 0111.578 0l62.375 36.168a5.481 5.481 0 012.753 4.791c0 2-1.03 3.788-2.753 4.789l-106.139 61.544a8.44 8.44 0 01-3.527 1.117 8.527 8.527 0 01-.764.036z"
+        fill="#0CDDB3"
+      />
+
+      <Path
+        d="M172.218 91.545l3.053 1.715a13.635 13.635 0 0013.313.01l23.224-13.018a1.33 1.33 0 00.001-2.333l-11.884-6.683a1.866 1.866 0 00-1.818 0l-25.885 14.51a3.303 3.303 0 00-.004 5.799z"
+        fill="#0CDDB3"
+      />
+
+      <Path
+        d="M187.157 85.318c3.124 1.757 3.124 4.607 0 6.364-3.124 1.757-8.19 1.757-11.314 0-3.124-1.757-3.124-4.607 0-6.364 3.124-1.757 8.19-1.757 11.314 0z"
+        fill="url(#paint5_linear_10098_56983)"
+      />
+
+      <Path
+        d="M176.5 167.372l51 .373v6.23c0 3.323-2.495 6.64-7.472 9.174-9.961 5.055-26.103 5.055-36.063 0-4.977-2.527-7.465-5.851-7.465-9.174v-6.603z"
+        fill="url(#paint6_linear_10098_56983)"
+      />
+
+      <Path
+        d="M220.03 176.939c-9.961 5.033-26.102 5.033-36.062 0-9.961-5.033-9.954-13.211 0-18.244 9.953-5.033 26.101-5.033 36.062 0 9.96 5.033 9.96 13.199 0 18.244z"
+        fill="url(#paint7_linear_10098_56983)"
+      />
+
+      <Path
+        d="M201.5 178.935c12.15 0 22-5.177 22-11.563 0-6.386-9.85-11.562-22-11.562s-22 5.176-22 11.562c0 6.386 9.85 11.563 22 11.563z"
+        fill="url(#paint8_linear_10098_56983)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M211.357 163.362c-.463-.237-1.203-.19-1.666.048l-2.498 1.283-2.405-.523 1.573-.808c.462-.237.555-.618.092-.855-.462-.238-1.202-.238-1.665 0l-2.267 1.164-9.899-2.138c-.463-.095-.925-.048-1.295.142-.324.167-.417.452-.278.666l4.256 4.989-2.221 1.14c-.462.237-.555.618-.092.855.462.238 1.203.238 1.665 0l1.619-.831 1.018 1.235-2.452 1.259c-.462.238-.555.618-.092.855.462.238 1.202.238 1.665 0l1.897-.974 3.562 4.11c.231.309.925.428 1.526.309.139-.024.231-.071.324-.119.324-.166.463-.427.278-.665l-3.84-4.49 7.494-3.849 8.882 1.948c.462.096.925.048 1.295-.142.093-.048.185-.095.278-.19.231-.309 0-.665-.602-.784l-8.049-1.758 1.897-.974c.462-.285.509-.689 0-.903zm-16.931-.142l6.245 1.354-3.562 1.829-2.683-3.183zm3.747 4.347l1.018 1.235 6.198-3.183-2.405-.523-4.811 2.471z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M209.691 163.41l-.133-.069.133.069zm1.666-.048l-.134.069.007.003.007.003.12-.075zm-4.164 1.331l-.073.089.117.025.09-.046-.134-.068zm-2.405-.523l-.133-.069-.199.102.258.056.074-.089zm1.573-.808l-.134-.068.134.068zm-3.84.309l-.073.089.117.026.09-.046-.134-.069zm-9.899-2.138l.073-.089-.003-.001-.07.09zm-1.573.808l-.18.03.007.009.173-.039zm4.256 4.989l.133.068.091-.047-.051-.06-.173.039zm-.648 1.995l.134.069-.134-.069zm1.619-.831l.174-.038-.109-.133-.198.102.133.069zm1.018 1.235l.133.068.09-.046-.049-.06-.174.038zm-2.452 1.259l-.133-.068.133.068zm3.47-.119l.172-.039-.112-.129-.194.1.134.068zm3.562 4.11l.176-.035-.004-.004-.172.039zm1.526.309l-.06-.092-.008.002.068.09zm.602-.784l.175-.036-.003-.003-.172.039zm-3.84-4.49l-.133-.068-.092.046.052.061.173-.039zm7.494-3.849l.074-.089-.117-.025-.09.046.133.068zm8.882 1.948l-.074.09h.004l.07-.09zm1.573-.332l.168.043.004-.004.004-.004-.176-.035zm-.602-.784l-.074.089.006.001.068-.09zm-8.049-1.758l-.133-.069-.198.102.257.056.074-.089zm1.897-.974l.134.069.011-.007-.145-.062zm-10.686.309l.133.068.198-.102-.258-.056-.073.09zm-6.245-1.354l.073-.09-.433-.094.186.222.174-.038zm2.683 3.183l-.173.039.11.13.196-.1-.133-.069zm2.082 2.399l-.174.038.109.133.198-.102-.133-.069zm-1.018-1.235l-.133-.069-.09.047.049.06.174-.038zm7.216-1.948l.134.068.198-.101-.258-.056-.074.089zm-2.405-.523l.073-.089-.117-.025-.09.046.134.068zm6.841-1.618c.409-.21 1.028-.238 1.398-.047l.267-.137c-.555-.285-1.416-.218-1.932.047l.267.137zm-2.498 1.283l2.498-1.283-.267-.137-2.498 1.283.267.137zm-2.613-.502l2.406.523.147-.179-2.406-.522-.147.178zm1.513-.965l-1.572.807.266.137 1.573-.807-.267-.137zm.093-.719c.37.191.316.509-.093.719l.267.137c.516-.265.648-.708.093-.993l-.267.137zm-1.399 0c.389-.199 1.01-.199 1.399 0l.267-.137c-.537-.275-1.396-.275-1.932 0l.266.137zm-2.266 1.165l2.266-1.165-.266-.137-2.267 1.164.267.138zm-10.106-2.118l9.899 2.138.146-.178-9.899-2.138-.146.178zm-1.089.122c.318-.163.701-.201 1.092-.121l.14-.18c-.534-.11-1.077-.053-1.499.164l.267.137zm-.232.566c-.119-.184-.034-.429.232-.566l-.267-.137c-.381.196-.481.521-.323.764l.358-.061zm4.25 4.981l-4.256-4.989-.346.078 4.256 4.988.346-.077zm-2.26 1.247l2.22-1.14-.267-.137-2.22 1.14.267.137zm-.093.719c-.37-.191-.316-.509.093-.719l-.267-.137c-.516.265-.647.708-.093.993l.267-.137zm1.399 0c-.389.199-1.01.199-1.399 0l-.267.137c.537.275 1.396.275 1.933 0l-.267-.137zm1.619-.832l-1.619.832.267.137 1.619-.832-.267-.137zm1.325 1.266l-1.018-1.235-.348.075 1.018 1.236.348-.076zm-2.492 1.366l2.451-1.26-.266-.137-2.452 1.26.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.648.707-.093.992l.267-.137zm1.399 0c-.389.199-1.01.199-1.399 0l-.267.137c.537.275 1.396.275 1.932 0l-.266-.137zm1.896-.974l-1.896.974.266.137 1.897-.974-.267-.137zm3.868 4.139l-3.562-4.11-.345.079 3.562 4.11.345-.079zm1.286.258c-.524.103-1.096-.005-1.282-.254l-.353.07c.277.369 1.093.498 1.771.364l-.136-.18zm.259-.097a.803.803 0 01-.251.095l.12.184c.187-.032.308-.096.397-.142l-.266-.137zm.235-.561c.155.198.04.419-.235.561l.266.137c.372-.191.535-.493.32-.77l-.351.072zm-3.837-4.487l3.84 4.49.345-.078-3.839-4.49-.346.078zm7.534-3.956l-7.494 3.849.266.137 7.494-3.849-.266-.137zm9.089 1.927l-8.882-1.948-.148.179 8.882 1.948.148-.179zm1.088-.122c-.318.164-.701.202-1.092.122l-.14.179c.534.11 1.076.053 1.498-.164l-.266-.137zm.242-.164a.843.843 0 01-.242.164l.266.137c.097-.049.207-.105.313-.215l-.337-.086zm-.501-.651c.485.096.695.39.493.659l.353.07c.261-.349.008-.768-.71-.91l-.136.181zm-8.055-1.759l8.049 1.758.148-.178-8.049-1.758-.148.178zm1.837-1.132l-1.896.974.267.137 1.896-.974-.267-.137zm.014-.759c.398.167.398.505-.025.766l.29.124c.502-.31.594-.78-.026-1.04l-.239.15zm-10.493 1.047l-6.245-1.354-.147.179 6.245 1.354.147-.179zm-3.502 1.988l3.562-1.83-.267-.137-3.562 1.83.267.137zm-2.99-3.214l2.684 3.184.346-.077-2.683-3.184-.347.077zm5.112 5.507l-1.017-1.236-.348.076 1.018 1.235.347-.075zm5.892-3.215l-6.199 3.184.267.137 6.199-3.184-.267-.137zm-2.346-.364l2.406.522.147-.178-2.406-.523-.147.179zm-4.604 2.45l4.811-2.471-.267-.137-4.81 2.47.266.138z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M176.5 156.188l51 .373v6.23c0 3.324-2.495 6.641-7.472 9.174-9.961 5.055-26.103 5.055-36.063 0-4.977-2.527-7.465-5.85-7.465-9.174v-6.603z"
+        fill="url(#paint9_linear_10098_56983)"
+      />
+
+      <Path
+        d="M220.03 165.756c-9.961 5.032-26.102 5.032-36.062 0-9.961-5.033-9.954-13.212 0-18.245 9.953-5.033 26.101-5.033 36.062 0 9.96 5.033 9.96 13.199 0 18.245z"
+        fill="url(#paint10_linear_10098_56983)"
+      />
+
+      <Path
+        d="M201.5 167.751c12.15 0 22-5.177 22-11.563 0-6.386-9.85-11.563-22-11.563s-22 5.177-22 11.563c0 6.386 9.85 11.563 22 11.563z"
+        fill="url(#paint11_linear_10098_56983)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M211.357 152.179c-.463-.238-1.203-.19-1.666.047l-2.498 1.283-2.405-.523 1.573-.807c.462-.238.555-.618.092-.856-.462-.237-1.202-.237-1.665 0l-2.267 1.164-9.899-2.138c-.463-.095-.925-.047-1.295.143-.324.166-.417.451-.278.665l4.256 4.989-2.221 1.14c-.462.238-.555.618-.092.855.462.238 1.203.238 1.665 0l1.619-.831 1.018 1.235-2.452 1.259c-.462.238-.555.618-.092.856.462.237 1.202.237 1.665 0l1.897-.974 3.562 4.11c.231.308.925.427 1.526.308.139-.023.231-.071.324-.118.324-.167.463-.428.278-.666l-3.84-4.49 7.494-3.848 8.882 1.948c.462.095.925.047 1.295-.143a.958.958 0 00.278-.19c.231-.309 0-.665-.602-.784l-8.049-1.758 1.897-.974c.462-.285.509-.689 0-.902zm-16.931-.143l6.245 1.354-3.562 1.829-2.683-3.183zm3.747 4.348l1.018 1.235 6.198-3.183-2.405-.523-4.811 2.471z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M209.691 152.226l-.133-.068.133.068zm1.666-.047l-.134.068.007.004.007.003.12-.075zm-4.164 1.33l-.073.089.117.026.09-.047-.134-.068zm-2.405-.523l-.133-.068-.199.101.258.057.074-.09zm1.573-.807l-.134-.069.134.069zm-3.84.308l-.073.09.117.025.09-.046-.134-.069zm-9.899-2.138l.073-.089-.003-.001-.07.09zm-1.573.808l-.18.031.007.008.173-.039zm4.256 4.989l.133.068.091-.046-.051-.061-.173.039zm-.648 1.995l-.133-.068.133.068zm1.619-.831l.174-.038-.109-.132-.198.101.133.069zm1.018 1.235l.133.069.09-.046-.049-.06-.174.037zm-2.452 1.259l-.133-.068.133.068zm3.47-.118l.172-.04-.112-.129-.194.1.134.069zm3.562 4.11l.176-.035-.004-.005-.172.04zm1.526.308l-.06-.092-.008.002.068.09zm.602-.784l.175-.036-.003-.003-.172.039zm-3.84-4.49l-.133-.068-.092.047.052.06.173-.039zm7.494-3.848l.074-.089-.117-.026-.09.046.133.069zm8.882 1.948l-.074.089.004.001.07-.09zm1.573-.333l.168.044.004-.005.004-.004-.176-.035zm-.602-.784l-.074.09.006.001.068-.091zm-8.049-1.758l-.133-.068-.198.101.257.057.074-.09zm1.897-.974l.134.069.011-.007-.145-.062zm-10.686.309l.133.069.198-.102-.258-.056-.073.089zm-6.245-1.354l.073-.089-.433-.094.186.222.174-.039zm2.683 3.183l-.173.039.11.131.196-.101-.133-.069zm2.082 2.4l-.174.038.109.132.198-.101-.133-.069zm-1.018-1.235l-.133-.069-.09.046.049.061.174-.038zm7.216-1.948l.134.068.198-.101-.258-.057-.074.09zm-2.405-.523l.073-.089-.117-.026-.09.047.134.068zm6.841-1.618c.409-.21 1.028-.238 1.398-.048l.267-.137c-.555-.285-1.416-.218-1.932.048l.267.137zm-2.498 1.282l2.498-1.282-.267-.137-2.498 1.282.267.137zm-2.613-.501l2.406.522.147-.178-2.406-.523-.147.179zm1.513-.966l-1.572.808.266.137 1.573-.808-.267-.137zm.093-.718c.37.19.316.508-.093.718l.267.137c.516-.265.648-.707.093-.992l-.267.137zm-1.399 0c.389-.2 1.01-.2 1.399 0l.267-.137c-.537-.276-1.396-.276-1.932 0l.266.137zm-2.266 1.164l2.266-1.164-.266-.137-2.267 1.164.267.137zm-10.106-2.117l9.899 2.138.146-.179-9.899-2.138-.146.179zm-1.089.121c.318-.163.701-.201 1.092-.121l.14-.18c-.534-.109-1.077-.053-1.499.164l.267.137zm-.232.566c-.119-.184-.034-.429.232-.566l-.267-.137c-.381.196-.481.521-.323.765l.358-.062zm4.25 4.981l-4.256-4.989-.346.078 4.256 4.989.346-.078zm-2.26 1.248l2.22-1.141-.267-.137-2.22 1.141.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.647.707-.093.992l.267-.137zm1.399 0c-.389.2-1.01.2-1.399 0l-.267.137c.537.275 1.396.275 1.933 0l-.267-.137zm1.619-.832l-1.619.832.267.137 1.619-.831-.267-.138zm1.325 1.267l-1.018-1.236-.348.076 1.018 1.235.348-.075zm-2.492 1.365l2.451-1.259-.266-.137-2.452 1.259.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.648.707-.093.992l.267-.137zm1.399 0c-.389.2-1.01.2-1.399 0l-.267.137c.537.276 1.396.276 1.932 0l-.266-.137zm1.896-.974l-1.896.974.266.137 1.897-.974-.267-.137zm3.868 4.139l-3.562-4.11-.345.079 3.562 4.11.345-.079zm1.286.258c-.524.104-1.096-.004-1.282-.253l-.353.069c.277.369 1.093.499 1.771.365l-.136-.181zm.259-.097a.803.803 0 01-.251.095l.12.184c.187-.032.308-.096.397-.142l-.266-.137zm.235-.561c.155.199.04.42-.235.561l.266.137c.372-.191.535-.493.32-.77l-.351.072zm-3.837-4.487l3.84 4.49.345-.078-3.839-4.49-.346.078zm7.534-3.956l-7.494 3.849.266.137 7.494-3.849-.266-.137zm9.089 1.928l-8.882-1.948-.148.178 8.882 1.948.148-.178zm1.088-.122c-.318.163-.701.201-1.092.121l-.14.18c.534.11 1.076.053 1.498-.164l-.266-.137zm.242-.165c-.079.081-.154.119-.242.165l.266.137c.097-.05.207-.106.313-.215l-.337-.087zm-.501-.65c.485.096.695.389.493.659l.353.069c.261-.348.008-.767-.71-.909l-.136.181zm-8.055-1.759l8.049 1.758.148-.179-8.049-1.758-.148.179zm1.837-1.132l-1.896.974.267.137 1.896-.974-.267-.137zm.014-.759c.398.167.398.505-.025.765l.29.124c.502-.309.594-.779-.026-1.039l-.239.15zm-10.493 1.047l-6.245-1.354-.147.178 6.245 1.354.147-.178zm-3.502 1.987l3.562-1.829-.267-.137-3.562 1.829.267.137zm-2.99-3.213l2.684 3.183.346-.077-2.683-3.183-.347.077zm5.112 5.506l-1.017-1.235-.348.076 1.018 1.235.347-.076zm5.892-3.214l-6.199 3.184.267.137 6.199-3.184-.267-.137zm-2.346-.365l2.406.523.147-.179-2.406-.522-.147.178zm-4.604 2.45l4.811-2.47-.267-.137-4.81 2.47.266.137z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M176.5 145.004l51 .373v6.23c0 3.323-2.495 6.641-7.472 9.174-9.961 5.055-26.103 5.055-36.063 0-4.977-2.527-7.465-5.851-7.465-9.174v-6.603z"
+        fill="url(#paint12_linear_10098_56983)"
+      />
+
+      <Path
+        d="M220.03 154.571c-9.961 5.033-26.102 5.033-36.062 0-9.961-5.033-9.954-13.211 0-18.244 9.953-5.033 26.101-5.033 36.062 0 9.96 5.033 9.96 13.199 0 18.244z"
+        fill="url(#paint13_linear_10098_56983)"
+      />
+
+      <Path
+        d="M201.5 156.567c12.15 0 22-5.176 22-11.562 0-6.386-9.85-11.563-22-11.563s-22 5.177-22 11.563c0 6.386 9.85 11.562 22 11.562z"
+        fill="url(#paint14_linear_10098_56983)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M211.357 140.995c-.463-.238-1.203-.19-1.666.047l-2.498 1.283-2.405-.522 1.573-.808c.462-.238.555-.618.092-.855-.462-.238-1.202-.238-1.665 0l-2.267 1.164-9.899-2.138c-.463-.095-.925-.048-1.295.142-.324.167-.417.452-.278.665l4.256 4.989-2.221 1.141c-.462.237-.555.617-.092.855.462.237 1.203.237 1.665 0l1.619-.832 1.018 1.236-2.452 1.259c-.462.237-.555.618-.092.855.462.238 1.202.238 1.665 0l1.897-.974 3.562 4.11c.231.309.925.428 1.526.309.139-.024.231-.071.324-.119.324-.166.463-.428.278-.665l-3.84-4.49 7.494-3.849 8.882 1.948c.462.095.925.048 1.295-.142.093-.048.185-.095.278-.19.231-.309 0-.665-.602-.784l-8.049-1.758 1.897-.974c.462-.285.509-.689 0-.903zm-16.931-.143l6.245 1.355-3.562 1.829-2.683-3.184zm3.747 4.348l1.018 1.235 6.198-3.183-2.405-.523-4.811 2.471z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M211.357 140.995l-.134.068.007.004.007.003.12-.075zm-4.164 1.33l-.073.09.117.025.09-.046-.134-.069zm-2.405-.522l-.133-.069-.199.102.258.056.074-.089zm1.573-.808l-.134-.069.134.069zm-3.84.309l-.073.089.117.025.09-.046-.134-.068zm-9.899-2.138l.073-.09h-.003l-.07.09zm-1.573.807l-.18.031.007.008.173-.039zm4.256 4.989l.133.069.091-.047-.051-.061-.173.039zm-.648 1.996l-.133-.069.133.069zm1.619-.832l.174-.037-.109-.133-.198.102.133.068zm1.018 1.236l.133.068.09-.046-.049-.06-.174.038zm-2.452 1.259l-.133-.069.133.069zm3.47-.119l.172-.039-.112-.129-.194.1.134.068zm3.562 4.11l.176-.035-.004-.004-.172.039zm1.526.309l-.06-.092-.008.001.068.091zm.602-.784l.175-.036-.003-.003-.172.039zm-3.84-4.49l-.133-.069-.092.047.052.061.173-.039zm7.494-3.849l.074-.089-.117-.026-.09.047.133.068zm8.882 1.948l-.074.089.004.001.07-.09zm1.573-.332l.168.043.004-.004.004-.004-.176-.035zm-.602-.784l-.074.089.006.001.068-.09zm-8.049-1.758l-.133-.069-.198.102.257.056.074-.089zm1.897-.974l.134.069.011-.007-.145-.062zm-10.686.309l.133.068.198-.102-.258-.056-.073.09zm-6.245-1.355l.073-.089-.433-.094.186.222.174-.039zm2.683 3.184l-.173.038.11.131.196-.101-.133-.068zm2.082 2.399l-.174.038.109.132.198-.101-.133-.069zm-1.018-1.235l-.133-.069-.09.046.049.061.174-.038zm7.216-1.948l.134.068.198-.101-.258-.056-.074.089zm-2.405-.523l.073-.089-.117-.026-.09.047.134.068zm6.841-1.618c.409-.21 1.028-.238 1.398-.048l.267-.137c-.555-.284-1.416-.217-1.932.048l.267.137zm-2.498 1.283l2.498-1.283-.267-.137-2.498 1.283.267.137zm-2.613-.502l2.406.523.147-.179-2.406-.523-.147.179zm1.513-.966l-1.572.808.266.137 1.573-.808-.267-.137zm.093-.718c.37.19.316.508-.093.718l.267.137c.516-.265.648-.707.093-.992l-.267.137zm-1.399 0c.389-.199 1.01-.199 1.399 0l.267-.137c-.537-.275-1.396-.275-1.932 0l.266.137zm-2.266 1.164l2.266-1.164-.266-.137-2.267 1.164.267.137zm-10.106-2.117l9.899 2.138.146-.179-9.899-2.138-.146.179zm-1.089.122c.318-.163.701-.202 1.092-.121l.14-.18c-.534-.11-1.077-.053-1.499.164l.267.137zm-.232.566c-.119-.184-.034-.429.232-.566l-.267-.137c-.381.196-.481.521-.323.764l.358-.061zm4.25 4.98l-4.256-4.988-.346.077 4.256 4.989.346-.078zm-2.26 1.248l2.22-1.14-.267-.137-2.22 1.14.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.647.707-.093.992l.267-.137zm1.399 0c-.389.2-1.01.2-1.399 0l-.267.137c.537.276 1.396.276 1.933 0l-.267-.137zm1.619-.831l-1.619.831.267.137 1.619-.831-.267-.137zm1.325 1.266l-1.018-1.235-.348.075 1.018 1.236.348-.076zm-2.492 1.365l2.451-1.259-.266-.137-2.452 1.259.267.137zm-.093.719c-.37-.191-.316-.509.093-.719l-.267-.137c-.516.265-.648.708-.093.993l.267-.137zm1.399 0c-.389.199-1.01.199-1.399 0l-.267.137c.537.275 1.396.275 1.932 0l-.266-.137zm1.896-.974l-1.896.974.266.137 1.897-.974-.267-.137zm3.868 4.139l-3.562-4.11-.345.078 3.562 4.11.345-.078zm1.286.257c-.524.104-1.096-.004-1.282-.253l-.353.07c.277.368 1.093.498 1.771.364l-.136-.181zm.259-.096a.829.829 0 01-.251.095l.12.184c.187-.032.308-.097.397-.142l-.266-.137zm.235-.561c.155.198.04.419-.235.561l.266.137c.372-.191.535-.493.32-.77l-.351.072zm-3.837-4.487l3.84 4.49.345-.078-3.839-4.49-.346.078zm7.534-3.956l-7.494 3.848.266.137 7.494-3.848-.266-.137zm9.089 1.927l-8.882-1.948-.148.178 8.882 1.948.148-.178zm1.088-.122c-.318.163-.701.202-1.092.121l-.14.18c.534.11 1.076.053 1.498-.164l-.266-.137zm.242-.165a.827.827 0 01-.242.165l.266.137c.097-.049.207-.106.313-.215l-.337-.087zm-.501-.65c.485.096.695.39.493.659l.353.07c.261-.349.008-.768-.71-.91l-.136.181zm-8.055-1.759l8.049 1.758.148-.178-8.049-1.758-.148.178zm1.837-1.132l-1.896.974.267.137 1.896-.974-.267-.137zm.014-.759c.398.167.398.505-.025.766l.29.124c.502-.31.594-.78-.026-1.04l-.239.15zm-10.493 1.047l-6.245-1.354-.147.179 6.245 1.354.147-.179zm-3.502 1.987l3.562-1.829-.267-.137-3.562 1.829.267.137zm-2.99-3.213l2.684 3.183.346-.077-2.683-3.183-.347.077zm5.112 5.506l-1.017-1.235-.348.076 1.018 1.235.347-.076zm5.892-3.214l-6.199 3.184.267.137 6.199-3.184-.267-.137zm-2.346-.365l2.406.523.147-.178-2.406-.523-.147.178zm-4.604 2.45l4.811-2.47-.267-.137-4.81 2.47.266.137z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M176.5 133.82l51 .373v6.23c0 3.323-2.495 6.64-7.472 9.174-9.961 5.055-26.103 5.055-36.063 0-4.977-2.527-7.465-5.851-7.465-9.174v-6.603z"
+        fill="url(#paint15_linear_10098_56983)"
+      />
+
+      <Path
+        d="M220.03 143.387c-9.961 5.033-26.102 5.033-36.062 0-9.961-5.033-9.954-13.211 0-18.244 9.953-5.033 26.101-5.033 36.062 0 9.96 5.033 9.96 13.199 0 18.244z"
+        fill="url(#paint16_linear_10098_56983)"
+      />
+
+      <Path
+        d="M201.5 145.383c12.15 0 22-5.176 22-11.562 0-6.386-9.85-11.563-22-11.563s-22 5.177-22 11.563c0 6.386 9.85 11.562 22 11.562z"
+        fill="url(#paint17_linear_10098_56983)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M211.357 129.81c-.463-.237-1.203-.19-1.666.048l-2.498 1.283-2.405-.523 1.573-.808c.462-.237.555-.617.092-.855-.462-.237-1.202-.237-1.665 0l-2.267 1.164-9.899-2.138c-.463-.095-.925-.047-1.295.143-.324.166-.417.451-.278.665l4.256 4.989-2.221 1.14c-.462.238-.555.618-.092.855.462.238 1.203.238 1.665 0l1.619-.831 1.018 1.235-2.452 1.259c-.462.238-.555.618-.092.856.462.237 1.202.237 1.665 0l1.897-.974 3.562 4.109c.231.309.925.428 1.526.309.139-.023.231-.071.324-.119.324-.166.463-.427.278-.665l-3.84-4.49 7.494-3.848 8.882 1.948c.462.095.925.047 1.295-.143a.958.958 0 00.278-.19c.231-.309 0-.665-.602-.784l-8.049-1.758 1.897-.974c.462-.285.509-.689 0-.903zm-16.931-.142l6.245 1.354-3.562 1.829-2.683-3.183zm3.747 4.348l1.018 1.235 6.198-3.183-2.405-.523-4.811 2.471z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M209.691 129.858l-.133-.069.133.069zm1.666-.048l-.134.069.007.003.007.003.12-.075zm-4.164 1.331l-.073.089.117.025.09-.046-.134-.068zm-2.405-.523l-.133-.068-.199.101.258.056.074-.089zm1.573-.808l.133.069-.133-.069zm-3.84.309l-.073.09.117.025.09-.046-.134-.069zm-9.899-2.138l.073-.089-.003-.001-.07.09zm-1.573.808l-.18.031.007.008.173-.039zm4.256 4.989l.133.068.091-.046-.051-.061-.173.039zm-.648 1.995l.134.069-.134-.069zm1.619-.831l.174-.038-.109-.132-.198.101.133.069zm1.018 1.235l.133.069.09-.046-.049-.061-.174.038zm1.018 1.141l.172-.04-.112-.129-.194.1.134.069zm3.562 4.109l.176-.034-.004-.005-.172.039zm1.526.309l-.06-.092-.008.002.068.09zm.602-.784l.175-.036-.003-.003-.172.039zm-3.84-4.49l-.133-.068-.092.047.052.06.173-.039zm7.494-3.848l.074-.089-.117-.026-.09.046.133.069zm8.882 1.948l-.074.089.004.001.07-.09zm1.573-.333l.168.043.004-.004.004-.004-.176-.035zm-.602-.784l-.074.089.006.002.068-.091zm-8.049-1.758l-.133-.068-.198.101.257.056.074-.089zm1.897-.974l.134.069.011-.007-.145-.062zm-10.686.309l.133.069.198-.102-.258-.056-.073.089zm-6.245-1.354l.073-.089-.433-.094.186.221.174-.038zm2.683 3.183l-.173.039.11.131.196-.101-.133-.069zm2.082 2.4l-.174.038.109.132.198-.101-.133-.069zm-1.018-1.235l-.133-.069-.09.046.049.06.174-.037zm7.216-1.948l.134.068.198-.102-.258-.056-.074.09zm-2.405-.523l.073-.089-.117-.026-.09.046.134.069zm6.841-1.619c.409-.21 1.028-.237 1.398-.047l.267-.137c-.555-.285-1.416-.218-1.932.047l.267.137zm-2.498 1.283l2.498-1.283-.267-.137-2.498 1.283.267.137zm-2.613-.502l2.406.523.147-.178-2.406-.523-.147.178zm1.513-.965l-1.572.808.266.137 1.573-.808-.267-.137zm.093-.718c.37.19.316.508-.093.718l.267.137c.516-.265.648-.707.093-.992l-.267.137zm-1.399 0c.389-.2 1.01-.2 1.399 0l.267-.137c-.537-.276-1.396-.276-1.932 0l.266.137zm-2.266 1.164l2.266-1.164-.266-.137-2.267 1.164.267.137zm-10.106-2.118l9.899 2.139.146-.179-9.899-2.138-.146.178zm-1.089.122c.318-.163.701-.201 1.092-.121l.14-.18c-.534-.11-1.077-.053-1.499.164l.267.137zm-.232.566c-.119-.184-.034-.429.232-.566l-.267-.137c-.381.196-.481.521-.323.765l.358-.062zm4.25 4.981l-4.256-4.989-.346.078 4.256 4.989.346-.078zm-2.26 1.248l2.22-1.141-.267-.137-2.22 1.141.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.647.707-.093.992l.267-.137zm1.399 0c-.389.2-1.01.2-1.399 0l-.267.137c.537.275 1.396.275 1.933 0l-.267-.137zm1.619-.832l-1.619.832.267.137 1.619-.832-.267-.137zm1.325 1.266l-1.018-1.235-.348.076 1.018 1.235.348-.076zm-2.492 1.366l2.451-1.259-.266-.137-2.452 1.259.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.648.707-.093.992l.267-.137zm1.399 0c-.389.2-1.01.2-1.399 0l-.267.137c.537.275 1.396.275 1.932 0l-.266-.137zm1.896-.974l-1.896.974.266.137 1.897-.974-.267-.137zm3.868 4.139l-3.562-4.11-.345.079 3.562 4.11.345-.079zm1.286.258c-.524.103-1.096-.004-1.282-.253l-.353.069c.277.369 1.093.499 1.771.365l-.136-.181zm.259-.097a.803.803 0 01-.251.095l.12.184c.187-.032.308-.096.397-.142l-.266-.137zm.235-.561c.155.198.04.419-.235.561l.266.137c.372-.191.535-.493.32-.77l-.351.072zm-3.837-4.487l3.84 4.49.345-.078-3.839-4.49-.346.078zm7.534-3.956l-7.494 3.849.266.137 7.494-3.849-.266-.137zm9.089 1.928l-8.882-1.948-.148.178 8.882 1.948.148-.178zm1.088-.122c-.318.163-.701.201-1.092.121l-.14.18c.534.109 1.076.053 1.498-.164l-.266-.137zm.242-.165c-.079.081-.154.119-.242.165l.266.137c.097-.05.207-.106.313-.216l-.337-.086zm-.501-.65c.485.095.695.389.493.658l.353.07c.261-.348.008-.767-.71-.909l-.136.181zm-8.055-1.76l8.049 1.758.148-.178-8.049-1.758-.148.178zm1.837-1.131l-1.896.974.267.137 1.896-.974-.267-.137zm.014-.76c.398.168.398.506-.025.766l.29.124c.502-.309.594-.779-.026-1.04l-.239.15zm-10.493 1.048l-6.245-1.354-.147.178 6.245 1.354.147-.178zm-3.502 1.987l3.562-1.829-.267-.137-3.562 1.829.267.137zm-2.99-3.214l2.684 3.184.346-.077-2.683-3.184-.347.077zm5.112 5.507l-1.017-1.235-.348.075 1.018 1.236.347-.076zm5.892-3.214l-6.199 3.184.267.137 6.199-3.184-.267-.137zm-2.346-.365l2.406.523.147-.179-2.406-.522-.147.178zm-4.604 2.45l4.811-2.47-.267-.138-4.81 2.471.266.137z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M176.5 122.636l51 .373v6.229c0 3.324-2.495 6.641-7.472 9.175-9.961 5.054-26.103 5.054-36.063 0-4.977-2.528-7.465-5.851-7.465-9.175v-6.602z"
+        fill="url(#paint18_linear_10098_56983)"
+      />
+
+      <Path
+        d="M220.03 132.203c-9.961 5.033-26.102 5.033-36.062 0-9.961-5.033-9.954-13.212 0-18.245 9.953-5.033 26.101-5.033 36.062 0 9.96 5.033 9.96 13.199 0 18.245z"
+        fill="url(#paint19_linear_10098_56983)"
+      />
+
+      <Path
+        d="M201.5 134.199c12.15 0 22-5.177 22-11.563 0-6.386-9.85-11.563-22-11.563s-22 5.177-22 11.563c0 6.386 9.85 11.563 22 11.563z"
+        fill="url(#paint20_linear_10098_56983)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M211.357 118.626c-.463-.237-1.203-.19-1.666.048l-2.498 1.283-2.405-.523 1.573-.808c.462-.237.555-.617.092-.855-.462-.237-1.202-.237-1.665 0l-2.267 1.164-9.899-2.138c-.463-.095-.925-.047-1.295.143-.324.166-.417.451-.278.665l4.256 4.989-2.221 1.14c-.462.238-.555.618-.092.855.462.238 1.203.238 1.665 0l1.619-.831 1.018 1.235-2.452 1.259c-.462.238-.555.618-.092.855.462.238 1.202.238 1.665 0l1.897-.974 3.562 4.11c.231.309.925.428 1.526.309.139-.024.231-.071.324-.119.324-.166.463-.427.278-.665l-3.84-4.49 7.494-3.848 8.882 1.948c.462.095.925.047 1.295-.143a.958.958 0 00.278-.19c.231-.309 0-.665-.602-.784l-8.049-1.758 1.897-.974c.462-.285.509-.689 0-.903zm-16.931-.142l6.245 1.354-3.562 1.829-2.683-3.183zm3.747 4.347l1.018 1.236 6.198-3.184-2.405-.522-4.811 2.47z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M211.357 118.626l-.134.069.007.003.007.003.12-.075zm-4.164 1.331l-.073.089.117.025.09-.046-.134-.068zm-2.405-.523l-.133-.068-.199.101.258.056.074-.089zm-2.267-.499l-.073.089.117.026.09-.046-.134-.069zm-9.899-2.138l.073-.089-.003-.001-.07.09zm-1.573.808l-.18.031.007.008.173-.039zm4.256 4.989l.133.068.091-.047-.051-.06-.173.039zm-2.221 1.14l.134.069-.134-.069zm3.192.024l.174-.038-.109-.132-.198.101.133.069zm1.018 1.235l.133.069.09-.047-.049-.06-.174.038zm1.018 1.14l.172-.039-.112-.129-.194.1.134.068zm3.562 4.11l.176-.034-.004-.005-.172.039zm1.526.309l-.06-.092-.008.002.068.09zm.602-.784l.175-.036-.003-.003-.172.039zm-3.84-4.49l-.133-.068-.092.047.052.06.173-.039zm7.494-3.848l.074-.09-.117-.025-.09.046.133.069zm8.882 1.948l-.074.089.004.001.07-.09zm1.573-.333l.168.043.004-.004.004-.004-.176-.035zm-.602-.784l-.074.089.006.002.068-.091zm-8.049-1.758l-.133-.068-.198.101.257.056.074-.089zm1.897-.974l.134.069.011-.007-.145-.062zm-10.686.309l.133.069.198-.102-.258-.056-.073.089zm-6.245-1.354l.073-.089-.433-.094.186.221.174-.038zm2.683 3.183l-.173.039.11.131.196-.101-.133-.069zm2.082 2.4l-.174.037.109.133.198-.102-.133-.068zm-1.018-1.236l-.133-.068-.09.046.049.06.174-.038zm7.216-1.948l.134.069.198-.102-.258-.056-.074.089zm-2.405-.522l.073-.09-.117-.025-.09.046.134.069zm6.841-1.619c.409-.21 1.028-.237 1.398-.047l.267-.137c-.555-.285-1.416-.218-1.932.047l.267.137zm-2.498 1.283l2.498-1.283-.267-.137-2.498 1.283.267.137zm-2.613-.502l2.406.523.147-.179-2.406-.522-.147.178zm1.513-.965l-1.572.808.266.137 1.573-.808-.267-.137zm.093-.718c.37.19.316.508-.093.718l.267.137c.516-.265.648-.708.093-.992l-.267.137zm-1.399 0c.389-.2 1.01-.2 1.399 0l.267-.137c-.537-.276-1.396-.276-1.932 0l.266.137zm-2.266 1.164l2.266-1.164-.266-.137-2.267 1.164.267.137zm-10.106-2.118l9.899 2.138.146-.178-9.899-2.138-.146.178zm-1.089.122c.318-.163.701-.201 1.092-.121l.14-.18c-.534-.11-1.077-.053-1.499.164l.267.137zm-.232.566c-.119-.184-.034-.429.232-.566l-.267-.137c-.381.196-.481.521-.323.764l.358-.061zm4.25 4.981l-4.256-4.989-.346.078 4.256 4.989.346-.078zm-2.26 1.248l2.22-1.141-.267-.137-2.22 1.14.267.138zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.138c-.516.266-.647.708-.093.993l.267-.137zm1.399 0c-.389.199-1.01.199-1.399 0l-.267.137c.537.275 1.396.275 1.933 0l-.267-.137zm1.619-.832l-1.619.832.267.137 1.619-.832-.267-.137zm1.325 1.266l-1.018-1.235-.348.076 1.018 1.235.348-.076zm-2.492 1.366l2.451-1.259-.266-.137-2.452 1.259.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.648.707-.093.992l.267-.137zm1.399 0c-.389.2-1.01.2-1.399 0l-.267.137c.537.275 1.396.275 1.932 0l-.266-.137zm1.896-.974l-1.896.974.266.137 1.897-.974-.267-.137zm3.868 4.139l-3.562-4.11-.345.079 3.562 4.11.345-.079zm1.286.258c-.524.103-1.096-.004-1.282-.253l-.353.069c.277.369 1.093.499 1.771.365l-.136-.181zm.259-.097a.803.803 0 01-.251.095l.12.184c.187-.032.308-.096.397-.142l-.266-.137zm.235-.561c.155.198.04.419-.235.561l.266.137c.372-.191.535-.493.32-.77l-.351.072zm-3.837-4.487l3.84 4.49.345-.078-3.839-4.49-.346.078zm7.534-3.956l-7.494 3.849.266.137 7.494-3.849-.266-.137zm9.089 1.928l-8.882-1.949-.148.179 8.882 1.948.148-.178zm1.088-.122c-.318.163-.701.201-1.092.121l-.14.18c.534.109 1.076.053 1.498-.164l-.266-.137zm.242-.165c-.079.08-.154.119-.242.165l.266.137c.097-.05.207-.106.313-.216l-.337-.086zm-.501-.65c.485.095.695.389.493.658l.353.07c.261-.349.008-.768-.71-.909l-.136.181zm-8.055-1.76l8.049 1.758.148-.178-8.049-1.758-.148.178zm1.837-1.131l-1.896.974.267.137 1.896-.974-.267-.137zm.014-.76c.398.168.398.505-.025.766l.29.124c.502-.309.594-.779-.026-1.04l-.239.15zm-10.493 1.048l-6.245-1.354-.147.178 6.245 1.354.147-.178zm-3.502 1.987l3.562-1.829-.267-.138-3.562 1.83.267.137zm-2.99-3.214l2.684 3.184.346-.077-2.683-3.184-.347.077zm5.112 5.507l-1.017-1.235-.348.075 1.018 1.235.347-.075zm5.892-3.214l-6.199 3.183.267.137 6.199-3.183-.267-.137zm-2.346-.365l2.406.522.147-.178-2.406-.523-.147.179zm-4.604 2.45l4.811-2.471-.267-.137-4.81 2.471.266.137z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M176.5 111.452l51 .373v6.23c0 3.323-2.495 6.64-7.472 9.174-9.961 5.055-26.103 5.055-36.063 0-4.977-2.527-7.465-5.851-7.465-9.174v-6.603z"
+        fill="url(#paint21_linear_10098_56983)"
+      />
+
+      <Path
+        d="M220.03 121.019c-9.961 5.033-26.102 5.033-36.062 0-9.961-5.033-9.954-13.211 0-18.244 9.953-5.033 26.101-5.033 36.062 0 9.96 5.033 9.96 13.199 0 18.244z"
+        fill="url(#paint22_linear_10098_56983)"
+      />
+
+      <Path
+        d="M201.5 123.015c12.15 0 22-5.177 22-11.563 0-6.386-9.85-11.563-22-11.563s-22 5.177-22 11.563c0 6.386 9.85 11.563 22 11.563z"
+        fill="url(#paint23_linear_10098_56983)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M81.623 83.413c0-.52-.406-1.118-.856-1.378l-2.432-1.404-.675-2.314 1.53.884c.451.26.856.13.856-.39s-.36-1.144-.81-1.404l-2.207-1.274-2.792-9.517c-.135-.442-.405-.806-.766-1.014-.315-.182-.63-.104-.765.13l-2.657 6.319-2.162-1.249c-.45-.26-.856-.13-.856.39s.36 1.145.81 1.405l1.577.91-.675 1.534-2.387-1.378c-.45-.26-.856-.13-.856.39s.36 1.144.81 1.404l1.847 1.066-2.162 5.252c-.18.364.045 1.014.45 1.456.09.104.18.156.271.208.315.182.63.156.766-.13l2.386-5.694 7.296 4.212 2.477 8.555c.135.442.405.806.766 1.014.09.052.18.104.315.13.405.026.63-.364.45-.936l-2.251-7.749 1.846 1.066c.496.234.9.052.856-.494zM73.516 69.06l1.757 6.007-3.468-2.002 1.711-4.005zM71.22 74.6l-.676 1.534 6.035 3.484-.676-2.314-4.683-2.704z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M80.767 82.035v-.15.15zm.856 1.378l-.13-.075v.015l.13.06zm-3.288-2.782l-.12-.013.033.113.087.05v-.15zm-.675-2.314v-.15l-.193-.111.072.248.12.013zm1.53.884v.15-.15zm-2.16-3.068l-.121-.013.033.112.087.05v-.15zm-2.793-9.517l.12.013v-.003l-.12-.01zm-1.531-.884l-.117-.135-.004.01.12.125zm-2.657 6.319v.15l.088.05.033-.076-.121-.124zm-2.162-1.249v.15-.15zm1.531 2.705l.12.125.073-.164-.193-.111v.15zm-.675 1.534v.15l.087.05.033-.074-.12-.126zm-2.432.416v-.15.15zm1.846 1.066l.121.124.068-.165-.189-.11v.15zm-2.162 5.252l.12.13.002-.006-.122-.124zm.45 1.456l.059-.1-.005-.006-.053.106zm1.037.078l.119.128.002-.004-.121-.124zm2.386-5.694v-.15l-.088-.051-.033.076.121.125zm7.296 4.212l.12.014-.032-.113-.088-.05v.15zm2.477 8.555l-.12-.014v.004l.12.01zm1.081 1.144l.041.166h.006l.006.001-.053-.167zm.45-.936l-.12-.014.002.006.118.008zm-2.251-7.749v-.15l-.193-.111.072.248.12.013zm1.846 1.066v.15l.012.006-.012-.156zm-5.494-8.84v.15l.193.111-.073-.248-.12-.013zm-1.757-6.007l.12.013-.121-.417-.12.28.121.124zm-1.711 4.004l-.12-.124-.071.164.19.11v-.15zm-1.26 3.069l-.121-.126-.073.164.193.112v-.15zm.675-1.534v-.15l-.088-.05-.033.074.12.126zm5.359 5.018v.15l.193.111-.073-.248-.12-.013zm-.676-2.314l.12.013-.032-.113-.088-.05v.15zm4.864 4.882c.398.23.726.737.726 1.153l.26.15c0-.623-.483-1.313-.986-1.603v.3zm-2.432-1.404l2.432 1.404v-.3l-2.432-1.404v.3zm-.796-2.477l.676 2.314.24.026-.675-2.314-.24-.026zm1.652.747l-1.531-.884v.3l1.53.884v-.3zm.726-.315c0 .416-.328.545-.726.315v.3c.502.29.985.159.985-.465l-.26-.15zm-.681-1.18c.379.22.68.743.68 1.18l.26.15c0-.603-.418-1.328-.94-1.63v.3zm-2.207-1.273l2.207 1.274v-.3l-2.207-1.274v.3zm-2.912-9.68l2.792 9.517.24.026-2.792-9.517-.24-.026zm-.646-.85c.31.178.532.48.647.853l.238.02c-.156-.51-.474-.936-.885-1.174v.3zm-.65.113c.117-.201.391-.263.65-.114v-.3c-.37-.214-.728-.12-.882.146l.233.268zm-2.651 6.309l2.657-6.318-.242-.25-2.657 6.32.242.248zm-2.283-1.222l2.162 1.248v-.3l-2.162-1.248v.3zm-.726.314c0-.416.328-.544.726-.314v-.3c-.503-.29-.986-.16-.986.465l.26.15zm.68 1.18c-.378-.219-.68-.742-.68-1.18l-.26-.15c0 .603.419 1.328.94 1.63v-.3zm1.577.91l-1.576-.91v.3l1.576.91v-.3zm-.555 1.81l.675-1.535-.24-.251-.676 1.534.241.252zm-2.507-1.354l2.387 1.378v-.3l-2.387-1.378v.3zm-.726.315c0-.417.328-.545.726-.315v-.3c-.503-.29-.986-.159-.986.465l.26.15zm.68 1.179c-.378-.219-.68-.742-.68-1.18l-.26-.15c0 .604.418 1.328.94 1.63v-.3zm1.847 1.066l-1.846-1.066v.3l1.846 1.066v-.3zm-2.04 5.526l2.161-5.252-.242-.248-2.162 5.252.243.248zm.382 1.226c-.354-.386-.53-.927-.385-1.22l-.237-.26c-.215.435.059 1.194.516 1.693l.106-.213zm.217.164a.738.738 0 01-.212-.158l-.116.2c.12.14.241.208.328.258v-.3zm.646-.108c-.112.239-.378.263-.646.108v.3c.362.21.727.182.885-.152l-.239-.256zm2.385-5.69l-2.386 5.694.242.248 2.387-5.694-.243-.249zm7.417 4.186l-7.296-4.212v.3l7.296 4.212v-.3zm2.598 8.718l-2.477-8.554-.241-.028 2.477 8.555.24.027zm.645.85c-.31-.178-.532-.48-.646-.854l-.24-.02c.157.511.475.937.886 1.175v-.3zm.274.115a.81.81 0 01-.274-.114v.3c.094.054.2.116.356.146l-.082-.332zm.373-.778c.145.461-.031.799-.385.776l.106.335c.457.03.731-.413.516-1.096l-.237-.015zM78.8 82.828l2.252 7.748.24.027-2.25-7.748-.242-.027zm1.967.93l-1.846-1.067v.3l1.846 1.066v-.3zm.727-.404c.035.427-.286.61-.739.397l.024.312c.538.254 1.028.075.973-.59l-.258-.12zm-6.101-8.274l-1.756-6.007-.241-.026 1.756 6.007.241.026zm-3.588-1.865l3.468 2.002v-.3l-3.468-2.002v.3zm1.59-4.28l-1.71 4.004.24.25 1.712-4.004-.242-.25zm-2.73 7.324l.675-1.534-.24-.252-.676 1.534.24.252zm5.914 3.208l-6.035-3.484v.3l6.035 3.484v-.3zm-.796-2.177l.675 2.314.241.026-.675-2.314-.241-.026zm-4.563-2.541l4.683 2.704v-.3l-4.683-2.704v.3z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M129.83 121.448c1.873-12.341 0-15.182 0-15.182l-12.285 16.484s3.287 5.275 2.47 8.242a18.503 18.503 0 01-1.51 3.987 1.13 1.13 0 00.32 1.47c.082.064.173.116.268.156l4.364 2.603 5.275-9.231 1.159-5.206-1.215.963a20.04 20.04 0 001.154-4.286z"
+        fill="url(#paint24_linear_10098_56983)"
+      />
+
+      <Path
+        d="M166.077 44.29l-4.19-2.404a10.94 10.94 0 00-1.851-.711c-1.129-.365-2.486-.17-3.944.685l-51.587 30.11c-3.892 2.269-7.022 8.329-7.005 13.534l.143 41.905c0 3.123 1.159 5.206 2.906 5.913l4.795 2.516 3.766-5.679 47.186-27.541c3.891-2.269 7.022-8.33 7.005-13.535l-.139-40.4 2.915-4.394z"
+        fill="url(#paint25_linear_10098_56983)"
+      />
+
+      <Path
+        opacity={0.7}
+        d="M168.391 49.903c0-5.206-3.183-7.591-7.066-5.323l-51.587 30.114c-3.892 2.27-7.023 8.33-7.006 13.535l.143 41.9c0 5.206 3.183 7.592 7.066 5.323l15.934-9.301a14.36 14.36 0 01-.89 7.787 48.654 48.654 0 01-1.886 3.77 1.161 1.161 0 00.227 1.396c.383.36.959.415 1.403.135 3.719-2.429 8.9-7.119 10.071-14.832.208-1.366.368-2.602.489-3.752l26.239-15.317c3.892-2.269 7.023-8.33 7.005-13.535l-.142-41.9z"
+        fill="#52FCFF"
+      />
+
+      <Path
+        d="M137.555 71.99c-10.117 6.119-18.318 19.259-18.318 29.35 0 10.09 8.201 13.31 18.318 7.192 10.116-6.118 18.317-19.258 18.317-29.349 0-10.09-8.201-13.31-18.317-7.192z"
+        fill="url(#paint26_linear_10098_56983)"
+      />
+
+      <Path
+        d="M135.896 99.643l-4.787-3.641c-.565-.43-.643-1.384-.25-2.159.414-.814 1.247-1.196 1.87-.721l3.625 2.757 7.539-17.02c.37-.834 1.173-1.286 1.828-.891.613.367.75 1.307.393 2.113l-8.297 18.733c-.178.403-.463.73-.787.894l-.032.017c-.376.184-.784.16-1.102-.082z"
+        fill="#E1F2FF"
+      />
+
+      <Defs>
+        <LinearGradient
+          id="paint0_linear_10098_56983"
+          x1={96.7354}
+          y1={104.872}
+          x2={96.7354}
+          y2={51.8744}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint1_linear_10098_56983"
+          x1={60.1868}
+          y1={59.767}
+          x2={81.2575}
+          y2={51.877}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint2_linear_10098_56983"
+          x1={96.9808}
+          y1={189.436}
+          x2={254.256}
+          y2={107.396}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint3_linear_10098_56983"
+          x1={36.5487}
+          y1={186.283}
+          x2={141.339}
+          y2={136.105}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint4_linear_10098_56983"
+          x1={3.13321}
+          y1={177.988}
+          x2={236.486}
+          y2={29.6785}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint5_linear_10098_56983"
+          x1={168.569}
+          y1={94.0484}
+          x2={188.283}
+          y2={80.8268}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint6_linear_10098_56983"
+          x1={197.79}
+          y1={168.537}
+          x2={224.033}
+          y2={188.293}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint7_linear_10098_56983"
+          x1={200.145}
+          y1={153.75}
+          x2={203.589}
+          y2={187.674}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop offset={0.09} stopColor="#84E4A4" />
+
+          <Stop offset={0.97} stopColor="#3C53D7" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint8_linear_10098_56983"
+          x1={226.339}
+          y1={181.792}
+          x2={226.339}
+          y2={155.688}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint9_linear_10098_56983"
+          x1={197.79}
+          y1={157.353}
+          x2={224.033}
+          y2={177.109}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint10_linear_10098_56983"
+          x1={200.145}
+          y1={142.566}
+          x2={203.589}
+          y2={176.491}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop offset={0.09} stopColor="#84E4A4" />
+
+          <Stop offset={0.97} stopColor="#3C53D7" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint11_linear_10098_56983"
+          x1={226.339}
+          y1={170.608}
+          x2={226.339}
+          y2={144.503}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint12_linear_10098_56983"
+          x1={197.79}
+          y1={146.169}
+          x2={224.033}
+          y2={165.925}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint13_linear_10098_56983"
+          x1={200.145}
+          y1={131.382}
+          x2={203.589}
+          y2={165.307}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop offset={0.09} stopColor="#84E4A4" />
+
+          <Stop offset={0.97} stopColor="#3C53D7" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint14_linear_10098_56983"
+          x1={226.339}
+          y1={159.424}
+          x2={226.339}
+          y2={133.32}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint15_linear_10098_56983"
+          x1={197.79}
+          y1={134.985}
+          x2={224.033}
+          y2={154.741}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint16_linear_10098_56983"
+          x1={200.145}
+          y1={120.198}
+          x2={203.589}
+          y2={154.123}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop offset={0.09} stopColor="#84E4A4" />
+
+          <Stop offset={0.97} stopColor="#3C53D7" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint17_linear_10098_56983"
+          x1={226.339}
+          y1={148.24}
+          x2={226.339}
+          y2={122.136}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint18_linear_10098_56983"
+          x1={197.79}
+          y1={123.8}
+          x2={224.033}
+          y2={143.556}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint19_linear_10098_56983"
+          x1={200.145}
+          y1={109.013}
+          x2={203.589}
+          y2={142.938}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop offset={0.09} stopColor="#84E4A4" />
+
+          <Stop offset={0.97} stopColor="#3C53D7" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint20_linear_10098_56983"
+          x1={226.339}
+          y1={137.056}
+          x2={226.339}
+          y2={110.951}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint21_linear_10098_56983"
+          x1={197.79}
+          y1={112.617}
+          x2={224.033}
+          y2={132.373}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint22_linear_10098_56983"
+          x1={200.145}
+          y1={97.8298}
+          x2={203.589}
+          y2={131.755}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop offset={0.09} stopColor="#84E4A4" />
+
+          <Stop offset={0.97} stopColor="#3C53D7" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint23_linear_10098_56983"
+          x1={226.339}
+          y1={125.872}
+          x2={226.339}
+          y2={99.7672}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint24_linear_10098_56983"
+          x1={117.546}
+          y1={139.206}
+          x2={130.662}
+          y2={139.206}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#3154CA" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint25_linear_10098_56983"
+          x1={97.4998}
+          y1={135.837}
+          x2={166.077}
+          y2={135.837}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#3154CA" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint26_linear_10098_56983"
+          x1={152.978}
+          y1={132.185}
+          x2={177.762}
+          y2={74.5054}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+      </Defs>
+    </Svg>
+  )
+}
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/EmptyOpenOrdersLogo.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/EmptyOpenOrdersLogo.tsx
new file mode 100644
index 0000000000..5e3b29da45
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/EmptyOpenOrdersLogo.tsx
@@ -0,0 +1,853 @@
+import * as React from 'react'
+import Svg, {Defs, G, LinearGradient, Mask, Path, Stop} from 'react-native-svg'
+
+export const EmptyOpenOrdersLogo = (props) => {
+  return (
+    <Svg width={281} height={224} viewBox="0 0 281 224" fill="none" xmlns="http://www.w3.org/2000/svg" {...props}>
+      <Path
+        opacity={0.7}
+        d="M96.3 78.686c10.934 6.249 10.934 16.379 0 22.628-10.935 6.248-28.664 6.248-39.599 0-10.935-6.249-10.935-16.379 0-22.628 10.935-6.248 28.664-6.248 39.598 0z"
+        fill="#52FCFF"
+      />
+
+      <Path
+        d="M94.398 84.499c0 4.644-1.368 8.166-3.664 10.208a50.846 50.846 0 01-5.971 4.083c-3.062 1.225-3.41-1.787-7.686-4.257-9.574-5.522-17.352-18.956-17.352-30.01 0-4.206-2.797-4.84-.868-6.952.5-.541 4.981-3.654 5.584-4.083 3.153-2.042 7.634-1.868 12.605 1.02 9.595 5.513 17.352 18.946 17.352 29.99z"
+        fill="url(#paint0_linear_10099_57317)"
+      />
+
+      <Path
+        d="M85.248 98.507c6.767-3.907 6.768-16.573.004-28.29-6.765-11.718-17.734-18.05-24.5-14.143-6.767 3.907-6.768 16.573-.004 28.29 6.765 11.718 17.734 18.05 24.5 14.143z"
+        fill="url(#paint1_linear_10099_57317)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M57.978 68.412c0 4.457 1.473 9.789 4.44 14.928 2.967 5.138 6.847 9.08 10.707 11.309 3.868 2.233 7.647 2.71 10.484 1.072 2.838-1.638 4.313-5.15 4.314-9.617 0-4.456-1.474-9.788-4.44-14.927-2.967-5.139-6.848-9.081-10.707-11.309-3.868-2.233-7.647-2.71-10.484-1.072-2.838 1.638-4.313 5.15-4.314 9.616zm-.704 0c0-4.59 1.518-8.409 4.666-10.226 3.147-1.818 7.213-1.223 11.188 1.072 3.985 2.3 7.947 6.34 10.965 11.567 3.017 5.226 4.534 10.679 4.534 15.28 0 4.59-1.518 8.408-4.666 10.226-3.147 1.817-7.213 1.222-11.188-1.072-3.985-2.3-7.948-6.34-10.965-11.567-3.017-5.227-4.535-10.679-4.534-15.28z"
+        fill="#0CDDB3"
+      />
+
+      <G opacity={0.2} stroke="#1D45BA" strokeWidth={0.5}>
+        <Path d="M98.531 218.428L273.5 123.352M32.042 171.056l163.219-88.69M88.38 71l184.318 100.027M8.5 136.15L163.006 220" />
+      </G>
+
+      <Path
+        opacity={0.7}
+        d="M221.299 167.686c10.935 6.249 10.935 16.379 0 22.628-10.934 6.248-28.663 6.248-39.598 0-10.935-6.249-10.935-16.379 0-22.628 10.935-6.248 28.664-6.248 39.598 0zM243.5 106.928l-15.305 1.896-50.626-29.32a11.152 11.152 0 00-11.186 0l-81.21 47.032-26.673 3.303.882 14.653c0 1.759.868 3.518 2.605 4.525l4.596 2.662 59.095 34.222a8.14 8.14 0 008.169 0l101.307-58.67 4.73-2.741c1.667-.963 2.518-2.636 2.557-4.327l1.059-13.235z"
+        fill="#52FCFF"
+      />
+
+      <Path
+        d="M242.454 99l-14.507 7.163 2.89 2.556-96.001 55.897a8.002 8.002 0 01-3.336 1.061V180a8.002 8.002 0 003.336-1.061l105.08-61.181c1.692-.985 2.538-2.71 2.538-4.435a25.033 25.033 0 000-14.323z"
+        fill="url(#paint2_linear_10099_57317)"
+      />
+
+      <Mask id="a" maskUnits="userSpaceOnUse" x={58} y={122} width={73} height={58}>
+        <Path
+          d="M126.076 164.211l-57.97-33.468 2.36-1.806-10.808-6.086-.199.906a29.37 29.37 0 00.199 13.454c0 1.758.87 3.515 2.61 4.52l63.808 36.838a8.16 8.16 0 004.811 1.063v-14.358a8.16 8.16 0 01-4.811-1.063z"
+          fill="#fff"
+        />
+      </Mask>
+
+      <G mask="url(#a)">
+        <Path
+          d="M126.076 164.211l-57.97-33.468 2.36-1.806-10.808-6.086-.199.906a29.37 29.37 0 00.199 13.454c0 1.758.87 3.515 2.61 4.52l63.808 36.838a8.16 8.16 0 004.811 1.063v-14.358a8.16 8.16 0 01-4.811-1.063z"
+          fill="url(#paint3_linear_10099_57317)"
+        />
+      </G>
+
+      <Path
+        d="M60.022 123.384l-.089.402a29.16 29.16 0 00.197 13.281c.007.03.011.061.011.094 0 1.749.904 3.314 2.418 4.19l63.773 36.841a7.744 7.744 0 004.584 1.013 7.728 7.728 0 003.215-1.013l106.173-61.338a4.704 4.704 0 002.374-4.115c0-.03.004-.061.011-.091a24.483 24.483 0 00.131-13.726l-13.738 6.73 2.49 2.185c.093.081.14.203.129.324a.387.387 0 01-.189.294l-97 56.036a8.455 8.455 0 01-3.529 1.114 8.481 8.481 0 01-5.032-1.114l-57.939-33.468a.388.388 0 01-.19-.306.379.379 0 01.15-.327l1.9-1.456-9.85-5.55zM130.214 180a8.5 8.5 0 01-4.263-1.147l-63.773-36.841a5.546 5.546 0 01-2.798-4.806 29.91 29.91 0 01-.191-13.582l.199-.906a.38.38 0 01.559-.251l10.801 6.085a.384.384 0 01.045.635l-1.905 1.461 57.444 33.185a7.739 7.739 0 004.585 1.013 7.735 7.735 0 003.214-1.013l96.539-55.773-2.521-2.213a.382.382 0 01.084-.628l14.658-7.18a.391.391 0 01.32-.008c.103.045.18.134.213.24a25.222 25.222 0 01.015 14.526 5.453 5.453 0 01-2.754 4.717l-106.173 61.339a8.483 8.483 0 01-3.529 1.112 9.01 9.01 0 01-.769.035z"
+        fill="#0CDDB3"
+      />
+
+      <Path
+        d="M235.5 105.625L134.536 163.91a8.097 8.097 0 01-3.356 1.058 8.117 8.117 0 01-4.786-1.058L67.5 129.912l99.462-57.418a11.145 11.145 0 0111.148 0l57.39 33.131z"
+        fill="#3C3568"
+      />
+
+      <Mask id="b" maskUnits="userSpaceOnUse" x={59} y={56} width={185} height={110}>
+        <Path
+          d="M240.492 102.877l-4.738 2.737-101.494 58.597a8.13 8.13 0 01-3.373 1.063 8.16 8.16 0 01-4.811-1.063l-59.203-34.18-4.605-2.658c-3.48-2.01-3.48-7.031 0-9.041l104.588-60.384a11.204 11.204 0 0111.207 0l62.429 36.043c3.421 1.977 3.421 6.912 0 8.886z"
+          fill="#fff"
+        />
+      </Mask>
+
+      <G mask="url(#b)">
+        <Path
+          d="M240.492 102.877l-4.738 2.737-101.494 58.597a8.13 8.13 0 01-3.373 1.063 8.16 8.16 0 01-4.811-1.063l-59.203-34.18-4.605-2.658c-3.48-2.01-3.48-7.031 0-9.041l104.588-60.384a11.204 11.204 0 0111.207 0l62.429 36.043c3.421 1.977 3.421 6.912 0 8.886z"
+          fill="url(#paint4_linear_10099_57317)"
+        />
+      </G>
+
+      <Path
+        d="M172.583 56.765c-1.87 0-3.74.485-5.408 1.453L62.679 118.809a4.813 4.813 0 00-2.417 4.204c0 1.756.903 3.328 2.417 4.207l63.752 36.966a7.71 7.71 0 004.583 1.016 7.701 7.701 0 003.213-1.016l106.139-61.546a4.719 4.719 0 002.372-4.126 4.717 4.717 0 00-2.372-4.128l-62.375-36.168a10.773 10.773 0 00-5.408-1.453zM130.317 166a8.477 8.477 0 01-4.267-1.153l-63.752-36.966a5.568 5.568 0 01-2.798-4.868 5.566 5.566 0 012.798-4.865l104.496-60.593a11.554 11.554 0 0111.578 0l62.375 36.168a5.481 5.481 0 012.753 4.791c0 2-1.03 3.788-2.753 4.789l-106.139 61.544a8.44 8.44 0 01-3.527 1.117 8.527 8.527 0 01-.764.036z"
+        fill="#0CDDB3"
+      />
+
+      <Path
+        d="M172.218 91.545l3.053 1.715a13.635 13.635 0 0013.313.01l23.224-13.018a1.33 1.33 0 00.001-2.333l-11.884-6.683a1.866 1.866 0 00-1.818 0l-25.885 14.51a3.303 3.303 0 00-.004 5.799z"
+        fill="#0CDDB3"
+      />
+
+      <Path
+        opacity={0.7}
+        d="M169.198 98.177c16.403 9.568 16.403 25.081 0 34.649-16.402 9.565-42.994 9.565-59.397 0-16.401-9.568-16.401-25.081 0-34.65 16.403-9.568 42.995-9.568 59.397 0z"
+        fill="#52FCFF"
+      />
+
+      <Path
+        opacity={0.7}
+        d="M174.006 80.411l-30.239 17.425h-.014L113.5 80.412 143.753 63l30.253 17.411z"
+        fill="#52FCFF"
+      />
+
+      <Path
+        d="M174.006 80.411v34.851l-30.253 17.44V97.837h.014l30.239-17.426z"
+        fill="url(#paint5_linear_10099_57317)"
+      />
+
+      <Path d="M143.753 97.837v34.865l-30.253-17.44v-34.85l30.253 17.424z" fill="url(#paint6_linear_10099_57317)" />
+
+      <Path
+        d="M130.569 102.835c-.409.059-.818.104-1.226.149-.409.044-.818.089-1.226.148-.117 0-.175 0-.292-.178a176.333 176.333 0 00-3.036-3.866l-3.152-4.103c-.189-.235-.37-.47-.549-.702-.319-.415-.632-.82-.969-1.201L116.5 91c.175.238.35.476.525.654.286.364.572.733.859 1.105a86.757 86.757 0 002.002 2.523c.467.595.934 1.204 1.401 1.814.467.61.934 1.219 1.401 1.814l2.627 3.39c.408.535.832 1.07 1.255 1.605.423.536.846 1.071 1.255 1.606.117.119.175.178.233.119a23.695 23.695 0 002.044-.238c.846-.089 1.678-.193 2.51-.297.832-.104 1.663-.208 2.51-.298.652-.063 1.304-.143 1.948-.222.566-.07 1.125-.138 1.671-.194.234 0 .525-.059.759-.119l-3.619-2.141c-1.217.207-2.433.356-3.669.507-.543.067-1.091.134-1.643.207zM134.305 117.168l-1.81.237a11670.83 11670.83 0 01-6.713-8.623c-2.233-2.87-4.466-5.739-6.713-8.623v-2.558l.001.002c5.078 6.541 10.156 13.083 15.235 19.565zM119.069 103.905c2.322 2.938 4.62 5.901 6.925 8.872 1.287 1.66 2.577 3.323 3.874 4.985l-1.81.238c-1.694-2.158-3.37-4.315-5.038-6.463-1.32-1.699-2.636-3.393-3.951-5.074v-2.558zM136.99 108.009c-1.109.149-2.218.282-3.328.416-1.109.134-2.218.268-3.327.416.058.06.058.119.058.119.292.357.57.729.847 1.101.277.371.554.743.846 1.1l.059.059c.817-.089 1.62-.193 2.422-.297.803-.104 1.606-.208 2.423-.297v-2.617zM135.881 114.521c.365-.045.729-.089 1.109-.149v2.498l-.467.06a69.511 69.511 0 00-.876-1.13c-.292-.372-.584-.744-.875-1.13.379-.06.744-.104 1.109-.149z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M187.157 85.318c3.124 1.757 3.124 4.607 0 6.364-3.124 1.757-8.19 1.757-11.314 0-3.124-1.757-3.124-4.607 0-6.364 3.124-1.757 8.19-1.757 11.314 0z"
+        fill="url(#paint7_linear_10099_57317)"
+      />
+
+      <Path
+        d="M176.5 167.372l51 .373v6.23c0 3.323-2.495 6.64-7.472 9.174-9.961 5.055-26.103 5.055-36.063 0-4.977-2.527-7.465-5.851-7.465-9.174v-6.603z"
+        fill="url(#paint8_linear_10099_57317)"
+      />
+
+      <Path
+        d="M220.03 176.939c-9.961 5.033-26.102 5.033-36.062 0-9.961-5.033-9.954-13.211 0-18.244 9.953-5.033 26.101-5.033 36.062 0 9.96 5.033 9.96 13.199 0 18.244z"
+        fill="url(#paint9_linear_10099_57317)"
+      />
+
+      <Path
+        d="M201.5 178.935c12.15 0 22-5.177 22-11.563 0-6.386-9.85-11.562-22-11.562s-22 5.176-22 11.562c0 6.386 9.85 11.563 22 11.563z"
+        fill="url(#paint10_linear_10099_57317)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M211.357 163.362c-.463-.237-1.203-.19-1.666.048l-2.498 1.283-2.405-.523 1.573-.808c.462-.237.555-.618.092-.855-.462-.238-1.202-.238-1.665 0l-2.267 1.164-9.899-2.138c-.463-.095-.925-.048-1.295.142-.324.167-.417.452-.278.666l4.256 4.989-2.221 1.14c-.462.237-.555.618-.092.855.462.238 1.203.238 1.665 0l1.619-.831 1.018 1.235-2.452 1.259c-.462.238-.555.618-.092.855.462.238 1.202.238 1.665 0l1.897-.974 3.562 4.11c.231.309.925.428 1.526.309.139-.024.231-.071.324-.119.324-.166.463-.427.278-.665l-3.84-4.49 7.494-3.849 8.882 1.948c.462.096.925.048 1.295-.142.093-.048.185-.095.278-.19.231-.309 0-.665-.602-.784l-8.049-1.758 1.897-.974c.462-.285.509-.689 0-.903zm-16.931-.142l6.245 1.354-3.562 1.829-2.683-3.183zm3.747 4.347l1.018 1.235 6.198-3.183-2.405-.523-4.811 2.471z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M209.691 163.41l.134.068-.134-.068zm1.666-.048l-.134.069.007.003.007.003.12-.075zm-4.164 1.331l-.073.089.117.025.09-.046-.134-.068zm-2.405-.523l-.133-.069-.199.102.258.056.074-.089zm1.573-.808l.133.069-.133-.069zm-3.84.309l-.073.089.117.026.09-.046-.134-.069zm-9.899-2.138l.073-.089-.003-.001-.07.09zm-1.573.808l-.18.03.007.009.173-.039zm4.256 4.989l.133.068.091-.047-.051-.06-.173.039zm-2.221 1.14l.134.068-.134-.068zm3.192.024l.174-.038-.109-.133-.198.102.133.069zm1.018 1.235l.133.068.09-.046-.049-.06-.174.038zm1.018 1.14l.172-.039-.112-.129-.194.1.134.068zm3.562 4.11l.176-.035-.004-.004-.172.039zm1.526.309l-.06-.092-.008.002.068.09zm.602-.784l.175-.036-.003-.003-.172.039zm-3.84-4.49l-.133-.068-.092.046.052.061.173-.039zm7.494-3.849l.074-.089-.117-.025-.09.046.133.068zm8.882 1.948l-.074.09h.004l.07-.09zm1.573-.332l.168.043.004-.004.004-.004-.176-.035zm-.602-.784l-.074.089.006.001.068-.09zm-8.049-1.758l-.133-.069-.198.102.257.056.074-.089zm1.897-.974l.134.069.011-.007-.145-.062zm-10.686.309l.133.068.198-.102-.258-.056-.073.09zm-6.245-1.354l.073-.09-.433-.094.186.222.174-.038zm2.683 3.183l-.173.039.11.13.196-.1-.133-.069zm2.082 2.399l-.174.038.109.133.198-.102-.133-.069zm-1.018-1.235l-.133-.069-.09.047.049.06.174-.038zm7.216-1.948l.134.068.198-.101-.258-.056-.074.089zm-2.405-.523l.073-.089-.117-.025-.09.046.134.068zm6.841-1.618c.409-.21 1.028-.238 1.398-.047l.267-.137c-.555-.285-1.416-.218-1.932.047l.267.137zm-2.498 1.283l2.498-1.283-.267-.137-2.498 1.283.267.137zm-2.613-.502l2.406.523.147-.179-2.406-.522-.147.178zm1.513-.965l-1.572.807.266.137 1.573-.807-.267-.137zm.093-.719c.37.191.316.509-.093.719l.267.137c.516-.265.648-.708.093-.993l-.267.137zm-1.399 0c.389-.199 1.01-.199 1.399 0l.267-.137c-.537-.275-1.396-.275-1.932 0l.266.137zm-2.266 1.165l2.266-1.165-.266-.137-2.267 1.164.267.138zm-10.106-2.118l9.899 2.138.146-.178-9.899-2.138-.146.178zm-1.089.122c.318-.163.701-.201 1.092-.121l.14-.18c-.534-.11-1.077-.053-1.499.164l.267.137zm-.232.566c-.119-.184-.034-.429.232-.566l-.267-.137c-.381.196-.481.521-.323.764l.358-.061zm4.25 4.981l-4.256-4.989-.346.078 4.256 4.988.346-.077zm-2.26 1.247l2.22-1.14-.267-.137-2.22 1.14.267.137zm-.093.719c-.37-.191-.316-.509.093-.719l-.267-.137c-.516.265-.647.708-.093.993l.267-.137zm1.399 0c-.389.199-1.01.199-1.399 0l-.267.137c.537.275 1.396.275 1.933 0l-.267-.137zm1.619-.832l-1.619.832.267.137 1.619-.832-.267-.137zm1.325 1.266l-1.018-1.235-.348.075 1.018 1.236.348-.076zm-2.492 1.366l2.451-1.26-.266-.137-2.452 1.26.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.648.707-.093.992l.267-.137zm1.399 0c-.389.199-1.01.199-1.399 0l-.267.137c.537.275 1.396.275 1.932 0l-.266-.137zm1.896-.974l-1.896.974.266.137 1.897-.974-.267-.137zm3.868 4.139l-3.562-4.11-.345.079 3.562 4.11.345-.079zm1.286.258c-.524.103-1.096-.005-1.282-.254l-.353.07c.277.369 1.093.498 1.771.364l-.136-.18zm.259-.097a.803.803 0 01-.251.095l.12.184c.187-.032.308-.096.397-.142l-.266-.137zm.235-.561c.155.198.04.419-.235.561l.266.137c.372-.191.535-.493.32-.77l-.351.072zm-3.837-4.487l3.84 4.49.345-.078-3.839-4.49-.346.078zm7.534-3.956l-7.494 3.849.266.137 7.494-3.849-.266-.137zm9.089 1.927l-8.882-1.948-.148.179 8.882 1.948.148-.179zm1.088-.122c-.318.164-.701.202-1.092.122l-.14.179c.534.11 1.076.053 1.498-.164l-.266-.137zm.242-.164a.843.843 0 01-.242.164l.266.137c.097-.049.207-.105.313-.215l-.337-.086zm-.501-.651c.485.096.695.39.493.659l.353.07c.261-.349.008-.768-.71-.91l-.136.181zm-8.055-1.759l8.049 1.758.148-.178-8.049-1.758-.148.178zm1.837-1.132l-1.896.974.267.137 1.896-.974-.267-.137zm.014-.759c.398.167.398.505-.025.766l.29.124c.502-.31.594-.78-.026-1.04l-.239.15zm-10.493 1.047l-6.245-1.354-.147.179 6.245 1.354.147-.179zm-3.502 1.988l3.562-1.83-.267-.137-3.562 1.83.267.137zm-2.99-3.214l2.684 3.184.346-.077-2.683-3.184-.347.077zm5.112 5.507l-1.017-1.236-.348.076 1.018 1.235.347-.075zm5.892-3.215l-6.199 3.184.267.137 6.199-3.184-.267-.137zm-2.346-.364l2.406.522.147-.178-2.406-.523-.147.179zm-4.604 2.45l4.811-2.471-.267-.137-4.81 2.47.266.138z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M176.5 156.188l51 .373v6.23c0 3.324-2.495 6.641-7.472 9.174-9.961 5.055-26.103 5.055-36.063 0-4.977-2.527-7.465-5.85-7.465-9.174v-6.603z"
+        fill="url(#paint11_linear_10099_57317)"
+      />
+
+      <Path
+        d="M220.03 165.756c-9.961 5.032-26.102 5.032-36.062 0-9.961-5.033-9.954-13.212 0-18.245 9.953-5.033 26.101-5.033 36.062 0 9.96 5.033 9.96 13.199 0 18.245z"
+        fill="url(#paint12_linear_10099_57317)"
+      />
+
+      <Path
+        d="M201.5 167.751c12.15 0 22-5.177 22-11.563 0-6.386-9.85-11.563-22-11.563s-22 5.177-22 11.563c0 6.386 9.85 11.563 22 11.563z"
+        fill="url(#paint13_linear_10099_57317)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M211.357 152.179c-.463-.238-1.203-.19-1.666.047l-2.498 1.283-2.405-.523 1.573-.807c.462-.238.555-.618.092-.856-.462-.237-1.202-.237-1.665 0l-2.267 1.164-9.899-2.138c-.463-.095-.925-.047-1.295.143-.324.166-.417.451-.278.665l4.256 4.989-2.221 1.14c-.462.238-.555.618-.092.855.462.238 1.203.238 1.665 0l1.619-.831 1.018 1.235-2.452 1.259c-.462.238-.555.618-.092.856.462.237 1.202.237 1.665 0l1.897-.974 3.562 4.11c.231.308.925.427 1.526.308.139-.023.231-.071.324-.118.324-.167.463-.428.278-.666l-3.84-4.49 7.494-3.848 8.882 1.948c.462.095.925.047 1.295-.143a.958.958 0 00.278-.19c.231-.309 0-.665-.602-.784l-8.049-1.758 1.897-.974c.462-.285.509-.689 0-.902zm-16.931-.143l6.245 1.354-3.562 1.829-2.683-3.183zm3.747 4.348l1.018 1.235 6.198-3.183-2.405-.523-4.811 2.471z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M209.691 152.226l.134.069-.134-.069zm1.666-.047l-.134.068.007.004.007.003.12-.075zm-4.164 1.33l-.073.089.117.026.09-.047-.134-.068zm-2.405-.523l-.133-.068-.199.101.258.057.074-.09zm1.573-.807l.133.068-.133-.068zm-3.84.308l-.073.09.117.025.09-.046-.134-.069zm-9.899-2.138l.073-.089-.003-.001-.07.09zm-1.573.808l-.18.031.007.008.173-.039zm4.256 4.989l.133.068.091-.046-.051-.061-.173.039zm-2.221 1.14l.134.069-.134-.069zm3.192.024l.174-.038-.109-.132-.198.101.133.069zm1.018 1.235l.133.069.09-.046-.049-.06-.174.037zm1.018 1.141l.172-.04-.112-.129-.194.1.134.069zm3.562 4.11l.176-.035-.004-.005-.172.04zm1.526.308l-.06-.092-.008.002.068.09zm.602-.784l.175-.036-.003-.003-.172.039zm-3.84-4.49l-.133-.068-.092.047.052.06.173-.039zm7.494-3.848l.074-.089-.117-.026-.09.046.133.069zm8.882 1.948l-.074.089.004.001.07-.09zm1.573-.333l.168.044.004-.005.004-.004-.176-.035zm-.602-.784l-.074.09.006.001.068-.091zm-8.049-1.758l-.133-.068-.198.101.257.057.074-.09zm1.897-.974l.134.069.011-.007-.145-.062zm-10.686.309l.133.069.198-.102-.258-.056-.073.089zm-6.245-1.354l.073-.089-.433-.094.186.222.174-.039zm2.683 3.183l-.173.039.11.131.196-.101-.133-.069zm2.082 2.4l-.174.038.109.132.198-.101-.133-.069zm-1.018-1.235l-.133-.069-.09.046.049.061.174-.038zm7.216-1.948l.134.068.198-.101-.258-.057-.074.09zm-2.405-.523l.073-.089-.117-.026-.09.047.134.068zm6.841-1.618c.409-.21 1.028-.238 1.398-.048l.267-.137c-.555-.285-1.416-.218-1.932.048l.267.137zm-2.498 1.282l2.498-1.282-.267-.137-2.498 1.282.267.137zm-2.613-.501l2.406.522.147-.178-2.406-.523-.147.179zm1.513-.966l-1.572.808.266.137 1.573-.808-.267-.137zm.093-.718c.37.19.316.508-.093.718l.267.137c.516-.265.648-.707.093-.992l-.267.137zm-1.399 0c.389-.2 1.01-.2 1.399 0l.267-.137c-.537-.276-1.396-.276-1.932 0l.266.137zm-2.266 1.164l2.266-1.164-.266-.137-2.267 1.164.267.137zm-10.106-2.117l9.899 2.138.146-.179-9.899-2.138-.146.179zm-1.089.121c.318-.163.701-.201 1.092-.121l.14-.18c-.534-.109-1.077-.053-1.499.164l.267.137zm-.232.566c-.119-.184-.034-.429.232-.566l-.267-.137c-.381.196-.481.521-.323.765l.358-.062zm4.25 4.981l-4.256-4.989-.346.078 4.256 4.989.346-.078zm-2.26 1.248l2.22-1.141-.267-.137-2.22 1.141.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.647.707-.093.992l.267-.137zm1.399 0c-.389.2-1.01.2-1.399 0l-.267.137c.537.275 1.396.275 1.933 0l-.267-.137zm1.619-.832l-1.619.832.267.137 1.619-.831-.267-.138zm1.325 1.267l-1.018-1.236-.348.076 1.018 1.235.348-.075zm-2.492 1.365l2.451-1.259-.266-.137-2.452 1.259.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.648.707-.093.992l.267-.137zm1.399 0c-.389.2-1.01.2-1.399 0l-.267.137c.537.276 1.396.276 1.932 0l-.266-.137zm1.896-.974l-1.896.974.266.137 1.897-.974-.267-.137zm3.868 4.139l-3.562-4.11-.345.079 3.562 4.11.345-.079zm1.286.258c-.524.104-1.096-.004-1.282-.253l-.353.069c.277.369 1.093.499 1.771.365l-.136-.181zm.259-.097a.803.803 0 01-.251.095l.12.184c.187-.032.308-.096.397-.142l-.266-.137zm.235-.561c.155.199.04.42-.235.561l.266.137c.372-.191.535-.493.32-.77l-.351.072zm-3.837-4.487l3.84 4.49.345-.078-3.839-4.49-.346.078zm7.534-3.956l-7.494 3.849.266.137 7.494-3.849-.266-.137zm9.089 1.928l-8.882-1.948-.148.178 8.882 1.948.148-.178zm1.088-.122c-.318.163-.701.201-1.092.121l-.14.18c.534.11 1.076.053 1.498-.164l-.266-.137zm.242-.165c-.079.081-.154.119-.242.165l.266.137c.097-.05.207-.106.313-.215l-.337-.087zm-.501-.65c.485.096.695.389.493.659l.353.069c.261-.348.008-.767-.71-.909l-.136.181zm-8.055-1.759l8.049 1.758.148-.179-8.049-1.758-.148.179zm1.837-1.132l-1.896.974.267.137 1.896-.974-.267-.137zm.014-.759c.398.167.398.505-.025.765l.29.124c.502-.309.594-.779-.026-1.039l-.239.15zm-10.493 1.047l-6.245-1.354-.147.178 6.245 1.354.147-.178zm-3.502 1.987l3.562-1.829-.267-.137-3.562 1.829.267.137zm-2.99-3.213l2.684 3.183.346-.077-2.683-3.183-.347.077zm5.112 5.506l-1.017-1.235-.348.076 1.018 1.235.347-.076zm5.892-3.214l-6.199 3.184.267.137 6.199-3.184-.267-.137zm-2.346-.365l2.406.523.147-.179-2.406-.522-.147.178zm-4.604 2.45l4.811-2.47-.267-.137-4.81 2.47.266.137z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M176.5 145.004l51 .373v6.23c0 3.323-2.495 6.641-7.472 9.174-9.961 5.055-26.103 5.055-36.063 0-4.977-2.527-7.465-5.851-7.465-9.174v-6.603z"
+        fill="url(#paint14_linear_10099_57317)"
+      />
+
+      <Path
+        d="M220.03 154.571c-9.961 5.033-26.102 5.033-36.062 0-9.961-5.033-9.954-13.211 0-18.244 9.953-5.033 26.101-5.033 36.062 0 9.96 5.033 9.96 13.199 0 18.244z"
+        fill="url(#paint15_linear_10099_57317)"
+      />
+
+      <Path
+        d="M201.5 156.567c12.15 0 22-5.176 22-11.562 0-6.386-9.85-11.563-22-11.563s-22 5.177-22 11.563c0 6.386 9.85 11.562 22 11.562z"
+        fill="url(#paint16_linear_10099_57317)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M211.357 140.995c-.463-.238-1.203-.19-1.666.047l-2.498 1.283-2.405-.522 1.573-.808c.462-.238.555-.618.092-.855-.462-.238-1.202-.238-1.665 0l-2.267 1.164-9.899-2.138c-.463-.095-.925-.048-1.295.142-.324.167-.417.452-.278.665l4.256 4.989-2.221 1.141c-.462.237-.555.617-.092.855.462.237 1.203.237 1.665 0l1.619-.832 1.018 1.236-2.452 1.259c-.462.237-.555.618-.092.855.462.238 1.202.238 1.665 0l1.897-.974 3.562 4.11c.231.309.925.428 1.526.309.139-.024.231-.071.324-.119.324-.166.463-.428.278-.665l-3.84-4.49 7.494-3.849 8.882 1.948c.462.095.925.048 1.295-.142.093-.048.185-.095.278-.19.231-.309 0-.665-.602-.784l-8.049-1.758 1.897-.974c.462-.285.509-.689 0-.903zm-16.931-.143l6.245 1.355-3.562 1.829-2.683-3.184zm3.747 4.348l1.018 1.235 6.198-3.183-2.405-.523-4.811 2.471z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M209.691 141.042l.134.069-.134-.069zm1.666-.047l-.134.068.007.004.007.003.12-.075zm-4.164 1.33l-.073.09.117.025.09-.046-.134-.069zm-2.405-.522l-.133-.069-.199.102.258.056.074-.089zm1.573-.808l.133.068-.133-.068zm-3.84.309l-.073.089.117.025.09-.046-.134-.068zm-9.899-2.138l.073-.09h-.003l-.07.09zm-1.573.807l-.18.031.007.008.173-.039zm4.256 4.989l.133.069.091-.047-.051-.061-.173.039zm-2.221 1.141l.134.068-.134-.068zm1.573.855l.134.068-.134-.068zm1.619-.832l.174-.037-.109-.133-.198.102.133.068zm1.018 1.236l.133.068.09-.046-.049-.06-.174.038zm1.018 1.14l.172-.039-.112-.129-.194.1.134.068zm3.562 4.11l.176-.035-.004-.004-.172.039zm1.526.309l-.06-.092-.008.001.068.091zm.602-.784l.175-.036-.003-.003-.172.039zm-3.84-4.49l-.133-.069-.092.047.052.061.173-.039zm7.494-3.849l.074-.089-.117-.026-.09.047.133.068zm8.882 1.948l-.074.089.004.001.07-.09zm1.573-.332l.168.043.004-.004.004-.004-.176-.035zm-.602-.784l-.074.089.006.001.068-.09zm-8.049-1.758l-.133-.069-.198.102.257.056.074-.089zm1.897-.974l.134.069.011-.007-.145-.062zm-10.686.309l.133.068.198-.102-.258-.056-.073.09zm-6.245-1.355l.073-.089-.433-.094.186.222.174-.039zm2.683 3.184l-.173.038.11.131.196-.101-.133-.068zm2.082 2.399l-.174.038.109.132.198-.101-.133-.069zm-1.018-1.235l-.133-.069-.09.046.049.061.174-.038zm7.216-1.948l.134.068.198-.101-.258-.056-.074.089zm-2.405-.523l.073-.089-.117-.026-.09.047.134.068zm6.841-1.618c.409-.21 1.028-.238 1.398-.048l.267-.137c-.555-.284-1.416-.217-1.932.048l.267.137zm-2.498 1.283l2.498-1.283-.267-.137-2.498 1.283.267.137zm-2.613-.502l2.406.523.147-.179-2.406-.523-.147.179zm1.513-.966l-1.572.808.266.137 1.573-.808-.267-.137zm.093-.718c.37.19.316.508-.093.718l.267.137c.516-.265.648-.707.093-.992l-.267.137zm-1.399 0c.389-.199 1.01-.199 1.399 0l.267-.137c-.537-.275-1.396-.275-1.932 0l.266.137zm-2.266 1.164l2.266-1.164-.266-.137-2.267 1.164.267.137zm-10.106-2.117l9.899 2.138.146-.179-9.899-2.138-.146.179zm-1.089.122c.318-.163.701-.202 1.092-.121l.14-.18c-.534-.11-1.077-.053-1.499.164l.267.137zm-.232.566c-.119-.184-.034-.429.232-.566l-.267-.137c-.381.196-.481.521-.323.764l.358-.061zm4.25 4.98l-4.256-4.988-.346.077 4.256 4.989.346-.078zm-2.26 1.248l2.22-1.14-.267-.137-2.22 1.14.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.647.707-.093.992l.267-.137zm1.399 0c-.389.2-1.01.2-1.399 0l-.267.137c.537.276 1.396.276 1.933 0l-.267-.137zm1.619-.831l-1.619.831.267.137 1.619-.831-.267-.137zm1.325 1.266l-1.018-1.235-.348.075 1.018 1.236.348-.076zm-2.492 1.365l2.451-1.259-.266-.137-2.452 1.259.267.137zm-.093.719c-.37-.191-.316-.509.093-.719l-.267-.137c-.516.265-.648.708-.093.993l.267-.137zm1.399 0c-.389.199-1.01.199-1.399 0l-.267.137c.537.275 1.396.275 1.932 0l-.266-.137zm1.896-.974l-1.896.974.266.137 1.897-.974-.267-.137zm3.868 4.139l-3.562-4.11-.345.078 3.562 4.11.345-.078zm1.286.257c-.524.104-1.096-.004-1.282-.253l-.353.07c.277.368 1.093.498 1.771.364l-.136-.181zm.259-.096a.829.829 0 01-.251.095l.12.184c.187-.032.308-.097.397-.142l-.266-.137zm.235-.561c.155.198.04.419-.235.561l.266.137c.372-.191.535-.493.32-.77l-.351.072zm-3.837-4.487l3.84 4.49.345-.078-3.839-4.49-.346.078zm7.534-3.956l-7.494 3.848.266.137 7.494-3.848-.266-.137zm9.089 1.927l-8.882-1.948-.148.178 8.882 1.948.148-.178zm1.088-.122c-.318.163-.701.202-1.092.121l-.14.18c.534.11 1.076.053 1.498-.164l-.266-.137zm.242-.165a.827.827 0 01-.242.165l.266.137c.097-.049.207-.106.313-.215l-.337-.087zm-.501-.65c.485.096.695.39.493.659l.353.07c.261-.349.008-.768-.71-.91l-.136.181zm-8.055-1.759l8.049 1.758.148-.178-8.049-1.758-.148.178zm1.837-1.132l-1.896.974.267.137 1.896-.974-.267-.137zm.014-.759c.398.167.398.505-.025.766l.29.124c.502-.31.594-.78-.026-1.04l-.239.15zm-10.493 1.047l-6.245-1.354-.147.179 6.245 1.354.147-.179zm-3.502 1.987l3.562-1.829-.267-.137-3.562 1.829.267.137zm-2.99-3.213l2.684 3.183.346-.077-2.683-3.183-.347.077zm5.112 5.506l-1.017-1.235-.348.076 1.018 1.235.347-.076zm5.892-3.214l-6.199 3.184.267.137 6.199-3.184-.267-.137zm-2.346-.365l2.406.523.147-.178-2.406-.523-.147.178zm-4.604 2.45l4.811-2.47-.267-.137-4.81 2.47.266.137z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M176.5 133.82l51 .373v6.23c0 3.323-2.495 6.64-7.472 9.174-9.961 5.055-26.103 5.055-36.063 0-4.977-2.527-7.465-5.851-7.465-9.174v-6.603z"
+        fill="url(#paint17_linear_10099_57317)"
+      />
+
+      <Path
+        d="M220.03 143.387c-9.961 5.033-26.102 5.033-36.062 0-9.961-5.033-9.954-13.211 0-18.244 9.953-5.033 26.101-5.033 36.062 0 9.96 5.033 9.96 13.199 0 18.244z"
+        fill="url(#paint18_linear_10099_57317)"
+      />
+
+      <Path
+        d="M201.5 145.383c12.15 0 22-5.176 22-11.562 0-6.386-9.85-11.563-22-11.563s-22 5.177-22 11.563c0 6.386 9.85 11.562 22 11.562z"
+        fill="url(#paint19_linear_10099_57317)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M211.357 129.81c-.463-.237-1.203-.19-1.666.048l-2.498 1.283-2.405-.523 1.573-.808c.462-.237.555-.617.092-.855-.462-.237-1.202-.237-1.665 0l-2.267 1.164-9.899-2.138c-.463-.095-.925-.047-1.295.143-.324.166-.417.451-.278.665l4.256 4.989-2.221 1.14c-.462.238-.555.618-.092.855.462.238 1.203.238 1.665 0l1.619-.831 1.018 1.235-2.452 1.259c-.462.238-.555.618-.092.856.462.237 1.202.237 1.665 0l1.897-.974 3.562 4.109c.231.309.925.428 1.526.309.139-.023.231-.071.324-.119.324-.166.463-.427.278-.665l-3.84-4.49 7.494-3.848 8.882 1.948c.462.095.925.047 1.295-.143a.958.958 0 00.278-.19c.231-.309 0-.665-.602-.784l-8.049-1.758 1.897-.974c.462-.285.509-.689 0-.903zm-16.931-.142l6.245 1.354-3.562 1.829-2.683-3.183zm3.747 4.348l1.018 1.235 6.198-3.183-2.405-.523-4.811 2.471z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M211.357 129.81l-.134.069.007.003.007.003.12-.075zm-4.164 1.331l-.073.089.117.025.09-.046-.134-.068zm-2.405-.523l-.133-.068-.199.101.258.056.074-.089zm-2.267-.499l-.073.09.117.025.09-.046-.134-.069zm-9.899-2.138l.073-.089-.003-.001-.07.09zm-1.573.808l-.18.031.007.008.173-.039zm4.256 4.989l.133.068.091-.046-.051-.061-.173.039zm.971 1.164l.174-.038-.109-.132-.198.101.133.069zm1.018 1.235l.133.069.09-.046-.049-.061-.174.038zm1.018 1.141l.172-.04-.112-.129-.194.1.134.069zm3.562 4.109l.176-.034-.004-.005-.172.039zm1.526.309l-.06-.092-.008.002.068.09zm.602-.784l.175-.036-.003-.003-.172.039zm-3.84-4.49l-.133-.068-.092.047.052.06.173-.039zm7.494-3.848l.074-.089-.117-.026-.09.046.133.069zm8.882 1.948l-.074.089.004.001.07-.09zm1.573-.333l.168.043.004-.004.004-.004-.176-.035zm-.602-.784l-.074.089.006.002.068-.091zm-8.049-1.758l-.133-.068-.198.101.257.056.074-.089zm1.897-.974l.134.069.011-.007-.145-.062zm-10.686.309l.133.069.198-.102-.258-.056-.073.089zm-6.245-1.354l.073-.089-.433-.094.186.221.174-.038zm2.683 3.183l-.173.039.11.131.196-.101-.133-.069zm2.082 2.4l-.174.038.109.132.198-.101-.133-.069zm-1.018-1.235l-.133-.069-.09.046.049.06.174-.037zm7.216-1.948l.134.068.198-.102-.258-.056-.074.09zm-2.405-.523l.073-.089-.117-.026-.09.046.134.069zm6.841-1.619c.409-.21 1.028-.237 1.398-.047l.267-.137c-.555-.285-1.416-.218-1.932.047l.267.137zm-2.498 1.283l2.498-1.283-.267-.137-2.498 1.283.267.137zm-2.613-.502l2.406.523.147-.178-2.406-.523-.147.178zm1.513-.965l-1.572.808.266.137 1.573-.808-.267-.137zm.093-.718c.37.19.316.508-.093.718l.267.137c.516-.265.648-.707.093-.992l-.267.137zm-1.399 0c.389-.2 1.01-.2 1.399 0l.267-.137c-.537-.276-1.396-.276-1.932 0l.266.137zm-2.266 1.164l2.266-1.164-.266-.137-2.267 1.164.267.137zm-10.106-2.118l9.899 2.139.146-.179-9.899-2.138-.146.178zm-1.089.122c.318-.163.701-.201 1.092-.121l.14-.18c-.534-.11-1.077-.053-1.499.164l.267.137zm-.232.566c-.119-.184-.034-.429.232-.566l-.267-.137c-.381.196-.481.521-.323.765l.358-.062zm4.25 4.981l-4.256-4.989-.346.078 4.256 4.989.346-.078zm-2.26 1.248l2.22-1.141-.267-.137-2.22 1.141.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.647.707-.093.992l.267-.137zm1.399 0c-.389.2-1.01.2-1.399 0l-.267.137c.537.275 1.396.275 1.933 0l-.267-.137zm1.619-.832l-1.619.832.267.137 1.619-.832-.267-.137zm1.325 1.266l-1.018-1.235-.348.076 1.018 1.235.348-.076zm-2.492 1.366l2.451-1.259-.266-.137-2.452 1.259.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.648.707-.093.992l.267-.137zm1.399 0c-.389.2-1.01.2-1.399 0l-.267.137c.537.275 1.396.275 1.932 0l-.266-.137zm1.896-.974l-1.896.974.266.137 1.897-.974-.267-.137zm3.868 4.139l-3.562-4.11-.345.079 3.562 4.11.345-.079zm1.286.258c-.524.103-1.096-.004-1.282-.253l-.353.069c.277.369 1.093.499 1.771.365l-.136-.181zm.259-.097a.803.803 0 01-.251.095l.12.184c.187-.032.308-.096.397-.142l-.266-.137zm.235-.561c.155.198.04.419-.235.561l.266.137c.372-.191.535-.493.32-.77l-.351.072zm-3.837-4.487l3.84 4.49.345-.078-3.839-4.49-.346.078zm7.534-3.956l-7.494 3.849.266.137 7.494-3.849-.266-.137zm9.089 1.928l-8.882-1.948-.148.178 8.882 1.948.148-.178zm1.088-.122c-.318.163-.701.201-1.092.121l-.14.18c.534.109 1.076.053 1.498-.164l-.266-.137zm.242-.165c-.079.081-.154.119-.242.165l.266.137c.097-.05.207-.106.313-.216l-.337-.086zm-.501-.65c.485.095.695.389.493.658l.353.07c.261-.348.008-.767-.71-.909l-.136.181zm-8.055-1.76l8.049 1.758.148-.178-8.049-1.758-.148.178zm1.837-1.131l-1.896.974.267.137 1.896-.974-.267-.137zm.014-.76c.398.168.398.506-.025.766l.29.124c.502-.309.594-.779-.026-1.04l-.239.15zm-10.493 1.048l-6.245-1.354-.147.178 6.245 1.354.147-.178zm-3.502 1.987l3.562-1.829-.267-.137-3.562 1.829.267.137zm-2.99-3.214l2.684 3.184.346-.077-2.683-3.184-.347.077zm5.112 5.507l-1.017-1.235-.348.075 1.018 1.236.347-.076zm5.892-3.214l-6.199 3.184.267.137 6.199-3.184-.267-.137zm-2.346-.365l2.406.523.147-.179-2.406-.522-.147.178zm-4.604 2.45l4.811-2.47-.267-.138-4.81 2.471.266.137z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M176.5 122.636l51 .373v6.229c0 3.324-2.495 6.641-7.472 9.175-9.961 5.054-26.103 5.054-36.063 0-4.977-2.528-7.465-5.851-7.465-9.175v-6.602z"
+        fill="url(#paint20_linear_10099_57317)"
+      />
+
+      <Path
+        d="M220.03 132.203c-9.961 5.033-26.102 5.033-36.062 0-9.961-5.033-9.954-13.212 0-18.245 9.953-5.033 26.101-5.033 36.062 0 9.96 5.033 9.96 13.199 0 18.245z"
+        fill="url(#paint21_linear_10099_57317)"
+      />
+
+      <Path
+        d="M201.5 134.199c12.15 0 22-5.177 22-11.563 0-6.386-9.85-11.563-22-11.563s-22 5.177-22 11.563c0 6.386 9.85 11.563 22 11.563z"
+        fill="url(#paint22_linear_10099_57317)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M211.357 118.626c-.463-.237-1.203-.19-1.666.048l-2.498 1.283-2.405-.523 1.573-.808c.462-.237.555-.617.092-.855-.462-.237-1.202-.237-1.665 0l-2.267 1.164-9.899-2.138c-.463-.095-.925-.047-1.295.143-.324.166-.417.451-.278.665l4.256 4.989-2.221 1.14c-.462.238-.555.618-.092.855.462.238 1.203.238 1.665 0l1.619-.831 1.018 1.235-2.452 1.259c-.462.238-.555.618-.092.855.462.238 1.202.238 1.665 0l1.897-.974 3.562 4.11c.231.309.925.428 1.526.309.139-.024.231-.071.324-.119.324-.166.463-.427.278-.665l-3.84-4.49 7.494-3.848 8.882 1.948c.462.095.925.047 1.295-.143a.958.958 0 00.278-.19c.231-.309 0-.665-.602-.784l-8.049-1.758 1.897-.974c.462-.285.509-.689 0-.903zm-16.931-.142l6.245 1.354-3.562 1.829-2.683-3.183zm3.747 4.347l1.018 1.236 6.198-3.184-2.405-.522-4.811 2.47z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M211.357 118.626l-.134.069.007.003.007.003.12-.075zm-4.164 1.331l-.073.089.117.025.09-.046-.134-.068zm-2.405-.523l-.133-.068-.199.101.258.056.074-.089zm1.573-.808l.133.069-.133-.069zm-3.84.309l-.073.089.117.026.09-.046-.134-.069zm-9.899-2.138l.073-.089-.003-.001-.07.09zm-1.573.808l-.18.031.007.008.173-.039zm4.256 4.989l.133.068.091-.047-.051-.06-.173.039zm-.648 1.995l.134.069-.134-.069zm1.619-.831l.174-.038-.109-.132-.198.101.133.069zm1.018 1.235l.133.069.09-.047-.049-.06-.174.038zm-2.452 1.259l-.133-.068.133.068zm3.47-.119l.172-.039-.112-.129-.194.1.134.068zm3.562 4.11l.176-.034-.004-.005-.172.039zm1.526.309l-.06-.092-.008.002.068.09zm.602-.784l.175-.036-.003-.003-.172.039zm-3.84-4.49l-.133-.068-.092.047.052.06.173-.039zm7.494-3.848l.074-.09-.117-.025-.09.046.133.069zm8.882 1.948l-.074.089.004.001.07-.09zm1.573-.333l.168.043.004-.004.004-.004-.176-.035zm-.602-.784l-.074.089.006.002.068-.091zm-8.049-1.758l-.133-.068-.198.101.257.056.074-.089zm1.897-.974l.134.069.011-.007-.145-.062zm-10.686.309l.133.069.198-.102-.258-.056-.073.089zm-6.245-1.354l.073-.089-.433-.094.186.221.174-.038zm2.683 3.183l-.173.039.11.131.196-.101-.133-.069zm2.082 2.4l-.174.037.109.133.198-.102-.133-.068zm-1.018-1.236l-.133-.068-.09.046.049.06.174-.038zm7.216-1.948l.134.069.198-.102-.258-.056-.074.089zm-2.405-.522l.073-.09-.117-.025-.09.046.134.069zm6.841-1.619c.409-.21 1.028-.237 1.398-.047l.267-.137c-.555-.285-1.416-.218-1.932.047l.267.137zm-2.498 1.283l2.498-1.283-.267-.137-2.498 1.283.267.137zm-2.613-.502l2.406.523.147-.179-2.406-.522-.147.178zm1.513-.965l-1.572.808.266.137 1.573-.808-.267-.137zm.093-.718c.37.19.316.508-.093.718l.267.137c.516-.265.648-.708.093-.992l-.267.137zm-1.399 0c.389-.2 1.01-.2 1.399 0l.267-.137c-.537-.276-1.396-.276-1.932 0l.266.137zm-2.266 1.164l2.266-1.164-.266-.137-2.267 1.164.267.137zm-10.106-2.118l9.899 2.138.146-.178-9.899-2.138-.146.178zm-1.089.122c.318-.163.701-.201 1.092-.121l.14-.18c-.534-.11-1.077-.053-1.499.164l.267.137zm-.232.566c-.119-.184-.034-.429.232-.566l-.267-.137c-.381.196-.481.521-.323.764l.358-.061zm4.25 4.981l-4.256-4.989-.346.078 4.256 4.989.346-.078zm-2.26 1.248l2.22-1.141-.267-.137-2.22 1.14.267.138zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.138c-.516.266-.647.708-.093.993l.267-.137zm1.399 0c-.389.199-1.01.199-1.399 0l-.267.137c.537.275 1.396.275 1.933 0l-.267-.137zm1.619-.832l-1.619.832.267.137 1.619-.832-.267-.137zm1.325 1.266l-1.018-1.235-.348.076 1.018 1.235.348-.076zm-2.492 1.366l2.451-1.259-.266-.137-2.452 1.259.267.137zm-.093.718c-.37-.19-.316-.508.093-.718l-.267-.137c-.516.265-.648.707-.093.992l.267-.137zm1.399 0c-.389.2-1.01.2-1.399 0l-.267.137c.537.275 1.396.275 1.932 0l-.266-.137zm1.896-.974l-1.896.974.266.137 1.897-.974-.267-.137zm3.868 4.139l-3.562-4.11-.345.079 3.562 4.11.345-.079zm1.286.258c-.524.103-1.096-.004-1.282-.253l-.353.069c.277.369 1.093.499 1.771.365l-.136-.181zm.259-.097a.803.803 0 01-.251.095l.12.184c.187-.032.308-.096.397-.142l-.266-.137zm.235-.561c.155.198.04.419-.235.561l.266.137c.372-.191.535-.493.32-.77l-.351.072zm-3.837-4.487l3.84 4.49.345-.078-3.839-4.49-.346.078zm7.534-3.956l-7.494 3.849.266.137 7.494-3.849-.266-.137zm9.089 1.928l-8.882-1.949-.148.179 8.882 1.948.148-.178zm1.088-.122c-.318.163-.701.201-1.092.121l-.14.18c.534.109 1.076.053 1.498-.164l-.266-.137zm.242-.165c-.079.08-.154.119-.242.165l.266.137c.097-.05.207-.106.313-.216l-.337-.086zm-.501-.65c.485.095.695.389.493.658l.353.07c.261-.349.008-.768-.71-.909l-.136.181zm-8.055-1.76l8.049 1.758.148-.178-8.049-1.758-.148.178zm1.837-1.131l-1.896.974.267.137 1.896-.974-.267-.137zm.014-.76c.398.168.398.505-.025.766l.29.124c.502-.309.594-.779-.026-1.04l-.239.15zm-10.493 1.048l-6.245-1.354-.147.178 6.245 1.354.147-.178zm-3.502 1.987l3.562-1.829-.267-.138-3.562 1.83.267.137zm-2.99-3.214l2.684 3.184.346-.077-2.683-3.184-.347.077zm5.112 5.507l-1.017-1.235-.348.075 1.018 1.235.347-.075zm5.892-3.214l-6.199 3.183.267.137 6.199-3.183-.267-.137zm-2.346-.365l2.406.522.147-.178-2.406-.523-.147.179zm-4.604 2.45l4.811-2.471-.267-.137-4.81 2.471.266.137z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M176.5 111.452l51 .373v6.23c0 3.323-2.495 6.64-7.472 9.174-9.961 5.055-26.103 5.055-36.063 0-4.977-2.527-7.465-5.851-7.465-9.174v-6.603z"
+        fill="url(#paint23_linear_10099_57317)"
+      />
+
+      <Path
+        d="M220.03 121.019c-9.961 5.033-26.102 5.033-36.062 0-9.961-5.033-9.954-13.211 0-18.244 9.953-5.033 26.101-5.033 36.062 0 9.96 5.033 9.96 13.199 0 18.244z"
+        fill="url(#paint24_linear_10099_57317)"
+      />
+
+      <Path
+        d="M201.5 123.015c12.15 0 22-5.177 22-11.563 0-6.386-9.85-11.563-22-11.563s-22 5.177-22 11.563c0 6.386 9.85 11.563 22 11.563z"
+        fill="url(#paint25_linear_10099_57317)"
+      />
+
+      <Path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M81.623 83.413c0-.52-.406-1.118-.856-1.378l-2.432-1.404-.675-2.314 1.53.884c.451.26.856.13.856-.39s-.36-1.144-.81-1.404l-2.207-1.274-2.792-9.517c-.135-.442-.405-.806-.766-1.014-.315-.182-.63-.104-.765.13l-2.657 6.319-2.162-1.249c-.45-.26-.856-.13-.856.39s.36 1.145.81 1.405l1.577.91-.675 1.534-2.387-1.378c-.45-.26-.856-.13-.856.39s.36 1.144.81 1.404l1.847 1.066-2.162 5.252c-.18.364.045 1.014.45 1.456.09.104.18.156.271.208.315.182.63.156.766-.13l2.386-5.694 7.296 4.212 2.477 8.555c.135.442.405.806.766 1.014.09.052.18.104.315.13.405.026.63-.364.45-.936l-2.251-7.749 1.846 1.066c.496.234.9.052.856-.494zM73.516 69.06l1.757 6.007-3.468-2.002 1.711-4.005zM71.22 74.6l-.676 1.534 6.035 3.484-.676-2.314-4.683-2.704z"
+        fill="#fff"
+      />
+
+      <Path
+        d="M81.623 83.413l-.13-.075v.015l.13.06zm-3.288-2.782l-.12-.013.033.113.087.05v-.15zm-.675-2.314v-.15l-.193-.111.072.248.12.013zm1.53.884v.15-.15zm-2.16-3.068l-.121-.013.033.112.087.05v-.15zm-2.793-9.517l.12.013v-.003l-.12-.01zm-1.531-.884l-.117-.135-.004.01.12.125zm-2.657 6.319v.15l.088.05.033-.076-.121-.124zm-2.162-1.249v.15-.15zm-.045 1.795v-.15.15zm1.576.91l.12.125.073-.164-.193-.111v.15zm-.675 1.534v.15l.087.05.033-.074-.12-.126zm-2.387-1.378v-.15.15zm1.801 2.86l.121.124.068-.165-.189-.11v.15zm-2.162 5.252l.12.13.002-.006-.122-.124zm.45 1.456l.059-.1-.005-.006-.053.106zm1.037.078l.119.128.002-.004-.121-.124zm2.386-5.694v-.15l-.088-.051-.033.076.121.125zm7.296 4.212l.12.014-.032-.113-.088-.05v.15zm2.477 8.555l-.12-.014v.004l.12.01zm1.081 1.144l.041.166h.006l.006.001-.053-.167zm.45-.936l-.12-.014.002.006.118.008zm-2.251-7.749v-.15l-.193-.111.072.248.12.013zm1.846 1.066v.15l.012.006-.012-.156zm-5.494-8.84v.15l.193.111-.073-.248-.12-.013zm-1.757-6.007l.12.013-.121-.417-.12.28.121.124zm-1.711 4.004l-.12-.124-.071.164.19.11v-.15zm-1.26 3.069l-.121-.126-.073.164.193.112v-.15zm.675-1.534v-.15l-.088-.05-.033.074.12.126zm5.359 5.018v.15l.193.111-.073-.248-.12-.013zm-.676-2.314l.12.013-.032-.113-.088-.05v.15zm4.864 4.882c.398.23.726.737.726 1.153l.26.15c0-.623-.483-1.313-.986-1.603v.3zm-2.432-1.404l2.432 1.404v-.3l-2.432-1.404v.3zm-.796-2.477l.676 2.314.24.026-.675-2.314-.24-.026zm1.652.747l-1.531-.884v.3l1.53.884v-.3zm.726-.315c0 .416-.328.545-.726.315v.3c.502.29.985.159.985-.465l-.26-.15zm-.681-1.18c.379.22.68.743.68 1.18l.26.15c0-.603-.418-1.328-.94-1.63v.3zm-2.207-1.273l2.207 1.274v-.3l-2.207-1.274v.3zm-2.912-9.68l2.792 9.517.24.026-2.792-9.517-.24-.026zm-.646-.85c.31.178.532.48.647.853l.238.02c-.156-.51-.474-.936-.885-1.174v.3zm-.65.113c.117-.201.391-.263.65-.114v-.3c-.37-.214-.728-.12-.882.146l.233.268zm-2.651 6.309l2.657-6.318-.242-.25-2.657 6.32.242.248zm-2.283-1.222l2.162 1.248v-.3l-2.162-1.248v.3zm-.726.314c0-.416.328-.544.726-.314v-.3c-.503-.29-.986-.16-.986.465l.26.15zm.68 1.18c-.378-.219-.68-.742-.68-1.18l-.26-.15c0 .603.419 1.328.94 1.63v-.3zm1.577.91l-1.576-.91v.3l1.576.91v-.3zm-.555 1.81l.675-1.535-.24-.251-.676 1.534.241.252zm-2.507-1.354l2.387 1.378v-.3l-2.387-1.378v.3zm-.726.315c0-.417.328-.545.726-.315v-.3c-.503-.29-.986-.159-.986.465l.26.15zm.68 1.179c-.378-.219-.68-.742-.68-1.18l-.26-.15c0 .604.418 1.328.94 1.63v-.3zm1.847 1.066l-1.846-1.066v.3l1.846 1.066v-.3zm-2.04 5.526l2.161-5.252-.242-.248-2.162 5.252.243.248zm.382 1.226c-.354-.386-.53-.927-.385-1.22l-.237-.26c-.215.435.059 1.194.516 1.693l.106-.213zm.217.164a.738.738 0 01-.212-.158l-.116.2c.12.14.241.208.328.258v-.3zm.646-.108c-.112.239-.378.263-.646.108v.3c.362.21.727.182.885-.152l-.239-.256zm2.385-5.69l-2.386 5.694.242.248 2.387-5.694-.243-.249zm7.417 4.186l-7.296-4.212v.3l7.296 4.212v-.3zm2.598 8.718l-2.477-8.554-.241-.028 2.477 8.555.24.027zm.645.85c-.31-.178-.532-.48-.646-.854l-.24-.02c.157.511.475.937.886 1.175v-.3zm.274.115a.81.81 0 01-.274-.114v.3c.094.054.2.116.356.146l-.082-.332zm.373-.778c.145.461-.031.799-.385.776l.106.335c.457.03.731-.413.516-1.096l-.237-.015zM78.8 82.828l2.252 7.748.24.027-2.25-7.748-.242-.027zm1.967.93l-1.846-1.067v.3l1.846 1.066v-.3zm.727-.404c.035.427-.286.61-.739.397l.024.312c.538.254 1.028.075.973-.59l-.258-.12zm-6.101-8.274l-1.756-6.007-.241-.026 1.756 6.007.241.026zm-3.588-1.865l3.468 2.002v-.3l-3.468-2.002v.3zm1.59-4.28l-1.71 4.004.24.25 1.712-4.004-.242-.25zm-2.73 7.324l.675-1.534-.24-.252-.676 1.534.24.252zm5.914 3.208l-6.035-3.484v.3l6.035 3.484v-.3zm-.796-2.177l.675 2.314.241.026-.675-2.314-.241-.026zm-4.563-2.541l4.683 2.704v-.3l-4.683-2.704v.3z"
+        fill="#fff"
+      />
+
+      <Defs>
+        <LinearGradient
+          id="paint0_linear_10099_57317"
+          x1={96.7354}
+          y1={104.872}
+          x2={96.7354}
+          y2={51.8744}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint1_linear_10099_57317"
+          x1={60.1868}
+          y1={59.767}
+          x2={81.2575}
+          y2={51.877}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint2_linear_10099_57317"
+          x1={96.9808}
+          y1={189.436}
+          x2={254.256}
+          y2={107.396}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint3_linear_10099_57317"
+          x1={36.5487}
+          y1={186.283}
+          x2={141.339}
+          y2={136.105}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint4_linear_10099_57317"
+          x1={3.13321}
+          y1={177.988}
+          x2={236.486}
+          y2={29.6785}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint5_linear_10099_57317"
+          x1={164.902}
+          y1={70.3154}
+          x2={210.407}
+          y2={113.117}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint6_linear_10099_57317"
+          x1={104.176}
+          y1={74.3198}
+          x2={155.76}
+          y2={85.5788}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint7_linear_10099_57317"
+          x1={168.569}
+          y1={94.0484}
+          x2={188.283}
+          y2={80.8268}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint8_linear_10099_57317"
+          x1={197.79}
+          y1={168.537}
+          x2={224.033}
+          y2={188.293}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint9_linear_10099_57317"
+          x1={200.145}
+          y1={153.75}
+          x2={203.589}
+          y2={187.674}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop offset={0.09} stopColor="#84E4A4" />
+
+          <Stop offset={0.97} stopColor="#3C53D7" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint10_linear_10099_57317"
+          x1={226.339}
+          y1={181.792}
+          x2={226.339}
+          y2={155.688}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint11_linear_10099_57317"
+          x1={197.79}
+          y1={157.353}
+          x2={224.033}
+          y2={177.109}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint12_linear_10099_57317"
+          x1={200.145}
+          y1={142.566}
+          x2={203.589}
+          y2={176.491}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop offset={0.09} stopColor="#84E4A4" />
+
+          <Stop offset={0.97} stopColor="#3C53D7" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint13_linear_10099_57317"
+          x1={226.339}
+          y1={170.608}
+          x2={226.339}
+          y2={144.503}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint14_linear_10099_57317"
+          x1={197.79}
+          y1={146.169}
+          x2={224.033}
+          y2={165.925}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint15_linear_10099_57317"
+          x1={200.145}
+          y1={131.382}
+          x2={203.589}
+          y2={165.307}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop offset={0.09} stopColor="#84E4A4" />
+
+          <Stop offset={0.97} stopColor="#3C53D7" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint16_linear_10099_57317"
+          x1={226.339}
+          y1={159.424}
+          x2={226.339}
+          y2={133.32}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint17_linear_10099_57317"
+          x1={197.79}
+          y1={134.985}
+          x2={224.033}
+          y2={154.741}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint18_linear_10099_57317"
+          x1={200.145}
+          y1={120.198}
+          x2={203.589}
+          y2={154.123}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop offset={0.09} stopColor="#84E4A4" />
+
+          <Stop offset={0.97} stopColor="#3C53D7" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint19_linear_10099_57317"
+          x1={226.339}
+          y1={148.24}
+          x2={226.339}
+          y2={122.136}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint20_linear_10099_57317"
+          x1={197.79}
+          y1={123.8}
+          x2={224.033}
+          y2={143.556}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint21_linear_10099_57317"
+          x1={200.145}
+          y1={109.013}
+          x2={203.589}
+          y2={142.938}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop offset={0.09} stopColor="#84E4A4" />
+
+          <Stop offset={0.97} stopColor="#3C53D7" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint22_linear_10099_57317"
+          x1={226.339}
+          y1={137.056}
+          x2={226.339}
+          y2={110.951}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint23_linear_10099_57317"
+          x1={197.79}
+          y1={112.617}
+          x2={224.033}
+          y2={132.373}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#17D1AA" />
+
+          <Stop offset={0.0659437} stopColor="#1AC2AE" />
+
+          <Stop offset={0.2651} stopColor="#229BB8" />
+
+          <Stop offset={0.4616} stopColor="#297CC0" />
+
+          <Stop offset={0.6525} stopColor="#2D66C6" />
+
+          <Stop offset={0.8349} stopColor="#3059CA" />
+
+          <Stop offset={1} stopColor="#3154CB" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint24_linear_10099_57317"
+          x1={200.145}
+          y1={97.8298}
+          x2={203.589}
+          y2={131.755}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop offset={0.09} stopColor="#84E4A4" />
+
+          <Stop offset={0.97} stopColor="#3C53D7" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint25_linear_10099_57317"
+          x1={226.339}
+          y1={125.872}
+          x2={226.339}
+          y2={99.7672}
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#1D45BA" />
+
+          <Stop offset={0.4204} stopColor="#1D47BA" />
+
+          <Stop offset={0.5718} stopColor="#1D4EB9" />
+
+          <Stop offset={0.6797} stopColor="#1C59B8" />
+
+          <Stop offset={0.767} stopColor="#1B6AB6" />
+
+          <Stop offset={0.8417} stopColor="#1A80B3" />
+
+          <Stop offset={0.9079} stopColor="#199CB0" />
+
+          <Stop offset={0.9663} stopColor="#18BBAD" />
+
+          <Stop offset={1} stopColor="#17D1AA" />
+        </LinearGradient>
+      </Defs>
+    </Svg>
+  )
+}
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/ListOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/ListOrders.tsx
index f818ac4cb9..330be4f079 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/ListOrders.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/ListOrders.tsx
@@ -2,6 +2,7 @@ import React from 'react'
 import {StyleSheet, View} from 'react-native'
 
 import {Boundary} from '../../../../../components'
+import {useWalletNavigation} from '../../../../../navigation'
 import {useSearchOnNavBar} from '../../../../../Search/SearchContext'
 import {COLORS} from '../../../../../theme'
 import {ButtonGroup} from '../../../common/ButtonGroup/ButtonGroup'
@@ -10,6 +11,7 @@ import {CompletedOrders, CompletedOrdersSkeleton} from './CompletedOrders'
 import {OpenOrders, OpenOrdersSkeleton} from './OpenOrders'
 
 export const ListOrders = () => {
+  const {navigateToTxHistory} = useWalletNavigation()
   const [orderStatusIndex, setOrderStatusIndex] = React.useState(0)
 
   const strings = useStrings()
@@ -22,6 +24,8 @@ export const ListOrders = () => {
   useSearchOnNavBar({
     placeholder: strings.searchTokens,
     title: strings.swapTitle,
+    isChild: true,
+    onBack: navigateToTxHistory,
   })
 
   return (
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx
index e266a5a990..7728c6ad08 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx
@@ -1,11 +1,12 @@
 import {useFocusEffect} from '@react-navigation/native'
+import {FlashList} from '@shopify/flash-list'
 import {isString} from '@yoroi/common'
 import {useSwap, useSwapOrdersByStatusOpen} from '@yoroi/swap'
 import {Buffer} from 'buffer'
 import _ from 'lodash'
 import React from 'react'
 import {useIntl} from 'react-intl'
-import {Alert, Linking, ScrollView, StyleSheet, TouchableOpacity, View} from 'react-native'
+import {Alert, Linking, StyleSheet, TouchableOpacity, View} from 'react-native'
 
 import {
   Button,
@@ -39,6 +40,7 @@ import {LiquidityPool} from '../../../common/LiquidityPool/LiquidityPool'
 import {PoolIcon} from '../../../common/PoolIcon/PoolIcon'
 import {useStrings} from '../../../common/strings'
 import {SwapInfoLink} from '../../../common/SwapInfoLink/SwapInfoLink'
+import {EmptyOpenOrdersLogo} from './EmptyOpenOrdersLogo'
 import {getCancellationOrderFee} from './helpers'
 import {mapOpenOrders, MappedOpenOrder} from './mapOrders'
 
@@ -255,8 +257,10 @@ export const OpenOrders = () => {
   return (
     <>
       <View style={styles.container}>
-        <ScrollView style={styles.content}>
-          {filteredOrders.map((order) => {
+        <FlashList
+          data={filteredOrders}
+          contentContainerStyle={styles.list}
+          renderItem={({item: order}: {item: MappedOpenOrder}) => {
             const fromIcon = <TokenIcon wallet={wallet} tokenId={order.fromTokenInfo?.id ?? ''} variant="swap" />
             const toIcon = <TokenIcon wallet={wallet} tokenId={order.toTokenInfo?.id ?? ''} variant="swap" />
             const liquidityPoolIcon =
@@ -307,14 +311,19 @@ export const OpenOrders = () => {
                 />
               </ExpandableInfoCard>
             )
-          })}
-        </ScrollView>
+          }}
+          keyExtractor={({id}) => `${id}`}
+          testID="openOrdersList"
+          estimatedItemSize={72}
+          bounces={false}
+          ListEmptyComponent={<ListEmptyComponent openOrders={filteredOrders} />}
+        />
       </View>
 
       <Counter
         style={styles.counter}
         openingText={strings.youHave}
-        counter={orders?.length ?? 0}
+        counter={filteredOrders?.length ?? 0}
         closingText={strings.listOpenOrders}
       />
 
@@ -591,6 +600,37 @@ const ModalContentButtons = ({onBack, onConfirm}: {onBack: () => void; onConfirm
   )
 }
 
+const ListEmptyComponent = ({openOrders}: {openOrders: Array<MappedOpenOrder>}) => {
+  const {search: assetSearchTerm, visible: isSearching} = useSearch()
+
+  if (isSearching && assetSearchTerm.length > 0 && openOrders.length === 0) return <EmptySearchResult />
+
+  return <NoOrdersYet />
+}
+
+const NoOrdersYet = () => {
+  const strings = useStrings()
+  return (
+    <View style={styles.imageContainer}>
+      <Spacer height={80} />
+
+      <EmptyOpenOrdersLogo style={styles.image} />
+
+      <Spacer height={25} />
+
+      <Text style={styles.contentText}>{strings.emptyOpenOrders}</Text>
+
+      <Spacer height={5} />
+
+      <Text style={styles.contentSubText}>{strings.emptyOpenOrdersSub}</Text>
+    </View>
+  )
+}
+
+const EmptySearchResult = () => {
+  return null
+}
+
 const styles = StyleSheet.create({
   container: {
     flex: 1,
@@ -601,6 +641,9 @@ const styles = StyleSheet.create({
     flex: 1,
     paddingHorizontal: 16,
   },
+  list: {
+    paddingHorizontal: 16,
+  },
   contentRow: {
     flexDirection: 'row',
     justifyContent: 'space-between',
@@ -663,4 +706,31 @@ const styles = StyleSheet.create({
   counter: {
     paddingVertical: 16,
   },
+  image: {
+    flex: 1,
+    alignSelf: 'center',
+    width: 200,
+    height: 228,
+  },
+  imageContainer: {
+    flex: 1,
+    textAlign: 'center',
+  },
+  contentText: {
+    flex: 1,
+    textAlign: 'center',
+    fontFamily: 'Rubik-Medium',
+    fontWeigh: '500',
+    fontSize: 20,
+    color: '#000',
+  },
+  contentSubText: {
+    flex: 1,
+    textAlign: 'center',
+    fontFamily: 'Rubik-Regular',
+    fontWeigh: '400',
+    fontSize: 16,
+    color: '#6B7384',
+    lineHeight: 24,
+  },
 })
diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json
index 3bcf41f379..2455933f07 100644
--- a/apps/wallet-mobile/src/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/i18n/locales/en-US.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
diff --git a/apps/wallet-mobile/translations/messages/src/components/PairedBalance/PairedBalance.json b/apps/wallet-mobile/translations/messages/src/components/PairedBalance/PairedBalance.json
new file mode 100644
index 0000000000..949c6b07cd
--- /dev/null
+++ b/apps/wallet-mobile/translations/messages/src/components/PairedBalance/PairedBalance.json
@@ -0,0 +1,17 @@
+[
+  {
+    "id": "components.txhistory.balancebanner.pairedbalance.error",
+    "defaultMessage": "!!!Error obtaining {currency} pairing",
+    "file": "src/components/PairedBalance/PairedBalance.tsx",
+    "start": {
+      "line": 86,
+      "column": 22,
+      "index": 2704
+    },
+    "end": {
+      "line": 89,
+      "column": 3,
+      "index": 2836
+    }
+  }
+]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
index 3753efa868..75939e41fd 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 129,
       "column": 15,
-      "index": 4188
+      "index": 4185
     },
     "end": {
       "line": 132,
       "column": 3,
-      "index": 4271
+      "index": 4268
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 133,
       "column": 18,
-      "index": 4291
+      "index": 4288
     },
     "end": {
       "line": 136,
       "column": 3,
-      "index": 4380
+      "index": 4377
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
index 067b23bf0d..0ee083eee0 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Incorrect password.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 140,
+      "line": 143,
       "column": 24,
-      "index": 9056
+      "index": 9273
     },
     "end": {
-      "line": 143,
+      "line": 146,
       "column": 3,
-      "index": 9165
+      "index": 9382
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 144,
+      "line": 147,
       "column": 13,
-      "index": 9180
+      "index": 9397
     },
     "end": {
-      "line": 147,
+      "line": 150,
       "column": 3,
-      "index": 9253
+      "index": 9470
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Token swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 148,
+      "line": 151,
       "column": 13,
-      "index": 9268
+      "index": 9485
     },
     "end": {
-      "line": 151,
+      "line": 154,
       "column": 3,
-      "index": 9350
+      "index": 9567
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 152,
+      "line": 155,
       "column": 13,
-      "index": 9365
+      "index": 9582
     },
     "end": {
-      "line": 155,
+      "line": 158,
       "column": 3,
-      "index": 9444
+      "index": 9661
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Market Button",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 156,
+      "line": 159,
       "column": 16,
-      "index": 9462
+      "index": 9679
     },
     "end": {
-      "line": 159,
+      "line": 162,
       "column": 3,
-      "index": 9547
+      "index": 9764
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Limit",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 160,
+      "line": 163,
       "column": 15,
-      "index": 9564
+      "index": 9781
     },
     "end": {
-      "line": 163,
+      "line": 166,
       "column": 3,
-      "index": 9640
+      "index": 9857
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Swap from",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 164,
+      "line": 167,
       "column": 12,
-      "index": 9654
+      "index": 9871
     },
     "end": {
-      "line": 167,
+      "line": 170,
       "column": 3,
-      "index": 9731
+      "index": 9948
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Swap to",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 168,
+      "line": 171,
       "column": 10,
-      "index": 9743
+      "index": 9960
     },
     "end": {
-      "line": 171,
+      "line": 174,
       "column": 3,
-      "index": 9816
+      "index": 10033
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Current Balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 172,
+      "line": 175,
       "column": 18,
-      "index": 9836
+      "index": 10053
     },
     "end": {
-      "line": 175,
+      "line": 178,
       "column": 3,
-      "index": 9925
+      "index": 10142
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 176,
+      "line": 179,
       "column": 11,
-      "index": 9938
+      "index": 10155
     },
     "end": {
-      "line": 179,
+      "line": 182,
       "column": 3,
-      "index": 10012
+      "index": 10229
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Select Token",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 180,
+      "line": 183,
       "column": 15,
-      "index": 10029
+      "index": 10246
     },
     "end": {
-      "line": 183,
+      "line": 186,
       "column": 3,
-      "index": 10112
+      "index": 10329
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Market Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 184,
+      "line": 187,
       "column": 15,
-      "index": 10129
+      "index": 10346
     },
     "end": {
-      "line": 187,
+      "line": 190,
       "column": 3,
-      "index": 10212
+      "index": 10429
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Limit Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 188,
+      "line": 191,
       "column": 14,
-      "index": 10228
+      "index": 10445
     },
     "end": {
-      "line": 191,
+      "line": 194,
       "column": 3,
-      "index": 10309
+      "index": 10526
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Slippage Tolerance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 192,
+      "line": 195,
       "column": 21,
-      "index": 10332
+      "index": 10549
     },
     "end": {
-      "line": 195,
+      "line": 198,
       "column": 3,
-      "index": 10427
+      "index": 10644
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!Slippage must be a number between 0 and 75 and have up to 1 decimal",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 196,
+      "line": 199,
       "column": 26,
-      "index": 10455
+      "index": 10672
     },
     "end": {
-      "line": 199,
+      "line": 202,
       "column": 3,
-      "index": 10604
+      "index": 10821
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!Slippage Tolerance Info",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 200,
+      "line": 203,
       "column": 25,
-      "index": 10631
+      "index": 10848
     },
     "end": {
-      "line": 203,
+      "line": 206,
       "column": 3,
-      "index": 10735
+      "index": 10952
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!Verified by {pool}",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 204,
+      "line": 207,
       "column": 14,
-      "index": 10751
+      "index": 10968
     },
     "end": {
-      "line": 207,
+      "line": 210,
       "column": 3,
-      "index": 10839
+      "index": 11056
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!This asset is in my portfolio",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 208,
+      "line": 211,
       "column": 12,
-      "index": 10853
+      "index": 11070
     },
     "end": {
-      "line": 211,
+      "line": 214,
       "column": 3,
-      "index": 10950
+      "index": 11167
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!Slippage tolerance is set as a percentage of the total swap value.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 212,
+      "line": 215,
       "column": 16,
-      "index": 10968
+      "index": 11185
     },
     "end": {
-      "line": 215,
+      "line": 218,
       "column": 3,
-      "index": 11106
+      "index": 11323
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!(auto)",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 216,
+      "line": 219,
       "column": 12,
-      "index": 11120
+      "index": 11337
     },
     "end": {
-      "line": 219,
+      "line": 222,
       "column": 3,
-      "index": 11194
+      "index": 11411
     }
   },
   {
@@ -304,14 +304,14 @@
     "defaultMessage": "!!!change dex",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 220,
+      "line": 223,
       "column": 14,
-      "index": 11210
+      "index": 11427
     },
     "end": {
-      "line": 223,
+      "line": 226,
       "column": 3,
-      "index": 11290
+      "index": 11507
     }
   },
   {
@@ -319,14 +319,14 @@
     "defaultMessage": "!!!Min-ADA is the minimum ADA amount required to be contained when holding or sending Cardano native assets.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 224,
+      "line": 227,
       "column": 14,
-      "index": 11306
+      "index": 11523
     },
     "end": {
-      "line": 228,
+      "line": 231,
       "column": 3,
-      "index": 11487
+      "index": 11704
     }
   },
   {
@@ -334,14 +334,14 @@
     "defaultMessage": "!!!Min ADA",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 229,
+      "line": 232,
       "column": 19,
-      "index": 11508
+      "index": 11725
     },
     "end": {
-      "line": 232,
+      "line": 235,
       "column": 3,
-      "index": 11590
+      "index": 11807
     }
   },
   {
@@ -349,14 +349,14 @@
     "defaultMessage": "!!!Swap fees include the following:\n • Matchmaker Fee\n • Frontend Fee\n • Liquidity Provider Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 233,
+      "line": 236,
       "column": 12,
-      "index": 11604
+      "index": 11821
     },
     "end": {
-      "line": 236,
+      "line": 239,
       "column": 3,
-      "index": 11767
+      "index": 11984
     }
   },
   {
@@ -364,14 +364,14 @@
     "defaultMessage": "!!!Fees",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 237,
+      "line": 240,
       "column": 17,
-      "index": 11786
+      "index": 12003
     },
     "end": {
-      "line": 240,
+      "line": 243,
       "column": 3,
-      "index": 11863
+      "index": 12080
     }
   },
   {
@@ -379,14 +379,14 @@
     "defaultMessage": "!!!Liquidity provider fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 241,
+      "line": 244,
       "column": 20,
-      "index": 11885
+      "index": 12102
     },
     "end": {
-      "line": 244,
+      "line": 247,
       "column": 3,
-      "index": 11983
+      "index": 12200
     }
   },
   {
@@ -394,14 +394,14 @@
     "defaultMessage": "!!!Liq. prov. fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 245,
+      "line": 248,
       "column": 18,
-      "index": 12003
+      "index": 12220
     },
     "end": {
-      "line": 248,
+      "line": 251,
       "column": 3,
-      "index": 12091
+      "index": 12308
     }
   },
   {
@@ -409,14 +409,14 @@
     "defaultMessage": "!!!Liquidity provider fee is a fixed {fee}% operational fee from the whole transaction volume, that is taken to support DEX “liquidity” allowing traders to buy and sell assets on the decentralized Cardano network.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 249,
+      "line": 252,
       "column": 24,
-      "index": 12117
+      "index": 12334
     },
     "end": {
-      "line": 253,
+      "line": 256,
       "column": 3,
-      "index": 12413
+      "index": 12630
     }
   },
   {
@@ -424,14 +424,14 @@
     "defaultMessage": "!!!Minimum amount of assets you can get because of the slippage tolerance.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 254,
+      "line": 257,
       "column": 19,
-      "index": 12434
+      "index": 12651
     },
     "end": {
-      "line": 257,
+      "line": 260,
       "column": 3,
-      "index": 12580
+      "index": 12797
     }
   },
   {
@@ -439,14 +439,14 @@
     "defaultMessage": "!!!Min Received",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 258,
+      "line": 261,
       "column": 24,
-      "index": 12606
+      "index": 12823
     },
     "end": {
-      "line": 261,
+      "line": 264,
       "column": 3,
-      "index": 12698
+      "index": 12915
     }
   },
   {
@@ -454,14 +454,14 @@
     "defaultMessage": "!!!Enter a value from 0% to 75%. You can also enter up to 1 decimal",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 262,
+      "line": 265,
       "column": 17,
-      "index": 12717
+      "index": 12934
     },
     "end": {
-      "line": 265,
+      "line": 268,
       "column": 3,
-      "index": 12854
+      "index": 13071
     }
   },
   {
@@ -469,14 +469,14 @@
     "defaultMessage": "!!!{pool} verification",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 266,
+      "line": 269,
       "column": 20,
-      "index": 12876
+      "index": 13093
     },
     "end": {
-      "line": 269,
+      "line": 272,
       "column": 3,
-      "index": 12971
+      "index": 13188
     }
   },
   {
@@ -484,14 +484,14 @@
     "defaultMessage": "!!!Volume, 24h",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 270,
+      "line": 273,
       "column": 10,
-      "index": 12983
+      "index": 13200
     },
     "end": {
-      "line": 273,
+      "line": 276,
       "column": 3,
-      "index": 13060
+      "index": 13277
     }
   },
   {
@@ -499,14 +499,14 @@
     "defaultMessage": "!!!Cardano projects that list their own tokens can apply for an additional {pool} verification. This verification is a manual validation that {pool} team performs with the help of Cardano Foundation.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 274,
+      "line": 277,
       "column": 24,
-      "index": 13086
+      "index": 13303
     },
     "end": {
-      "line": 278,
+      "line": 281,
       "column": 3,
-      "index": 13368
+      "index": 13585
     }
   },
   {
@@ -514,14 +514,14 @@
     "defaultMessage": "!!! Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 279,
+      "line": 282,
       "column": 9,
-      "index": 13379
+      "index": 13596
     },
     "end": {
-      "line": 282,
+      "line": 285,
       "column": 3,
-      "index": 13441
+      "index": 13658
     }
   },
   {
@@ -529,14 +529,14 @@
     "defaultMessage": "!!!No assets found for this pair",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 283,
+      "line": 286,
       "column": 17,
-      "index": 13460
+      "index": 13677
     },
     "end": {
-      "line": 286,
+      "line": 289,
       "column": 3,
-      "index": 13562
+      "index": 13779
     }
   },
   {
@@ -544,14 +544,14 @@
     "defaultMessage": "!!!No assets found for \"{search}\"",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 287,
+      "line": 290,
       "column": 20,
-      "index": 13584
+      "index": 13801
     },
     "end": {
-      "line": 290,
+      "line": 293,
       "column": 3,
-      "index": 13690
+      "index": 13907
     }
   },
   {
@@ -559,14 +559,14 @@
     "defaultMessage": "!!!Each verified tokens gets",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 291,
+      "line": 294,
       "column": 21,
-      "index": 13713
+      "index": 13930
     },
     "end": {
-      "line": 294,
+      "line": 297,
       "column": 3,
-      "index": 13815
+      "index": 14032
     }
   },
   {
@@ -574,14 +574,14 @@
     "defaultMessage": "!!!verified badge",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 295,
+      "line": 298,
       "column": 17,
-      "index": 13834
+      "index": 14051
     },
     "end": {
-      "line": 298,
+      "line": 301,
       "column": 3,
-      "index": 13921
+      "index": 14138
     }
   },
   {
@@ -589,14 +589,14 @@
     "defaultMessage": "!!!Open orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 299,
+      "line": 302,
       "column": 14,
-      "index": 13937
+      "index": 14154
     },
     "end": {
-      "line": 302,
+      "line": 305,
       "column": 3,
-      "index": 14018
+      "index": 14235
     }
   },
   {
@@ -604,14 +604,14 @@
     "defaultMessage": "!!!Completed orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 303,
+      "line": 306,
       "column": 19,
-      "index": 14039
+      "index": 14256
     },
     "end": {
-      "line": 306,
+      "line": 309,
       "column": 3,
-      "index": 14130
+      "index": 14347
     }
   },
   {
@@ -619,14 +619,14 @@
     "defaultMessage": "!!!TVL",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 307,
+      "line": 310,
       "column": 7,
-      "index": 14139
+      "index": 14356
     },
     "end": {
-      "line": 310,
+      "line": 313,
       "column": 3,
-      "index": 14205
+      "index": 14422
     }
   },
   {
@@ -634,14 +634,14 @@
     "defaultMessage": "!!! Dex Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 311,
+      "line": 314,
       "column": 11,
-      "index": 14218
+      "index": 14435
     },
     "end": {
-      "line": 314,
+      "line": 317,
       "column": 3,
-      "index": 14293
+      "index": 14510
     }
   },
   {
@@ -649,14 +649,14 @@
     "defaultMessage": "!!! Batcher Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 315,
+      "line": 318,
       "column": 14,
-      "index": 14309
+      "index": 14526
     },
     "end": {
-      "line": 318,
+      "line": 321,
       "column": 3,
-      "index": 14391
+      "index": 14608
     }
   },
   {
@@ -664,14 +664,14 @@
     "defaultMessage": "!!!Limit price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 319,
+      "line": 322,
       "column": 26,
-      "index": 14419
+      "index": 14636
     },
     "end": {
-      "line": 322,
+      "line": 325,
       "column": 3,
-      "index": 14512
+      "index": 14729
     }
   },
   {
@@ -679,14 +679,14 @@
     "defaultMessage": "!!!Are you sure you want to proceed this order with the limit price that is 10% or more higher than the\nmarket price?",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 323,
+      "line": 326,
       "column": 32,
-      "index": 14546
+      "index": 14763
     },
     "end": {
-      "line": 328,
+      "line": 331,
       "column": 3,
-      "index": 14766
+      "index": 14983
     }
   },
   {
@@ -694,14 +694,14 @@
     "defaultMessage": "!!!Your limit price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 329,
+      "line": 332,
       "column": 30,
-      "index": 14798
+      "index": 15015
     },
     "end": {
-      "line": 332,
+      "line": 335,
       "column": 3,
-      "index": 14900
+      "index": 15117
     }
   },
   {
@@ -709,14 +709,14 @@
     "defaultMessage": "!!!Market price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 333,
+      "line": 336,
       "column": 32,
-      "index": 14934
+      "index": 15151
     },
     "end": {
-      "line": 336,
+      "line": 339,
       "column": 3,
-      "index": 15034
+      "index": 15251
     }
   },
   {
@@ -724,14 +724,14 @@
     "defaultMessage": "!!!Back",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 337,
+      "line": 340,
       "column": 25,
-      "index": 15061
+      "index": 15278
     },
     "end": {
-      "line": 340,
+      "line": 343,
       "column": 3,
-      "index": 15146
+      "index": 15363
     }
   },
   {
@@ -739,14 +739,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 341,
+      "line": 344,
       "column": 28,
-      "index": 15176
+      "index": 15393
     },
     "end": {
-      "line": 344,
+      "line": 347,
       "column": 3,
-      "index": 15264
+      "index": 15481
     }
   },
   {
@@ -754,14 +754,14 @@
     "defaultMessage": "!!!Transaction submitted",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 345,
+      "line": 348,
       "column": 21,
-      "index": 15287
+      "index": 15504
     },
     "end": {
-      "line": 348,
+      "line": 351,
       "column": 3,
-      "index": 15385
+      "index": 15602
     }
   },
   {
@@ -769,14 +769,14 @@
     "defaultMessage": "!!!Your transactions will be displayed both in the list of transaction and Open swap orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 349,
+      "line": 352,
       "column": 22,
-      "index": 15409
+      "index": 15626
     },
     "end": {
-      "line": 352,
+      "line": 355,
       "column": 3,
-      "index": 15575
+      "index": 15792
     }
   },
   {
@@ -784,14 +784,14 @@
     "defaultMessage": "!!! dex",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 353,
+      "line": 356,
       "column": 7,
-      "index": 15584
+      "index": 15801
     },
     "end": {
-      "line": 356,
+      "line": 359,
       "column": 3,
-      "index": 15651
+      "index": 15868
     }
   },
   {
@@ -799,14 +799,14 @@
     "defaultMessage": "!!!see on explorer",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 357,
+      "line": 360,
       "column": 17,
-      "index": 15670
+      "index": 15887
     },
     "end": {
-      "line": 360,
+      "line": 363,
       "column": 3,
-      "index": 15758
+      "index": 15975
     }
   },
   {
@@ -814,14 +814,14 @@
     "defaultMessage": "!!!GO to Orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 361,
+      "line": 364,
       "column": 14,
-      "index": 15774
+      "index": 15991
     },
     "end": {
-      "line": 364,
+      "line": 367,
       "column": 3,
-      "index": 15856
+      "index": 16073
     }
   },
   {
@@ -829,14 +829,14 @@
     "defaultMessage": "!!!Asset",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 365,
+      "line": 368,
       "column": 9,
-      "index": 15867
+      "index": 16084
     },
     "end": {
-      "line": 368,
+      "line": 371,
       "column": 3,
-      "index": 15940
+      "index": 16157
     }
   },
   {
@@ -844,14 +844,14 @@
     "defaultMessage": "!!!Clear",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 369,
+      "line": 372,
       "column": 9,
-      "index": 15951
+      "index": 16168
     },
     "end": {
-      "line": 372,
+      "line": 375,
       "column": 3,
-      "index": 16012
+      "index": 16229
     }
   },
   {
@@ -859,14 +859,14 @@
     "defaultMessage": "!!!Sign transaction",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 373,
+      "line": 376,
       "column": 19,
-      "index": 16033
+      "index": 16250
     },
     "end": {
-      "line": 376,
+      "line": 379,
       "column": 3,
-      "index": 16115
+      "index": 16332
     }
   },
   {
@@ -874,14 +874,14 @@
     "defaultMessage": "!!!Spending Password",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 377,
+      "line": 380,
       "column": 20,
-      "index": 16137
+      "index": 16354
     },
     "end": {
-      "line": 380,
+      "line": 383,
       "column": 3,
-      "index": 16221
+      "index": 16438
     }
   },
   {
@@ -889,14 +889,14 @@
     "defaultMessage": "!!!Enter spending password to sign this transaction",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 381,
+      "line": 384,
       "column": 25,
-      "index": 16248
+      "index": 16465
     },
     "end": {
-      "line": 384,
+      "line": 387,
       "column": 3,
-      "index": 16368
+      "index": 16585
     }
   },
   {
@@ -904,14 +904,14 @@
     "defaultMessage": "!!!Sign",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 385,
+      "line": 388,
       "column": 8,
-      "index": 16378
+      "index": 16595
     },
     "end": {
-      "line": 388,
+      "line": 391,
       "column": 3,
-      "index": 16437
+      "index": 16654
     }
   },
   {
@@ -919,14 +919,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 389,
+      "line": 392,
       "column": 14,
-      "index": 16453
+      "index": 16670
     },
     "end": {
-      "line": 392,
+      "line": 395,
       "column": 3,
-      "index": 16512
+      "index": 16729
     }
   },
   {
@@ -934,14 +934,14 @@
     "defaultMessage": "!!!completed orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 393,
+      "line": 396,
       "column": 23,
-      "index": 16537
+      "index": 16754
     },
     "end": {
-      "line": 396,
+      "line": 399,
       "column": 3,
-      "index": 16622
+      "index": 16839
     }
   },
   {
@@ -949,14 +949,14 @@
     "defaultMessage": "!!!open orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 397,
+      "line": 400,
       "column": 18,
-      "index": 16642
+      "index": 16859
     },
     "end": {
-      "line": 400,
+      "line": 403,
       "column": 3,
-      "index": 16717
+      "index": 16934
     }
   },
   {
@@ -964,14 +964,14 @@
     "defaultMessage": "!!!Confirm order cancellation",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 401,
+      "line": 404,
       "column": 24,
-      "index": 16743
+      "index": 16960
     },
     "end": {
-      "line": 404,
+      "line": 407,
       "column": 3,
-      "index": 16840
+      "index": 17057
     }
   },
   {
@@ -979,14 +979,14 @@
     "defaultMessage": "!!!Cancel order",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 405,
+      "line": 408,
       "column": 29,
-      "index": 16871
+      "index": 17088
     },
     "end": {
-      "line": 408,
+      "line": 411,
       "column": 3,
-      "index": 16958
+      "index": 17175
     }
   },
   {
@@ -994,14 +994,14 @@
     "defaultMessage": "!!!Are you sure you want to cancel this order?",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 409,
+      "line": 412,
       "column": 31,
-      "index": 16991
+      "index": 17208
     },
     "end": {
-      "line": 412,
+      "line": 415,
       "column": 3,
-      "index": 17112
+      "index": 17329
     }
   },
   {
@@ -1009,14 +1009,14 @@
     "defaultMessage": "!!!Learn more about swap orders in Yoroi",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 413,
+      "line": 416,
       "column": 23,
-      "index": 17137
+      "index": 17354
     },
     "end": {
-      "line": 416,
+      "line": 419,
       "column": 3,
-      "index": 17244
+      "index": 17461
     }
   },
   {
@@ -1024,14 +1024,14 @@
     "defaultMessage": "!!!Asset price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 417,
+      "line": 420,
       "column": 29,
-      "index": 17275
+      "index": 17492
     },
     "end": {
-      "line": 420,
+      "line": 423,
       "column": 3,
-      "index": 17362
+      "index": 17579
     }
   },
   {
@@ -1039,14 +1039,14 @@
     "defaultMessage": "!!!Asset amount",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 421,
+      "line": 424,
       "column": 30,
-      "index": 17394
+      "index": 17611
     },
     "end": {
-      "line": 424,
+      "line": 427,
       "column": 3,
-      "index": 17483
+      "index": 17700
     }
   },
   {
@@ -1054,14 +1054,14 @@
     "defaultMessage": "!!!Total returned",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 425,
+      "line": 428,
       "column": 32,
-      "index": 17517
+      "index": 17734
     },
     "end": {
-      "line": 428,
+      "line": 431,
       "column": 3,
-      "index": 17610
+      "index": 17827
     }
   },
   {
@@ -1069,14 +1069,14 @@
     "defaultMessage": "!!!Cancellation Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 429,
+      "line": 432,
       "column": 34,
-      "index": 17646
+      "index": 17863
     },
     "end": {
-      "line": 432,
+      "line": 435,
       "column": 3,
-      "index": 17743
+      "index": 17960
     }
   },
   {
@@ -1084,14 +1084,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 433,
+      "line": 436,
       "column": 26,
-      "index": 17771
+      "index": 17988
     },
     "end": {
-      "line": 436,
+      "line": 439,
       "column": 3,
-      "index": 17851
+      "index": 18068
     }
   },
   {
@@ -1099,14 +1099,14 @@
     "defaultMessage": "!!!Back",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 437,
+      "line": 440,
       "column": 23,
-      "index": 17876
+      "index": 18093
     },
     "end": {
-      "line": 440,
+      "line": 443,
       "column": 3,
-      "index": 17950
+      "index": 18167
     }
   },
   {
@@ -1114,14 +1114,14 @@
     "defaultMessage": "!!!Total",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 441,
+      "line": 444,
       "column": 19,
-      "index": 17971
+      "index": 18188
     },
     "end": {
-      "line": 444,
+      "line": 447,
       "column": 3,
-      "index": 18041
+      "index": 18258
     }
   },
   {
@@ -1129,14 +1129,14 @@
     "defaultMessage": "!!!Liquidity Pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 445,
+      "line": 448,
       "column": 27,
-      "index": 18070
+      "index": 18287
     },
     "end": {
-      "line": 448,
+      "line": 451,
       "column": 3,
-      "index": 18157
+      "index": 18374
     }
   },
   {
@@ -1144,14 +1144,14 @@
     "defaultMessage": "!!!Time Created",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 449,
+      "line": 452,
       "column": 25,
-      "index": 18184
+      "index": 18401
     },
     "end": {
-      "line": 452,
+      "line": 455,
       "column": 3,
-      "index": 18267
+      "index": 18484
     }
   },
   {
@@ -1159,14 +1159,14 @@
     "defaultMessage": "!!!Time Completed",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 453,
+      "line": 456,
       "column": 27,
-      "index": 18296
+      "index": 18513
     },
     "end": {
-      "line": 456,
+      "line": 459,
       "column": 3,
-      "index": 18383
+      "index": 18600
     }
   },
   {
@@ -1174,14 +1174,14 @@
     "defaultMessage": "!!!Transaction ID",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 457,
+      "line": 460,
       "column": 18,
-      "index": 18403
+      "index": 18620
     },
     "end": {
-      "line": 460,
+      "line": 463,
       "column": 3,
-      "index": 18481
+      "index": 18698
     }
   },
   {
@@ -1189,14 +1189,14 @@
     "defaultMessage": "!!!Choose Connection Method",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 461,
+      "line": 464,
       "column": 26,
-      "index": 18509
+      "index": 18726
     },
     "end": {
-      "line": 464,
+      "line": 467,
       "column": 3,
-      "index": 18627
+      "index": 18844
     }
   },
   {
@@ -1204,14 +1204,14 @@
     "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X or S using an on-the-go USB cable adaptor:",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 465,
+      "line": 468,
       "column": 18,
-      "index": 18647
+      "index": 18864
     },
     "end": {
-      "line": 470,
+      "line": 473,
       "column": 3,
-      "index": 18876
+      "index": 19093
     }
   },
   {
@@ -1219,14 +1219,14 @@
     "defaultMessage": "!!!Connect with USB",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 471,
+      "line": 474,
       "column": 13,
-      "index": 18891
+      "index": 19108
     },
     "end": {
-      "line": 474,
+      "line": 477,
       "column": 3,
-      "index": 19005
+      "index": 19222
     }
   },
   {
@@ -1234,14 +1234,14 @@
     "defaultMessage": "!!! USB connection is blocked by iOS devices",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 475,
+      "line": 478,
       "column": 26,
-      "index": 19033
+      "index": 19250
     },
     "end": {
-      "line": 478,
+      "line": 481,
       "column": 3,
-      "index": 19185
+      "index": 19402
     }
   },
   {
@@ -1249,14 +1249,14 @@
     "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X through Bluetooth:",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 479,
+      "line": 482,
       "column": 24,
-      "index": 19211
+      "index": 19428
     },
     "end": {
-      "line": 482,
+      "line": 485,
       "column": 3,
-      "index": 19405
+      "index": 19622
     }
   },
   {
@@ -1264,14 +1264,14 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 483,
+      "line": 486,
       "column": 19,
-      "index": 19426
+      "index": 19643
     },
     "end": {
-      "line": 486,
+      "line": 489,
       "column": 3,
-      "index": 19552
+      "index": 19769
     }
   },
   {
@@ -1279,14 +1279,14 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 487,
+      "line": 490,
       "column": 18,
-      "index": 19572
+      "index": 19789
     },
     "end": {
-      "line": 490,
+      "line": 493,
       "column": 3,
-      "index": 19682
+      "index": 19899
     }
   },
   {
@@ -1294,14 +1294,14 @@
     "defaultMessage": "!!!You have",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 493,
+      "line": 496,
       "column": 11,
-      "index": 19741
+      "index": 19958
     },
     "end": {
-      "line": 496,
+      "line": 499,
       "column": 3,
-      "index": 19836
+      "index": 20053
     }
   },
   {
@@ -1309,14 +1309,14 @@
     "defaultMessage": "!!!No assets found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 497,
+      "line": 500,
       "column": 12,
-      "index": 19850
+      "index": 20067
     },
     "end": {
-      "line": 500,
+      "line": 503,
       "column": 3,
-      "index": 19953
+      "index": 20170
     }
   },
   {
@@ -1324,14 +1324,14 @@
     "defaultMessage": "!!!found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 501,
+      "line": 504,
       "column": 9,
-      "index": 19964
+      "index": 20181
     },
     "end": {
-      "line": 504,
+      "line": 507,
       "column": 3,
-      "index": 20054
+      "index": 20271
     }
   },
   {
@@ -1339,14 +1339,14 @@
     "defaultMessage": "!!!Search tokens",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 505,
+      "line": 508,
       "column": 16,
-      "index": 20072
+      "index": 20289
     },
     "end": {
-      "line": 508,
+      "line": 511,
       "column": 3,
-      "index": 20168
+      "index": 20385
     }
   },
   {
@@ -1354,14 +1354,14 @@
     "defaultMessage": "!!!Select asset",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 509,
+      "line": 512,
       "column": 20,
-      "index": 20190
+      "index": 20407
     },
     "end": {
-      "line": 512,
+      "line": 515,
       "column": 3,
-      "index": 20279
+      "index": 20496
     }
   },
   {
@@ -1369,14 +1369,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 513,
+      "line": 516,
       "column": 11,
-      "index": 20292
+      "index": 20509
     },
     "end": {
-      "line": 516,
+      "line": 519,
       "column": 3,
-      "index": 20386
+      "index": 20603
     }
   },
   {
@@ -1384,14 +1384,14 @@
     "defaultMessage": "!!!Assign collateral",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 517,
+      "line": 520,
       "column": 20,
-      "index": 20408
+      "index": 20625
     },
     "end": {
-      "line": 520,
+      "line": 523,
       "column": 3,
-      "index": 20515
+      "index": 20732
     }
   },
   {
@@ -1399,14 +1399,14 @@
     "defaultMessage": "!!!Collateral not found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 521,
+      "line": 524,
       "column": 22,
-      "index": 20539
+      "index": 20756
     },
     "end": {
-      "line": 524,
+      "line": 527,
       "column": 3,
-      "index": 20651
+      "index": 20868
     }
   },
   {
@@ -1414,14 +1414,14 @@
     "defaultMessage": "!!!You don't have an active collateral utxo",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 525,
+      "line": 528,
       "column": 22,
-      "index": 20675
+      "index": 20892
     },
     "end": {
-      "line": 528,
+      "line": 531,
       "column": 3,
-      "index": 20807
+      "index": 21024
     }
   },
   {
@@ -1429,14 +1429,14 @@
     "defaultMessage": "!!!Transaction failed",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 529,
+      "line": 532,
       "column": 17,
-      "index": 20826
+      "index": 21043
     },
     "end": {
-      "line": 532,
+      "line": 535,
       "column": 3,
-      "index": 20928
+      "index": 21145
     }
   },
   {
@@ -1444,14 +1444,14 @@
     "defaultMessage": "!!!Your transaction has not been processed properly due to technical issues",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 533,
+      "line": 536,
       "column": 16,
-      "index": 20946
+      "index": 21163
     },
     "end": {
-      "line": 536,
+      "line": 539,
       "column": 3,
-      "index": 21101
+      "index": 21318
     }
   },
   {
@@ -1459,14 +1459,14 @@
     "defaultMessage": "!!!Try again",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 537,
+      "line": 540,
       "column": 18,
-      "index": 21121
+      "index": 21338
     },
     "end": {
-      "line": 540,
+      "line": 543,
       "column": 3,
-      "index": 21215
+      "index": 21432
     }
   },
   {
@@ -1474,14 +1474,14 @@
     "defaultMessage": "!!!Not enough balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 541,
+      "line": 544,
       "column": 20,
-      "index": 21237
+      "index": 21454
     },
     "end": {
-      "line": 544,
+      "line": 547,
       "column": 3,
-      "index": 21331
+      "index": 21548
     }
   },
   {
@@ -1489,14 +1489,14 @@
     "defaultMessage": "!!!Not enough supply in the pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 545,
+      "line": 548,
       "column": 19,
-      "index": 21352
+      "index": 21569
     },
     "end": {
-      "line": 548,
+      "line": 551,
       "column": 3,
-      "index": 21456
+      "index": 21673
     }
   },
   {
@@ -1504,14 +1504,14 @@
     "defaultMessage": "!!!Not enough balance, please consider the fees",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 549,
+      "line": 552,
       "column": 23,
-      "index": 21481
+      "index": 21698
     },
     "end": {
-      "line": 552,
+      "line": 555,
       "column": 3,
-      "index": 21604
+      "index": 21821
     }
   },
   {
@@ -1519,14 +1519,14 @@
     "defaultMessage": "!!! This pair is not available in any liquidity pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 553,
+      "line": 556,
       "column": 10,
-      "index": 21616
+      "index": 21833
     },
     "end": {
-      "line": 556,
+      "line": 559,
       "column": 3,
-      "index": 21731
+      "index": 21948
     }
   },
   {
@@ -1534,14 +1534,14 @@
     "defaultMessage": "!!!Continue on Ledger",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 557,
+      "line": 560,
       "column": 20,
-      "index": 21753
+      "index": 21970
     },
     "end": {
-      "line": 560,
+      "line": 563,
       "column": 3,
-      "index": 21853
+      "index": 22070
     }
   },
   {
@@ -1549,14 +1549,14 @@
     "defaultMessage": "!!!Slippage Warning",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 561,
+      "line": 564,
       "column": 24,
-      "index": 21879
+      "index": 22096
     },
     "end": {
-      "line": 564,
+      "line": 567,
       "column": 3,
-      "index": 21973
+      "index": 22190
     }
   },
   {
@@ -1564,14 +1564,14 @@
     "defaultMessage": "!!!Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 565,
+      "line": 568,
       "column": 23,
-      "index": 21998
+      "index": 22215
     },
     "end": {
-      "line": 569,
+      "line": 572,
       "column": 3,
-      "index": 22201
+      "index": 22418
     }
   },
   {
@@ -1579,14 +1579,59 @@
     "defaultMessage": "!!!Your slippage tolerance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 570,
+      "line": 573,
       "column": 31,
-      "index": 22234
+      "index": 22451
     },
     "end": {
-      "line": 573,
+      "line": 576,
+      "column": 3,
+      "index": 22544
+    }
+  },
+  {
+    "id": "swap.listOrders.emptyOpenOrders",
+    "defaultMessage": "!!!No orders avaliable yet",
+    "file": "src/features/Swap/common/strings.ts",
+    "start": {
+      "line": 577,
+      "column": 19,
+      "index": 22565
+    },
+    "end": {
+      "line": 580,
+      "column": 3,
+      "index": 22663
+    }
+  },
+  {
+    "id": "swap.listOrders.emptyOpenOrdersSub",
+    "defaultMessage": "!!!Start doing the swap operations to your open orders here",
+    "file": "src/features/Swap/common/strings.ts",
+    "start": {
+      "line": 581,
+      "column": 22,
+      "index": 22687
+    },
+    "end": {
+      "line": 584,
+      "column": 3,
+      "index": 22821
+    }
+  },
+  {
+    "id": "swap.listOrders.emptyCompletedOrders",
+    "defaultMessage": "!!!No orders completed yet",
+    "file": "src/features/Swap/common/strings.ts",
+    "start": {
+      "line": 585,
+      "column": 24,
+      "index": 22847
+    },
+    "end": {
+      "line": 588,
       "column": 3,
-      "index": 22327
+      "index": 22950
     }
   }
 ]
\ No newline at end of file

From 125fddc45050b20dabdae0d625dc6ff88cbfc330 Mon Sep 17 00:00:00 2001
From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Date: Wed, 8 Nov 2023 06:58:48 -0500
Subject: [PATCH 33/40] fix: token selection (#2884)

---
 .../SelectBuyTokenFromListScreen.tsx                         | 5 +++--
 .../SelectSellTokenFromListScreen.tsx                        | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
index 901a8ea6d4..f4d8b65c13 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
@@ -137,6 +137,7 @@ const SelectableToken = ({wallet, tokenInfo, walletTokenIds}: SelectableTokenPro
   const {buyTokenInfoChanged, orderData} = useSwap()
   const {
     sellQuantity: {isTouched: isSellTouched},
+    buyQuantity: {isTouched: isBuyTouched},
     buyTouched,
   } = useSwapForm()
   const navigateTo = useNavigateTo()
@@ -144,13 +145,13 @@ const SelectableToken = ({wallet, tokenInfo, walletTokenIds}: SelectableTokenPro
 
   const isDisabled = id === orderData.amounts.sell.tokenId && isSellTouched
   const inUserWallet = walletTokenIds.includes(tokenInfo.id)
-  const isSameToken = id === orderData.amounts.buy.tokenId
+  const shouldUpdateToken = id !== orderData.amounts.buy.tokenId || !isBuyTouched
 
   const handleOnTokenSelection = () => {
     track.swapAssetToChanged({
       to_asset: [{asset_name: name, asset_ticker: ticker, policy_id: group}],
     })
-    if (!isSameToken) {
+    if (shouldUpdateToken) {
       buyTokenInfoChanged({
         decimals: decimals ?? 0,
         id: id,
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSellAmount/SelectSellTokenFromListScreen/SelectSellTokenFromListScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSellAmount/SelectSellTokenFromListScreen/SelectSellTokenFromListScreen.tsx
index e0d14aa49a..482bce4ad6 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSellAmount/SelectSellTokenFromListScreen/SelectSellTokenFromListScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditSellAmount/SelectSellTokenFromListScreen/SelectSellTokenFromListScreen.tsx
@@ -91,6 +91,7 @@ const SelectableToken = ({tokenInfo, wallet}: SelectableTokenProps) => {
   const {sellTokenInfoChanged, orderData} = useSwap()
   const {
     buyQuantity: {isTouched: isBuyTouched},
+    sellQuantity: {isTouched: isSellTouched},
     sellTouched,
   } = useSwapForm()
   const navigateTo = useNavigateTo()
@@ -98,13 +99,13 @@ const SelectableToken = ({tokenInfo, wallet}: SelectableTokenProps) => {
 
   const balanceAvailable = useBalance({wallet, tokenId: tokenInfo.id})
   const isDisabled = tokenInfo.id === orderData.amounts.buy.tokenId && isBuyTouched
-  const isSameToken = tokenInfo.id === orderData.amounts.sell.tokenId
+  const shouldUpdateToken = tokenInfo.id !== orderData.amounts.sell.tokenId || !isSellTouched
 
   const handleOnTokenSelection = () => {
     track.swapAssetFromChanged({
       from_asset: [{asset_name: tokenInfo.name, asset_ticker: tokenInfo.ticker, policy_id: tokenInfo.group}],
     })
-    if (!isSameToken) {
+    if (shouldUpdateToken) {
       sellTouched()
       sellTokenInfoChanged({
         id: tokenInfo.id,

From bbac9df66b4385116736e61bd996e3842ed6ff62 Mon Sep 17 00:00:00 2001
From: Sorin Chis <kish.sorin@yahoo.com>
Date: Wed, 8 Nov 2023 15:07:19 +0200
Subject: [PATCH 34/40] chore: Swap/list error state (#2883)

Signed-off-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Signed-off-by: Sorin Chis <kish.sorin@yahoo.com>
Co-authored-by: Michal <miso.szorad@gmail.com>
Co-authored-by: banklesss <105349292+banklesss@users.noreply.github.com>
Co-authored-by: jorbuedo <jorbuedo@users.noreply.github.com>
Co-authored-by: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com>
Co-authored-by: Ruslan Dudin <vantuz-subhuman@yandex.ru>
---
 .../.storybook/storybook.requires.js          |   1 +
 .../ConectionErrorImage.tsx                   |  76 ++
 .../ServiceUnavailable.stories.tsx            |  11 +
 .../ServiceUnavailable/ServiceUnavailable.tsx |  62 ++
 .../src/features/Swap/common/strings.ts       |  20 +-
 .../ShowSubmittedTxScreen.tsx                 |   2 +-
 .../SelectBuyTokenFromListScreen.tsx          |  18 +-
 .../wallet-mobile/src/i18n/locales/en-US.json |   2 +
 .../src/features/Swap/common/strings.json     | 924 +++++++++---------
 9 files changed, 657 insertions(+), 459 deletions(-)
 create mode 100644 apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ConectionErrorImage.tsx
 create mode 100644 apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.stories.tsx
 create mode 100644 apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.tsx

diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index 9b76879e74..87759f52f5 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -139,6 +139,7 @@ const getStories = () => {
     "./src/features/Swap/common/LiquidityPool/LiquidityPool.stories.tsx": require("../src/features/Swap/common/LiquidityPool/LiquidityPool.stories.tsx"),
     "./src/features/Swap/common/ModalError/ModalError.stories.tsx": require("../src/features/Swap/common/ModalError/ModalError.stories.tsx"),
     "./src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.stories.tsx": require("../src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.stories.tsx"),
+    "./src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.stories.tsx": require("../src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.stories.tsx"),
     "./src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.stories.tsx": require("../src/features/Swap/useCases/ConfirmTxScreen/ConfirmTxScreen.stories.tsx"),
     "./src/features/Swap/useCases/ConfirmTxScreen/ShowFailedTxScreen/ShowFailedTxScreen.stories.tsx": require("../src/features/Swap/useCases/ConfirmTxScreen/ShowFailedTxScreen/ShowFailedTxScreen.stories.tsx"),
     "./src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.stories.tsx": require("../src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.stories.tsx"),
diff --git a/apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ConectionErrorImage.tsx b/apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ConectionErrorImage.tsx
new file mode 100644
index 0000000000..7fd59ff301
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ConectionErrorImage.tsx
@@ -0,0 +1,76 @@
+import * as React from 'react'
+import Svg, {Defs, G, LinearGradient, Path, Stop} from 'react-native-svg'
+
+export const ConectionErrorImage = () => {
+  return (
+    <Svg width="254" height="191" viewBox="0 0 254 191" fill="none">
+      <G opacity="0.2">
+        <Path d="M86.7314 189.069L253.622 94.186" stroke="#1D45BA" strokeWidth="0.5" />
+
+        <Path d="M23.312 141.794L178.995 53.2837" stroke="#1D45BA" strokeWidth="0.5" />
+
+        <Path d="M77.0493 41.9404L252.857 141.765" stroke="#1D45BA" strokeWidth="0.5" />
+
+        <Path d="M0.856934 106.958L148.229 190.638" stroke="#1D45BA" strokeWidth="0.5" />
+      </G>
+
+      <Path
+        d="M118.653 101.702C116.286 86.0998 118.653 82.5078 118.653 82.5078L134.183 103.347C134.183 103.347 130.029 110.015 131.062 113.766C131.501 115.515 132.141 117.206 132.97 118.806C133.327 119.439 133.153 120.24 132.565 120.665C132.461 120.746 132.347 120.812 132.226 120.863L126.71 124.153L120.041 112.483L118.576 105.902L120.112 107.12C119.427 105.374 118.937 103.557 118.653 101.702Z"
+        fill="url(#paint0_linear_9851_93826)"
+      />
+
+      <Path
+        d="M72.8307 4.15829L78.1277 1.12017C78.879 0.750229 79.6621 0.449212 80.4674 0.220797C81.8942 -0.239857 83.6107 0.00692154 85.4529 1.08727L150.669 39.1516C155.588 42.0197 159.546 49.6808 159.524 56.2616L159.344 109.237C159.344 113.185 157.879 115.818 155.67 116.711L149.608 119.892L144.847 112.714L85.196 77.8959C80.2761 75.0277 76.3183 67.3666 76.3402 60.7859L76.5151 9.71356L72.8307 4.15829Z"
+        fill="url(#paint1_linear_9851_93826)"
+      />
+
+      <Path
+        d="M69.9058 11.255C69.9058 4.67421 73.9292 1.65803 78.8381 4.52615L144.054 42.5959C148.974 45.4641 152.931 53.1252 152.91 59.7059L152.729 112.676C152.729 119.256 148.706 122.273 143.797 119.405L123.653 107.647C123.108 110.969 123.498 114.378 124.779 117.491C125.593 119.317 126.419 120.918 127.162 122.256C127.478 122.842 127.36 123.567 126.876 124.021C126.392 124.476 125.663 124.546 125.101 124.192C120.4 121.121 113.851 115.193 112.37 105.442C112.107 103.715 111.905 102.152 111.752 100.699L78.5812 81.3348C73.6613 78.4666 69.7036 70.8055 69.7254 64.2247L69.9058 11.255Z"
+        fill="#E1F2FF"
+      />
+
+      <Path
+        d="M91.4675 63.5834C89.8648 62.6581 88.5138 61.5768 87.4143 60.3395C86.3148 59.0807 85.4762 57.7896 84.8985 56.4662C84.3394 55.1536 84.0413 53.927 84.004 52.7866C83.9854 52.5821 84.0319 52.4584 84.1438 52.4154C84.2742 52.3616 84.4233 52.3831 84.591 52.4799L87.1906 53.9808C87.3956 54.0992 87.5634 54.2498 87.6938 54.4327C87.8429 54.6049 87.9547 54.8308 88.0292 55.1105C88.2156 55.8637 88.4765 56.5415 88.8119 57.144C89.166 57.7573 89.5667 58.2899 90.0139 58.7418C90.4798 59.2044 90.9643 59.581 91.4675 59.8715C92.1383 60.2588 92.744 60.4578 93.2844 60.4686C93.8435 60.4686 94.2907 60.2534 94.6262 59.823C94.9616 59.3927 95.1293 58.7256 95.1293 57.8218C95.1293 57.0257 94.9709 56.2456 94.6541 55.4817C94.3373 54.7178 93.8994 54.0131 93.3403 53.3676C92.7999 52.7113 92.1756 52.1787 91.4675 51.7698C90.9457 51.4686 90.5171 51.2964 90.1816 51.2534C89.8462 51.2104 89.5573 51.2157 89.3151 51.2695C89.0915 51.3341 88.8865 51.3879 88.7001 51.4309C88.5324 51.4847 88.3367 51.4471 88.1131 51.3179L85.5414 49.8332C85.3737 49.7364 85.2246 49.5857 85.0942 49.3813C84.9824 49.1661 84.9264 48.9617 84.9264 48.768L85.9048 38.294C85.9234 38.025 86.0073 37.8583 86.1564 37.7937C86.3055 37.7291 86.4825 37.756 86.6875 37.8744L97.1978 43.9426C97.3842 44.0501 97.5426 44.2169 97.673 44.4429C97.8035 44.6688 97.8687 44.8894 97.8687 45.1045L97.8687 47.2671C97.8687 47.4823 97.8035 47.6276 97.673 47.7029C97.5426 47.7782 97.3842 47.762 97.1978 47.6545L89.1194 42.9904L88.6722 47.9934C89.0076 47.9288 89.4548 47.9396 90.0139 48.0256C90.573 48.1117 91.3463 48.4399 92.334 49.0101C93.2285 49.5265 94.0764 50.1882 94.8777 50.9952C95.6977 51.7913 96.4245 52.6951 97.0581 53.7065C97.6917 54.6963 98.1855 55.7453 98.5396 56.8535C98.9123 57.951 99.0987 59.0699 99.0987 60.2104C99.0987 61.7812 98.7819 62.9647 98.1482 63.7609C97.5146 64.5571 96.6295 64.9498 95.4927 64.939C94.3559 64.9283 93.0142 64.4764 91.4675 63.5834Z"
+        fill="#FF1351"
+      />
+
+      <Path
+        d="M109.417 73.914C108.093 73.1501 106.966 72.2733 106.034 71.2834C105.103 70.2936 104.338 69.2284 103.742 68.088C103.146 66.9475 102.699 65.7747 102.4 64.5697C102.102 63.3432 101.925 62.122 101.869 60.9062C101.851 60.3145 101.832 59.6689 101.813 58.9696C101.813 58.2595 101.813 57.5494 101.813 56.8393C101.832 56.1399 101.851 55.4944 101.869 54.9026C101.907 53.7406 102.084 52.7347 102.4 51.8847C102.717 51.0132 103.174 50.3623 103.77 49.9319C104.385 49.5123 105.158 49.3455 106.09 49.4316C107.022 49.5177 108.131 49.9319 109.417 50.6743C110.721 51.4274 111.839 52.2989 112.771 53.2888C113.703 54.2786 114.467 55.333 115.063 56.4519C115.678 57.5817 116.135 58.7598 116.433 59.9863C116.75 61.2021 116.927 62.4125 116.964 63.6175C117.001 64.2416 117.02 64.9086 117.02 65.6187C117.02 66.3288 117.02 67.0389 117.02 67.749C117.02 68.4376 117.001 69.0617 116.964 69.6211C116.927 70.7831 116.759 71.8052 116.461 72.6875C116.163 73.5482 115.715 74.2045 115.119 74.6564C114.523 75.1083 113.749 75.2858 112.799 75.189C111.867 75.1029 110.74 74.6779 109.417 73.914ZM109.417 70.2021C110.628 70.9015 111.513 70.9607 112.072 70.3797C112.65 69.7879 112.948 68.712 112.967 67.1519C113.004 66.5494 113.023 65.9361 113.023 65.3121C113.023 64.6666 113.023 64.021 113.023 63.3755C113.023 62.7299 113.004 62.1059 112.967 61.5034C112.948 59.9648 112.65 58.5661 112.072 57.3073C111.513 56.0377 110.628 55.0533 109.417 54.3539C108.224 53.6653 107.339 53.6277 106.761 54.2409C106.202 54.8435 105.904 55.8979 105.867 57.4041C105.867 57.9851 105.857 58.593 105.839 59.2278C105.839 59.8734 105.839 60.5189 105.839 61.1645C105.857 61.7992 105.867 62.4287 105.867 63.0527C105.904 64.645 106.211 66.0706 106.789 67.3294C107.367 68.5667 108.243 69.5243 109.417 70.2021Z"
+        fill="#FF1351"
+      />
+
+      <Path
+        d="M127.313 84.2465C126.008 83.4933 124.881 82.6595 123.931 81.745C122.98 80.8304 122.188 79.8998 121.555 78.953C120.94 77.9954 120.474 77.0809 120.157 76.2094C119.84 75.3164 119.672 74.5202 119.654 73.8209C119.654 73.6272 119.71 73.5088 119.821 73.4658C119.952 73.412 120.101 73.4335 120.269 73.5304L122.785 74.9828C122.971 75.0904 123.129 75.2249 123.26 75.3863C123.39 75.5477 123.502 75.7844 123.595 76.0964C123.763 76.7742 124.033 77.3929 124.406 77.9524C124.797 78.5226 125.244 79.0283 125.748 79.4694C126.251 79.889 126.782 80.2602 127.341 80.583C128.459 81.2285 129.344 81.4383 129.996 81.2124C130.667 80.9757 131.003 80.2871 131.003 79.1466C131.003 78.0062 130.695 77.0109 130.08 76.161C129.465 75.2895 128.608 74.5363 127.509 73.9016L124.629 72.2393C124.424 72.1209 124.257 71.9595 124.126 71.7551C123.996 71.5292 123.931 71.2978 123.931 71.0611L123.931 69.7055C123.931 69.4903 123.968 69.3289 124.042 69.2213C124.136 69.103 124.229 69.0169 124.322 68.9631L129.326 66.2034L121.331 61.5877C121.126 61.4694 120.958 61.2972 120.828 61.0713C120.716 60.8561 120.66 60.6409 120.66 60.4257L120.66 58.2954C120.66 58.0587 120.716 57.8973 120.828 57.8113C120.958 57.7359 121.126 57.7575 121.331 57.8758L133.323 64.7993C133.528 64.9177 133.696 65.0898 133.826 65.3158C133.956 65.5417 134.022 65.773 134.022 66.0097L134.022 67.9464C134.022 68.14 133.984 68.2907 133.91 68.3982C133.835 68.5058 133.751 68.5865 133.658 68.6403L128.822 71.5937L129.158 71.8197C130.295 72.5836 131.301 73.4658 132.177 74.4664C133.071 75.4562 133.761 76.5537 134.245 77.7587C134.748 78.9745 135 80.2817 135 81.6804C135 83.1437 134.665 84.2088 133.994 84.8759C133.341 85.5322 132.438 85.8065 131.282 85.699C130.127 85.5914 128.804 85.1072 127.313 84.2465Z"
+        fill="#FF1351"
+      />
+
+      <Defs>
+        <LinearGradient
+          id="paint0_linear_9851_93826"
+          x1="134.182"
+          y1="124.151"
+          x2="117.601"
+          y2="124.151"
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#3154CA" />
+
+          <Stop offset="1" stopColor="#17D1AA" />
+        </LinearGradient>
+
+        <LinearGradient
+          id="paint1_linear_9851_93826"
+          x1="159.525"
+          y1="119.891"
+          x2="72.831"
+          y2="119.891"
+          gradientUnits="userSpaceOnUse"
+        >
+          <Stop stopColor="#3154CA" />
+
+          <Stop offset="1" stopColor="#17D1AA" />
+        </LinearGradient>
+      </Defs>
+    </Svg>
+  )
+}
diff --git a/apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.stories.tsx b/apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.stories.tsx
new file mode 100644
index 0000000000..9c856c73be
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.stories.tsx
@@ -0,0 +1,11 @@
+import {storiesOf} from '@storybook/react-native'
+import React from 'react'
+import {StyleSheet, View} from 'react-native'
+
+import {ServiceUnavailable} from './ServiceUnavailable'
+
+storiesOf('Service Unavailable', module)
+  .addDecorator((getStory) => <View style={{...StyleSheet.absoluteFillObject}}>{getStory()}</View>)
+  .add('initial', () => {
+    return <ServiceUnavailable />
+  })
diff --git a/apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.tsx b/apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.tsx
new file mode 100644
index 0000000000..8456de788f
--- /dev/null
+++ b/apps/wallet-mobile/src/features/Swap/common/ServiceUnavailable/ServiceUnavailable.tsx
@@ -0,0 +1,62 @@
+import React from 'react'
+import {StyleSheet, Text, View} from 'react-native'
+import {SafeAreaView} from 'react-native-safe-area-context'
+
+import {Button, Spacer} from '../../../../components'
+import {COLORS} from '../../../../theme/config'
+import {useStrings} from '../strings'
+import {ConectionErrorImage} from './ConectionErrorImage'
+
+type ServiceUnavailableProps = {
+  resetErrorBoundary?: () => void
+}
+
+export const ServiceUnavailable = ({resetErrorBoundary}: ServiceUnavailableProps) => {
+  const strings = useStrings()
+
+  return (
+    <SafeAreaView style={{flex: 1}} edges={['left', 'right', 'bottom']}>
+      <View style={styles.container}>
+        <ConectionErrorImage />
+
+        <Spacer height={20} />
+
+        <Text style={styles.title}>{strings.serviceUnavailable}</Text>
+
+        <Text style={styles.text}>{strings.serviceUnavailableInfo}</Text>
+
+        <Spacer height={20} />
+
+        <Button onPress={resetErrorBoundary} title={strings.tryAgain} style={styles.button} shelleyTheme />
+      </View>
+    </SafeAreaView>
+  )
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+    padding: 16,
+  },
+  title: {
+    color: COLORS.BLACK,
+    fontWeight: '600',
+    fontSize: 20,
+    padding: 4,
+    textAlign: 'center',
+    lineHeight: 30,
+  },
+  text: {
+    color: COLORS.TEXT_INPUT,
+    fontSize: 14,
+    fontWeight: '400',
+    lineHeight: 22,
+    textAlign: 'center',
+    maxWidth: 300,
+  },
+  button: {
+    paddingHorizontal: 20,
+  },
+})
diff --git a/apps/wallet-mobile/src/features/Swap/common/strings.ts b/apps/wallet-mobile/src/features/Swap/common/strings.ts
index d3b3b050c0..668c8cdb39 100644
--- a/apps/wallet-mobile/src/features/Swap/common/strings.ts
+++ b/apps/wallet-mobile/src/features/Swap/common/strings.ts
@@ -103,7 +103,7 @@ export const useStrings = () => {
     transactionSigned: intl.formatMessage(messages.transactionSigned),
     transactionDisplay: intl.formatMessage(messages.transactionDisplay),
     seeOnExplorer: intl.formatMessage(messages.seeOnExplorer),
-    goToOrders: intl.formatMessage(messages.goToOrders),
+    goToTransactions: intl.formatMessage(messages.goToTransactions),
     wrongPasswordMessage: intl.formatMessage(messages.wrongPasswordMessage),
     assignCollateral: intl.formatMessage(messages.assignCollateral),
     collateralNotFound: intl.formatMessage(messages.collateralNotFound),
@@ -131,6 +131,8 @@ export const useStrings = () => {
     slippageWarningTitle: intl.formatMessage(messages.slippageWarningTitle),
     slippageWarningText: intl.formatMessage(messages.slippageWarningText),
     slippageWarningYourSlippage: intl.formatMessage(messages.slippageWarningYourSlippage),
+    serviceUnavailable: intl.formatMessage(messages.serviceUnavailable),
+    serviceUnavailableInfo: intl.formatMessage(messages.serviceUnavailableInfo),
     emptyOpenOrders: intl.formatMessage(messages.emptyOpenOrders),
     emptyOpenOrdersSub: intl.formatMessage(messages.emptyOpenOrdersSub),
     emptyCompletedOrders: intl.formatMessage(messages.emptyCompletedOrders),
@@ -361,10 +363,6 @@ export const messages = defineMessages({
     id: 'swap.swapScreen.seeOnExplorer',
     defaultMessage: '!!!see on explorer',
   },
-  goToOrders: {
-    id: 'swap.swapScreen.goToOrders',
-    defaultMessage: '!!!GO to Orders',
-  },
   asset: {
     id: 'global.assets.assetLabel',
     defaultMessage: '!!!Asset',
@@ -491,6 +489,18 @@ export const messages = defineMessages({
     id: 'global.ledgerMessages.bluetoothDisabledError',
     defaultMessage: '!!!Connect with Bluetooth',
   },
+  serviceUnavailable: {
+    id: 'global.error.serviceUnavailable',
+    defaultMessage: '!!!Service unavailable',
+  },
+  serviceUnavailableInfo: {
+    id: 'global.error.serviceUnavailableInfo',
+    defaultMessage: '!!!The server is temporarily busy due to maintenance downtime or capacity problems',
+  },
+  goToTransactions: {
+    id: 'components.send.sendscreen.submittedTxButton',
+    defaultMessage: '!!!GO TO transactions',
+  },
   // TODO check this and change if necessary
 
   youHave: {
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx
index 40ae21b0cb..0c38ddba0f 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx
@@ -53,7 +53,7 @@ export const ShowSubmittedTxScreen = () => {
         <View style={styles.bottomFixed}>
           <Button
             onPress={() => navigate.swapOpenOrders()}
-            title={strings.goToOrders}
+            title={strings.goToTransactions}
             style={styles.button}
             shelleyTheme
           />
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
index f4d8b65c13..10561d64cb 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
@@ -2,6 +2,7 @@ import {FlashList} from '@shopify/flash-list'
 import {useSwap, useSwapTokensOnlyVerified} from '@yoroi/swap'
 import {Balance} from '@yoroi/types'
 import React from 'react'
+import {ErrorBoundary} from 'react-error-boundary'
 import {StyleSheet, TouchableOpacity, View} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
 
@@ -19,17 +20,13 @@ import {Counter} from '../../../../../common/Counter/Counter'
 import {filterBySearch} from '../../../../../common/filterBySearch'
 import {sortTokensByName} from '../../../../../common/helpers'
 import {useNavigateTo} from '../../../../../common/navigation'
+import {ServiceUnavailable} from '../../../../../common/ServiceUnavailable/ServiceUnavailable'
 import {useStrings} from '../../../../../common/strings'
 import {useSwapForm} from '../../../../../common/SwapFormProvider'
 
 export const SelectBuyTokenFromListScreen = () => {
   const strings = useStrings()
 
-  useSearchOnNavBar({
-    placeholder: strings.searchTokens,
-    title: strings.swapTo,
-  })
-
   const loading = React.useMemo(
     () => ({
       fallback: (
@@ -48,10 +45,19 @@ export const SelectBuyTokenFromListScreen = () => {
     [],
   )
 
+  useSearchOnNavBar({
+    placeholder: strings.searchTokens,
+    title: strings.swapTo,
+  })
+
   return (
     <SafeAreaView style={styles.container} edges={['left', 'right']}>
       <Boundary loading={loading}>
-        <TokenList />
+        <ErrorBoundary
+          fallbackRender={({resetErrorBoundary}) => <ServiceUnavailable resetErrorBoundary={resetErrorBoundary} />}
+        >
+          <TokenList />
+        </ErrorBoundary>
       </Boundary>
     </SafeAreaView>
   )
diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json
index 2455933f07..1783c8c298 100644
--- a/apps/wallet-mobile/src/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/i18n/locales/en-US.json
@@ -665,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "You already have a wallet with this name",
   "global.error.walletNameTooLong": "Wallet name cannot exceed 40 letters",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
index 0ee083eee0..f205ad651d 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Incorrect password.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 143,
+      "line": 145,
       "column": 24,
-      "index": 9273
+      "index": 9439
     },
     "end": {
-      "line": 146,
+      "line": 148,
       "column": 3,
-      "index": 9382
+      "index": 9548
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 147,
+      "line": 149,
       "column": 13,
-      "index": 9397
+      "index": 9563
     },
     "end": {
-      "line": 150,
+      "line": 152,
       "column": 3,
-      "index": 9470
+      "index": 9636
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Token swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 151,
+      "line": 153,
       "column": 13,
-      "index": 9485
+      "index": 9651
     },
     "end": {
-      "line": 154,
+      "line": 156,
       "column": 3,
-      "index": 9567
+      "index": 9733
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 155,
+      "line": 157,
       "column": 13,
-      "index": 9582
+      "index": 9748
     },
     "end": {
-      "line": 158,
+      "line": 160,
       "column": 3,
-      "index": 9661
+      "index": 9827
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Market Button",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 159,
+      "line": 161,
       "column": 16,
-      "index": 9679
+      "index": 9845
     },
     "end": {
-      "line": 162,
+      "line": 164,
       "column": 3,
-      "index": 9764
+      "index": 9930
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Limit",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 163,
+      "line": 165,
       "column": 15,
-      "index": 9781
+      "index": 9947
     },
     "end": {
-      "line": 166,
+      "line": 168,
       "column": 3,
-      "index": 9857
+      "index": 10023
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Swap from",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 167,
+      "line": 169,
       "column": 12,
-      "index": 9871
+      "index": 10037
     },
     "end": {
-      "line": 170,
+      "line": 172,
       "column": 3,
-      "index": 9948
+      "index": 10114
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!Swap to",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 171,
+      "line": 173,
       "column": 10,
-      "index": 9960
+      "index": 10126
     },
     "end": {
-      "line": 174,
+      "line": 176,
       "column": 3,
-      "index": 10033
+      "index": 10199
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Current Balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 175,
+      "line": 177,
       "column": 18,
-      "index": 10053
+      "index": 10219
     },
     "end": {
-      "line": 178,
+      "line": 180,
       "column": 3,
-      "index": 10142
+      "index": 10308
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!Balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 179,
+      "line": 181,
       "column": 11,
-      "index": 10155
+      "index": 10321
     },
     "end": {
-      "line": 182,
+      "line": 184,
       "column": 3,
-      "index": 10229
+      "index": 10395
     }
   },
   {
@@ -154,14 +154,14 @@
     "defaultMessage": "!!!Select Token",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 183,
+      "line": 185,
       "column": 15,
-      "index": 10246
+      "index": 10412
     },
     "end": {
-      "line": 186,
+      "line": 188,
       "column": 3,
-      "index": 10329
+      "index": 10495
     }
   },
   {
@@ -169,14 +169,14 @@
     "defaultMessage": "!!!Market Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 187,
+      "line": 189,
       "column": 15,
-      "index": 10346
+      "index": 10512
     },
     "end": {
-      "line": 190,
+      "line": 192,
       "column": 3,
-      "index": 10429
+      "index": 10595
     }
   },
   {
@@ -184,14 +184,14 @@
     "defaultMessage": "!!!Limit Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 191,
+      "line": 193,
       "column": 14,
-      "index": 10445
+      "index": 10611
     },
     "end": {
-      "line": 194,
+      "line": 196,
       "column": 3,
-      "index": 10526
+      "index": 10692
     }
   },
   {
@@ -199,14 +199,14 @@
     "defaultMessage": "!!!Slippage Tolerance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 195,
+      "line": 197,
       "column": 21,
-      "index": 10549
+      "index": 10715
     },
     "end": {
-      "line": 198,
+      "line": 200,
       "column": 3,
-      "index": 10644
+      "index": 10810
     }
   },
   {
@@ -214,14 +214,14 @@
     "defaultMessage": "!!!Slippage must be a number between 0 and 75 and have up to 1 decimal",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 199,
+      "line": 201,
       "column": 26,
-      "index": 10672
+      "index": 10838
     },
     "end": {
-      "line": 202,
+      "line": 204,
       "column": 3,
-      "index": 10821
+      "index": 10987
     }
   },
   {
@@ -229,14 +229,14 @@
     "defaultMessage": "!!!Slippage Tolerance Info",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 203,
+      "line": 205,
       "column": 25,
-      "index": 10848
+      "index": 11014
     },
     "end": {
-      "line": 206,
+      "line": 208,
       "column": 3,
-      "index": 10952
+      "index": 11118
     }
   },
   {
@@ -244,14 +244,14 @@
     "defaultMessage": "!!!Verified by {pool}",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 207,
+      "line": 209,
       "column": 14,
-      "index": 10968
+      "index": 11134
     },
     "end": {
-      "line": 210,
+      "line": 212,
       "column": 3,
-      "index": 11056
+      "index": 11222
     }
   },
   {
@@ -259,14 +259,14 @@
     "defaultMessage": "!!!This asset is in my portfolio",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 211,
+      "line": 213,
       "column": 12,
-      "index": 11070
+      "index": 11236
     },
     "end": {
-      "line": 214,
+      "line": 216,
       "column": 3,
-      "index": 11167
+      "index": 11333
     }
   },
   {
@@ -274,14 +274,14 @@
     "defaultMessage": "!!!Slippage tolerance is set as a percentage of the total swap value.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 215,
+      "line": 217,
       "column": 16,
-      "index": 11185
+      "index": 11351
     },
     "end": {
-      "line": 218,
+      "line": 220,
       "column": 3,
-      "index": 11323
+      "index": 11489
     }
   },
   {
@@ -289,14 +289,14 @@
     "defaultMessage": "!!!(auto)",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 219,
+      "line": 221,
       "column": 12,
-      "index": 11337
+      "index": 11503
     },
     "end": {
-      "line": 222,
+      "line": 224,
       "column": 3,
-      "index": 11411
+      "index": 11577
     }
   },
   {
@@ -304,14 +304,14 @@
     "defaultMessage": "!!!change dex",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 223,
+      "line": 225,
       "column": 14,
-      "index": 11427
+      "index": 11593
     },
     "end": {
-      "line": 226,
+      "line": 228,
       "column": 3,
-      "index": 11507
+      "index": 11673
     }
   },
   {
@@ -319,14 +319,14 @@
     "defaultMessage": "!!!Min-ADA is the minimum ADA amount required to be contained when holding or sending Cardano native assets.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 227,
+      "line": 229,
       "column": 14,
-      "index": 11523
+      "index": 11689
     },
     "end": {
-      "line": 231,
+      "line": 233,
       "column": 3,
-      "index": 11704
+      "index": 11870
     }
   },
   {
@@ -334,14 +334,14 @@
     "defaultMessage": "!!!Min ADA",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 232,
+      "line": 234,
       "column": 19,
-      "index": 11725
+      "index": 11891
     },
     "end": {
-      "line": 235,
+      "line": 237,
       "column": 3,
-      "index": 11807
+      "index": 11973
     }
   },
   {
@@ -349,14 +349,14 @@
     "defaultMessage": "!!!Swap fees include the following:\n • Matchmaker Fee\n • Frontend Fee\n • Liquidity Provider Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 236,
+      "line": 238,
       "column": 12,
-      "index": 11821
+      "index": 11987
     },
     "end": {
-      "line": 239,
+      "line": 241,
       "column": 3,
-      "index": 11984
+      "index": 12150
     }
   },
   {
@@ -364,14 +364,14 @@
     "defaultMessage": "!!!Fees",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 240,
+      "line": 242,
       "column": 17,
-      "index": 12003
+      "index": 12169
     },
     "end": {
-      "line": 243,
+      "line": 245,
       "column": 3,
-      "index": 12080
+      "index": 12246
     }
   },
   {
@@ -379,14 +379,14 @@
     "defaultMessage": "!!!Liquidity provider fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 244,
+      "line": 246,
       "column": 20,
-      "index": 12102
+      "index": 12268
     },
     "end": {
-      "line": 247,
+      "line": 249,
       "column": 3,
-      "index": 12200
+      "index": 12366
     }
   },
   {
@@ -394,14 +394,14 @@
     "defaultMessage": "!!!Liq. prov. fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 248,
+      "line": 250,
       "column": 18,
-      "index": 12220
+      "index": 12386
     },
     "end": {
-      "line": 251,
+      "line": 253,
       "column": 3,
-      "index": 12308
+      "index": 12474
     }
   },
   {
@@ -409,14 +409,14 @@
     "defaultMessage": "!!!Liquidity provider fee is a fixed {fee}% operational fee from the whole transaction volume, that is taken to support DEX “liquidity” allowing traders to buy and sell assets on the decentralized Cardano network.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 252,
+      "line": 254,
       "column": 24,
-      "index": 12334
+      "index": 12500
     },
     "end": {
-      "line": 256,
+      "line": 258,
       "column": 3,
-      "index": 12630
+      "index": 12796
     }
   },
   {
@@ -424,14 +424,14 @@
     "defaultMessage": "!!!Minimum amount of assets you can get because of the slippage tolerance.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 257,
+      "line": 259,
       "column": 19,
-      "index": 12651
+      "index": 12817
     },
     "end": {
-      "line": 260,
+      "line": 262,
       "column": 3,
-      "index": 12797
+      "index": 12963
     }
   },
   {
@@ -439,14 +439,14 @@
     "defaultMessage": "!!!Min Received",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 261,
+      "line": 263,
       "column": 24,
-      "index": 12823
+      "index": 12989
     },
     "end": {
-      "line": 264,
+      "line": 266,
       "column": 3,
-      "index": 12915
+      "index": 13081
     }
   },
   {
@@ -454,14 +454,14 @@
     "defaultMessage": "!!!Enter a value from 0% to 75%. You can also enter up to 1 decimal",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 265,
+      "line": 267,
       "column": 17,
-      "index": 12934
+      "index": 13100
     },
     "end": {
-      "line": 268,
+      "line": 270,
       "column": 3,
-      "index": 13071
+      "index": 13237
     }
   },
   {
@@ -469,14 +469,14 @@
     "defaultMessage": "!!!{pool} verification",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 269,
+      "line": 271,
       "column": 20,
-      "index": 13093
+      "index": 13259
     },
     "end": {
-      "line": 272,
+      "line": 274,
       "column": 3,
-      "index": 13188
+      "index": 13354
     }
   },
   {
@@ -484,14 +484,14 @@
     "defaultMessage": "!!!Volume, 24h",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 273,
+      "line": 275,
       "column": 10,
-      "index": 13200
+      "index": 13366
     },
     "end": {
-      "line": 276,
+      "line": 278,
       "column": 3,
-      "index": 13277
+      "index": 13443
     }
   },
   {
@@ -499,14 +499,14 @@
     "defaultMessage": "!!!Cardano projects that list their own tokens can apply for an additional {pool} verification. This verification is a manual validation that {pool} team performs with the help of Cardano Foundation.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 277,
+      "line": 279,
       "column": 24,
-      "index": 13303
+      "index": 13469
     },
     "end": {
-      "line": 281,
+      "line": 283,
       "column": 3,
-      "index": 13585
+      "index": 13751
     }
   },
   {
@@ -514,14 +514,14 @@
     "defaultMessage": "!!! Price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 282,
+      "line": 284,
       "column": 9,
-      "index": 13596
+      "index": 13762
     },
     "end": {
-      "line": 285,
+      "line": 287,
       "column": 3,
-      "index": 13658
+      "index": 13824
     }
   },
   {
@@ -529,14 +529,14 @@
     "defaultMessage": "!!!No assets found for this pair",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 286,
+      "line": 288,
       "column": 17,
-      "index": 13677
+      "index": 13843
     },
     "end": {
-      "line": 289,
+      "line": 291,
       "column": 3,
-      "index": 13779
+      "index": 13945
     }
   },
   {
@@ -544,14 +544,14 @@
     "defaultMessage": "!!!No assets found for \"{search}\"",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 290,
+      "line": 292,
       "column": 20,
-      "index": 13801
+      "index": 13967
     },
     "end": {
-      "line": 293,
+      "line": 295,
       "column": 3,
-      "index": 13907
+      "index": 14073
     }
   },
   {
@@ -559,14 +559,14 @@
     "defaultMessage": "!!!Each verified tokens gets",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 294,
+      "line": 296,
       "column": 21,
-      "index": 13930
+      "index": 14096
     },
     "end": {
-      "line": 297,
+      "line": 299,
       "column": 3,
-      "index": 14032
+      "index": 14198
     }
   },
   {
@@ -574,14 +574,14 @@
     "defaultMessage": "!!!verified badge",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 298,
+      "line": 300,
       "column": 17,
-      "index": 14051
+      "index": 14217
     },
     "end": {
-      "line": 301,
+      "line": 303,
       "column": 3,
-      "index": 14138
+      "index": 14304
     }
   },
   {
@@ -589,14 +589,14 @@
     "defaultMessage": "!!!Open orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 302,
+      "line": 304,
       "column": 14,
-      "index": 14154
+      "index": 14320
     },
     "end": {
-      "line": 305,
+      "line": 307,
       "column": 3,
-      "index": 14235
+      "index": 14401
     }
   },
   {
@@ -604,14 +604,14 @@
     "defaultMessage": "!!!Completed orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 306,
+      "line": 308,
       "column": 19,
-      "index": 14256
+      "index": 14422
     },
     "end": {
-      "line": 309,
+      "line": 311,
       "column": 3,
-      "index": 14347
+      "index": 14513
     }
   },
   {
@@ -619,14 +619,14 @@
     "defaultMessage": "!!!TVL",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 310,
+      "line": 312,
       "column": 7,
-      "index": 14356
+      "index": 14522
     },
     "end": {
-      "line": 313,
+      "line": 315,
       "column": 3,
-      "index": 14422
+      "index": 14588
     }
   },
   {
@@ -634,14 +634,14 @@
     "defaultMessage": "!!! Dex Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 314,
+      "line": 316,
       "column": 11,
-      "index": 14435
+      "index": 14601
     },
     "end": {
-      "line": 317,
+      "line": 319,
       "column": 3,
-      "index": 14510
+      "index": 14676
     }
   },
   {
@@ -649,14 +649,14 @@
     "defaultMessage": "!!! Batcher Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 318,
+      "line": 320,
       "column": 14,
-      "index": 14526
+      "index": 14692
     },
     "end": {
-      "line": 321,
+      "line": 323,
       "column": 3,
-      "index": 14608
+      "index": 14774
     }
   },
   {
@@ -664,14 +664,14 @@
     "defaultMessage": "!!!Limit price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 322,
+      "line": 324,
       "column": 26,
-      "index": 14636
+      "index": 14802
     },
     "end": {
-      "line": 325,
+      "line": 327,
       "column": 3,
-      "index": 14729
+      "index": 14895
     }
   },
   {
@@ -679,14 +679,14 @@
     "defaultMessage": "!!!Are you sure you want to proceed this order with the limit price that is 10% or more higher than the\nmarket price?",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 326,
+      "line": 328,
       "column": 32,
-      "index": 14763
+      "index": 14929
     },
     "end": {
-      "line": 331,
+      "line": 333,
       "column": 3,
-      "index": 14983
+      "index": 15149
     }
   },
   {
@@ -694,14 +694,14 @@
     "defaultMessage": "!!!Your limit price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 332,
+      "line": 334,
       "column": 30,
-      "index": 15015
+      "index": 15181
     },
     "end": {
-      "line": 335,
+      "line": 337,
       "column": 3,
-      "index": 15117
+      "index": 15283
     }
   },
   {
@@ -709,14 +709,14 @@
     "defaultMessage": "!!!Market price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 336,
+      "line": 338,
       "column": 32,
-      "index": 15151
+      "index": 15317
     },
     "end": {
-      "line": 339,
+      "line": 341,
       "column": 3,
-      "index": 15251
+      "index": 15417
     }
   },
   {
@@ -724,14 +724,14 @@
     "defaultMessage": "!!!Back",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 340,
+      "line": 342,
       "column": 25,
-      "index": 15278
+      "index": 15444
     },
     "end": {
-      "line": 343,
+      "line": 345,
       "column": 3,
-      "index": 15363
+      "index": 15529
     }
   },
   {
@@ -739,14 +739,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 344,
+      "line": 346,
       "column": 28,
-      "index": 15393
+      "index": 15559
     },
     "end": {
-      "line": 347,
+      "line": 349,
       "column": 3,
-      "index": 15481
+      "index": 15647
     }
   },
   {
@@ -754,14 +754,14 @@
     "defaultMessage": "!!!Transaction submitted",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 348,
+      "line": 350,
       "column": 21,
-      "index": 15504
+      "index": 15670
     },
     "end": {
-      "line": 351,
+      "line": 353,
       "column": 3,
-      "index": 15602
+      "index": 15768
     }
   },
   {
@@ -769,14 +769,14 @@
     "defaultMessage": "!!!Your transactions will be displayed both in the list of transaction and Open swap orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 352,
+      "line": 354,
       "column": 22,
-      "index": 15626
+      "index": 15792
     },
     "end": {
-      "line": 355,
+      "line": 357,
       "column": 3,
-      "index": 15792
+      "index": 15958
     }
   },
   {
@@ -784,14 +784,14 @@
     "defaultMessage": "!!! dex",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 356,
+      "line": 358,
       "column": 7,
-      "index": 15801
+      "index": 15967
     },
     "end": {
-      "line": 359,
+      "line": 361,
       "column": 3,
-      "index": 15868
+      "index": 16034
     }
   },
   {
@@ -799,29 +799,14 @@
     "defaultMessage": "!!!see on explorer",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 360,
+      "line": 362,
       "column": 17,
-      "index": 15887
-    },
-    "end": {
-      "line": 363,
-      "column": 3,
-      "index": 15975
-    }
-  },
-  {
-    "id": "swap.swapScreen.goToOrders",
-    "defaultMessage": "!!!GO to Orders",
-    "file": "src/features/Swap/common/strings.ts",
-    "start": {
-      "line": 364,
-      "column": 14,
-      "index": 15991
+      "index": 16053
     },
     "end": {
-      "line": 367,
+      "line": 365,
       "column": 3,
-      "index": 16073
+      "index": 16141
     }
   },
   {
@@ -829,14 +814,14 @@
     "defaultMessage": "!!!Asset",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 368,
+      "line": 366,
       "column": 9,
-      "index": 16084
+      "index": 16152
     },
     "end": {
-      "line": 371,
+      "line": 369,
       "column": 3,
-      "index": 16157
+      "index": 16225
     }
   },
   {
@@ -844,14 +829,14 @@
     "defaultMessage": "!!!Clear",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 372,
+      "line": 370,
       "column": 9,
-      "index": 16168
+      "index": 16236
     },
     "end": {
-      "line": 375,
+      "line": 373,
       "column": 3,
-      "index": 16229
+      "index": 16297
     }
   },
   {
@@ -859,14 +844,14 @@
     "defaultMessage": "!!!Sign transaction",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 376,
+      "line": 374,
       "column": 19,
-      "index": 16250
+      "index": 16318
     },
     "end": {
-      "line": 379,
+      "line": 377,
       "column": 3,
-      "index": 16332
+      "index": 16400
     }
   },
   {
@@ -874,14 +859,14 @@
     "defaultMessage": "!!!Spending Password",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 380,
+      "line": 378,
       "column": 20,
-      "index": 16354
+      "index": 16422
     },
     "end": {
-      "line": 383,
+      "line": 381,
       "column": 3,
-      "index": 16438
+      "index": 16506
     }
   },
   {
@@ -889,14 +874,14 @@
     "defaultMessage": "!!!Enter spending password to sign this transaction",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 384,
+      "line": 382,
       "column": 25,
-      "index": 16465
+      "index": 16533
     },
     "end": {
-      "line": 387,
+      "line": 385,
       "column": 3,
-      "index": 16585
+      "index": 16653
     }
   },
   {
@@ -904,14 +889,14 @@
     "defaultMessage": "!!!Sign",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 388,
+      "line": 386,
       "column": 8,
-      "index": 16595
+      "index": 16663
     },
     "end": {
-      "line": 391,
+      "line": 389,
       "column": 3,
-      "index": 16654
+      "index": 16722
     }
   },
   {
@@ -919,14 +904,14 @@
     "defaultMessage": "!!!Swap",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 392,
+      "line": 390,
       "column": 14,
-      "index": 16670
+      "index": 16738
     },
     "end": {
-      "line": 395,
+      "line": 393,
       "column": 3,
-      "index": 16729
+      "index": 16797
     }
   },
   {
@@ -934,14 +919,14 @@
     "defaultMessage": "!!!completed orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 396,
+      "line": 394,
       "column": 23,
-      "index": 16754
+      "index": 16822
     },
     "end": {
-      "line": 399,
+      "line": 397,
       "column": 3,
-      "index": 16839
+      "index": 16907
     }
   },
   {
@@ -949,14 +934,14 @@
     "defaultMessage": "!!!open orders",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 400,
+      "line": 398,
       "column": 18,
-      "index": 16859
+      "index": 16927
     },
     "end": {
-      "line": 403,
+      "line": 401,
       "column": 3,
-      "index": 16934
+      "index": 17002
     }
   },
   {
@@ -964,14 +949,14 @@
     "defaultMessage": "!!!Confirm order cancellation",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 404,
+      "line": 402,
       "column": 24,
-      "index": 16960
+      "index": 17028
     },
     "end": {
-      "line": 407,
+      "line": 405,
       "column": 3,
-      "index": 17057
+      "index": 17125
     }
   },
   {
@@ -979,14 +964,14 @@
     "defaultMessage": "!!!Cancel order",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 408,
+      "line": 406,
       "column": 29,
-      "index": 17088
+      "index": 17156
     },
     "end": {
-      "line": 411,
+      "line": 409,
       "column": 3,
-      "index": 17175
+      "index": 17243
     }
   },
   {
@@ -994,14 +979,14 @@
     "defaultMessage": "!!!Are you sure you want to cancel this order?",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 412,
+      "line": 410,
       "column": 31,
-      "index": 17208
+      "index": 17276
     },
     "end": {
-      "line": 415,
+      "line": 413,
       "column": 3,
-      "index": 17329
+      "index": 17397
     }
   },
   {
@@ -1009,14 +994,14 @@
     "defaultMessage": "!!!Learn more about swap orders in Yoroi",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 416,
+      "line": 414,
       "column": 23,
-      "index": 17354
+      "index": 17422
     },
     "end": {
-      "line": 419,
+      "line": 417,
       "column": 3,
-      "index": 17461
+      "index": 17529
     }
   },
   {
@@ -1024,14 +1009,14 @@
     "defaultMessage": "!!!Asset price",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 420,
+      "line": 418,
       "column": 29,
-      "index": 17492
+      "index": 17560
     },
     "end": {
-      "line": 423,
+      "line": 421,
       "column": 3,
-      "index": 17579
+      "index": 17647
     }
   },
   {
@@ -1039,14 +1024,14 @@
     "defaultMessage": "!!!Asset amount",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 424,
+      "line": 422,
       "column": 30,
-      "index": 17611
+      "index": 17679
     },
     "end": {
-      "line": 427,
+      "line": 425,
       "column": 3,
-      "index": 17700
+      "index": 17768
     }
   },
   {
@@ -1054,14 +1039,14 @@
     "defaultMessage": "!!!Total returned",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 428,
+      "line": 426,
       "column": 32,
-      "index": 17734
+      "index": 17802
     },
     "end": {
-      "line": 431,
+      "line": 429,
       "column": 3,
-      "index": 17827
+      "index": 17895
     }
   },
   {
@@ -1069,14 +1054,14 @@
     "defaultMessage": "!!!Cancellation Fee",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 432,
+      "line": 430,
       "column": 34,
-      "index": 17863
+      "index": 17931
     },
     "end": {
-      "line": 435,
+      "line": 433,
       "column": 3,
-      "index": 17960
+      "index": 18028
     }
   },
   {
@@ -1084,14 +1069,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 436,
+      "line": 434,
       "column": 26,
-      "index": 17988
+      "index": 18056
     },
     "end": {
-      "line": 439,
+      "line": 437,
       "column": 3,
-      "index": 18068
+      "index": 18136
     }
   },
   {
@@ -1099,14 +1084,14 @@
     "defaultMessage": "!!!Back",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 440,
+      "line": 438,
       "column": 23,
-      "index": 18093
+      "index": 18161
     },
     "end": {
-      "line": 443,
+      "line": 441,
       "column": 3,
-      "index": 18167
+      "index": 18235
     }
   },
   {
@@ -1114,14 +1099,14 @@
     "defaultMessage": "!!!Total",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 444,
+      "line": 442,
       "column": 19,
-      "index": 18188
+      "index": 18256
     },
     "end": {
-      "line": 447,
+      "line": 445,
       "column": 3,
-      "index": 18258
+      "index": 18326
     }
   },
   {
@@ -1129,14 +1114,14 @@
     "defaultMessage": "!!!Liquidity Pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 448,
+      "line": 446,
       "column": 27,
-      "index": 18287
+      "index": 18355
     },
     "end": {
-      "line": 451,
+      "line": 449,
       "column": 3,
-      "index": 18374
+      "index": 18442
     }
   },
   {
@@ -1144,14 +1129,14 @@
     "defaultMessage": "!!!Time Created",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 452,
+      "line": 450,
       "column": 25,
-      "index": 18401
+      "index": 18469
     },
     "end": {
-      "line": 455,
+      "line": 453,
       "column": 3,
-      "index": 18484
+      "index": 18552
     }
   },
   {
@@ -1159,14 +1144,14 @@
     "defaultMessage": "!!!Time Completed",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 456,
+      "line": 454,
       "column": 27,
-      "index": 18513
+      "index": 18581
     },
     "end": {
-      "line": 459,
+      "line": 457,
       "column": 3,
-      "index": 18600
+      "index": 18668
     }
   },
   {
@@ -1174,14 +1159,14 @@
     "defaultMessage": "!!!Transaction ID",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 460,
+      "line": 458,
       "column": 18,
-      "index": 18620
+      "index": 18688
     },
     "end": {
-      "line": 463,
+      "line": 461,
       "column": 3,
-      "index": 18698
+      "index": 18766
     }
   },
   {
@@ -1189,14 +1174,14 @@
     "defaultMessage": "!!!Choose Connection Method",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 464,
+      "line": 462,
       "column": 26,
-      "index": 18726
+      "index": 18794
     },
     "end": {
-      "line": 467,
+      "line": 465,
       "column": 3,
-      "index": 18844
+      "index": 18912
     }
   },
   {
@@ -1204,14 +1189,14 @@
     "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X or S using an on-the-go USB cable adaptor:",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 468,
+      "line": 466,
       "column": 18,
-      "index": 18864
+      "index": 18932
     },
     "end": {
-      "line": 473,
+      "line": 471,
       "column": 3,
-      "index": 19093
+      "index": 19161
     }
   },
   {
@@ -1219,14 +1204,14 @@
     "defaultMessage": "!!!Connect with USB",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 474,
+      "line": 472,
       "column": 13,
-      "index": 19108
+      "index": 19176
     },
     "end": {
-      "line": 477,
+      "line": 475,
       "column": 3,
-      "index": 19222
+      "index": 19290
     }
   },
   {
@@ -1234,14 +1219,14 @@
     "defaultMessage": "!!! USB connection is blocked by iOS devices",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 478,
+      "line": 476,
       "column": 26,
-      "index": 19250
+      "index": 19318
     },
     "end": {
-      "line": 481,
+      "line": 479,
       "column": 3,
-      "index": 19402
+      "index": 19470
     }
   },
   {
@@ -1249,14 +1234,14 @@
     "defaultMessage": "!!!Choose this option if you want to connect to a Ledger Nano model X through Bluetooth:",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 482,
+      "line": 480,
       "column": 24,
-      "index": 19428
+      "index": 19496
     },
     "end": {
-      "line": 485,
+      "line": 483,
       "column": 3,
-      "index": 19622
+      "index": 19690
     }
   },
   {
@@ -1264,14 +1249,14 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 486,
+      "line": 484,
       "column": 19,
-      "index": 19643
+      "index": 19711
     },
     "end": {
-      "line": 489,
+      "line": 487,
       "column": 3,
-      "index": 19769
+      "index": 19837
     }
   },
   {
@@ -1279,14 +1264,59 @@
     "defaultMessage": "!!!Connect with Bluetooth",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 490,
+      "line": 488,
       "column": 18,
-      "index": 19789
+      "index": 19857
+    },
+    "end": {
+      "line": 491,
+      "column": 3,
+      "index": 19967
+    }
+  },
+  {
+    "id": "global.error.serviceUnavailable",
+    "defaultMessage": "!!!Service unavailable",
+    "file": "src/features/Swap/common/strings.ts",
+    "start": {
+      "line": 492,
+      "column": 22,
+      "index": 19991
+    },
+    "end": {
+      "line": 495,
+      "column": 3,
+      "index": 20085
+    }
+  },
+  {
+    "id": "global.error.serviceUnavailableInfo",
+    "defaultMessage": "!!!The server is temporarily busy due to maintenance downtime or capacity problems",
+    "file": "src/features/Swap/common/strings.ts",
+    "start": {
+      "line": 496,
+      "column": 26,
+      "index": 20113
     },
     "end": {
-      "line": 493,
+      "line": 499,
       "column": 3,
-      "index": 19899
+      "index": 20271
+    }
+  },
+  {
+    "id": "components.send.sendscreen.submittedTxButton",
+    "defaultMessage": "!!!GO TO transactions",
+    "file": "src/features/Swap/common/strings.ts",
+    "start": {
+      "line": 500,
+      "column": 20,
+      "index": 20293
+    },
+    "end": {
+      "line": 503,
+      "column": 3,
+      "index": 20399
     }
   },
   {
@@ -1294,14 +1324,14 @@
     "defaultMessage": "!!!You have",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 496,
+      "line": 506,
       "column": 11,
-      "index": 19958
+      "index": 20458
     },
     "end": {
-      "line": 499,
+      "line": 509,
       "column": 3,
-      "index": 20053
+      "index": 20553
     }
   },
   {
@@ -1309,14 +1339,14 @@
     "defaultMessage": "!!!No assets found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 500,
+      "line": 510,
       "column": 12,
-      "index": 20067
+      "index": 20567
     },
     "end": {
-      "line": 503,
+      "line": 513,
       "column": 3,
-      "index": 20170
+      "index": 20670
     }
   },
   {
@@ -1324,14 +1354,14 @@
     "defaultMessage": "!!!found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 504,
+      "line": 514,
       "column": 9,
-      "index": 20181
+      "index": 20681
     },
     "end": {
-      "line": 507,
+      "line": 517,
       "column": 3,
-      "index": 20271
+      "index": 20771
     }
   },
   {
@@ -1339,14 +1369,14 @@
     "defaultMessage": "!!!Search tokens",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 508,
+      "line": 518,
       "column": 16,
-      "index": 20289
+      "index": 20789
     },
     "end": {
-      "line": 511,
+      "line": 521,
       "column": 3,
-      "index": 20385
+      "index": 20885
     }
   },
   {
@@ -1354,14 +1384,14 @@
     "defaultMessage": "!!!Select asset",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 512,
+      "line": 522,
       "column": 20,
-      "index": 20407
+      "index": 20907
     },
     "end": {
-      "line": 515,
+      "line": 525,
       "column": 3,
-      "index": 20496
+      "index": 20996
     }
   },
   {
@@ -1369,14 +1399,14 @@
     "defaultMessage": "!!!Confirm",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 516,
+      "line": 526,
       "column": 11,
-      "index": 20509
+      "index": 21009
     },
     "end": {
-      "line": 519,
+      "line": 529,
       "column": 3,
-      "index": 20603
+      "index": 21103
     }
   },
   {
@@ -1384,14 +1414,14 @@
     "defaultMessage": "!!!Assign collateral",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 520,
+      "line": 530,
       "column": 20,
-      "index": 20625
+      "index": 21125
     },
     "end": {
-      "line": 523,
+      "line": 533,
       "column": 3,
-      "index": 20732
+      "index": 21232
     }
   },
   {
@@ -1399,14 +1429,14 @@
     "defaultMessage": "!!!Collateral not found",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 524,
+      "line": 534,
       "column": 22,
-      "index": 20756
+      "index": 21256
     },
     "end": {
-      "line": 527,
+      "line": 537,
       "column": 3,
-      "index": 20868
+      "index": 21368
     }
   },
   {
@@ -1414,14 +1444,14 @@
     "defaultMessage": "!!!You don't have an active collateral utxo",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 528,
+      "line": 538,
       "column": 22,
-      "index": 20892
+      "index": 21392
     },
     "end": {
-      "line": 531,
+      "line": 541,
       "column": 3,
-      "index": 21024
+      "index": 21524
     }
   },
   {
@@ -1429,14 +1459,14 @@
     "defaultMessage": "!!!Transaction failed",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 532,
+      "line": 542,
       "column": 17,
-      "index": 21043
+      "index": 21543
     },
     "end": {
-      "line": 535,
+      "line": 545,
       "column": 3,
-      "index": 21145
+      "index": 21645
     }
   },
   {
@@ -1444,14 +1474,14 @@
     "defaultMessage": "!!!Your transaction has not been processed properly due to technical issues",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 536,
+      "line": 546,
       "column": 16,
-      "index": 21163
+      "index": 21663
     },
     "end": {
-      "line": 539,
+      "line": 549,
       "column": 3,
-      "index": 21318
+      "index": 21818
     }
   },
   {
@@ -1459,14 +1489,14 @@
     "defaultMessage": "!!!Try again",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 540,
+      "line": 550,
       "column": 18,
-      "index": 21338
+      "index": 21838
     },
     "end": {
-      "line": 543,
+      "line": 553,
       "column": 3,
-      "index": 21432
+      "index": 21932
     }
   },
   {
@@ -1474,14 +1504,14 @@
     "defaultMessage": "!!!Not enough balance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 544,
+      "line": 554,
       "column": 20,
-      "index": 21454
+      "index": 21954
     },
     "end": {
-      "line": 547,
+      "line": 557,
       "column": 3,
-      "index": 21548
+      "index": 22048
     }
   },
   {
@@ -1489,14 +1519,14 @@
     "defaultMessage": "!!!Not enough supply in the pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 548,
+      "line": 558,
       "column": 19,
-      "index": 21569
+      "index": 22069
     },
     "end": {
-      "line": 551,
+      "line": 561,
       "column": 3,
-      "index": 21673
+      "index": 22173
     }
   },
   {
@@ -1504,14 +1534,14 @@
     "defaultMessage": "!!!Not enough balance, please consider the fees",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 552,
+      "line": 562,
       "column": 23,
-      "index": 21698
+      "index": 22198
     },
     "end": {
-      "line": 555,
+      "line": 565,
       "column": 3,
-      "index": 21821
+      "index": 22321
     }
   },
   {
@@ -1519,14 +1549,14 @@
     "defaultMessage": "!!! This pair is not available in any liquidity pool",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 556,
+      "line": 566,
       "column": 10,
-      "index": 21833
+      "index": 22333
     },
     "end": {
-      "line": 559,
+      "line": 569,
       "column": 3,
-      "index": 21948
+      "index": 22448
     }
   },
   {
@@ -1534,14 +1564,14 @@
     "defaultMessage": "!!!Continue on Ledger",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 560,
+      "line": 570,
       "column": 20,
-      "index": 21970
+      "index": 22470
     },
     "end": {
-      "line": 563,
+      "line": 573,
       "column": 3,
-      "index": 22070
+      "index": 22570
     }
   },
   {
@@ -1549,14 +1579,14 @@
     "defaultMessage": "!!!Slippage Warning",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 564,
+      "line": 574,
       "column": 24,
-      "index": 22096
+      "index": 22596
     },
     "end": {
-      "line": 567,
+      "line": 577,
       "column": 3,
-      "index": 22190
+      "index": 22690
     }
   },
   {
@@ -1564,14 +1594,14 @@
     "defaultMessage": "!!!Are you sure you want to proceed this order with the current slippage tolerance? It could result in receiving no assets.",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 568,
+      "line": 578,
       "column": 23,
-      "index": 22215
+      "index": 22715
     },
     "end": {
-      "line": 572,
+      "line": 582,
       "column": 3,
-      "index": 22418
+      "index": 22918
     }
   },
   {
@@ -1579,14 +1609,14 @@
     "defaultMessage": "!!!Your slippage tolerance",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 573,
+      "line": 583,
       "column": 31,
-      "index": 22451
+      "index": 22951
     },
     "end": {
-      "line": 576,
+      "line": 586,
       "column": 3,
-      "index": 22544
+      "index": 23044
     }
   },
   {
@@ -1594,14 +1624,14 @@
     "defaultMessage": "!!!No orders avaliable yet",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 577,
+      "line": 587,
       "column": 19,
-      "index": 22565
+      "index": 23065
     },
     "end": {
-      "line": 580,
+      "line": 590,
       "column": 3,
-      "index": 22663
+      "index": 23163
     }
   },
   {
@@ -1609,14 +1639,14 @@
     "defaultMessage": "!!!Start doing the swap operations to your open orders here",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 581,
+      "line": 591,
       "column": 22,
-      "index": 22687
+      "index": 23187
     },
     "end": {
-      "line": 584,
+      "line": 594,
       "column": 3,
-      "index": 22821
+      "index": 23321
     }
   },
   {
@@ -1624,14 +1654,14 @@
     "defaultMessage": "!!!No orders completed yet",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
-      "line": 585,
+      "line": 595,
       "column": 24,
-      "index": 22847
+      "index": 23347
     },
     "end": {
-      "line": 588,
+      "line": 598,
       "column": 3,
-      "index": 22950
+      "index": 23450
     }
   }
 ]
\ No newline at end of file

From 9fa9d3f58279923ad39fb87d6863a68f94670850 Mon Sep 17 00:00:00 2001
From: banklesss <105349292+banklesss@users.noreply.github.com>
Date: Wed, 8 Nov 2023 14:13:47 +0100
Subject: [PATCH 35/40] fix: buy modal (#2885)

---
 apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx b/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx
index 3c57f694e2..60c0888965 100644
--- a/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx
+++ b/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx
@@ -53,7 +53,7 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
       <View style={styles.buyModalContent}>
         <Text style={styles.buyInfo}>{strings.buyInfo(modalTextFormattingOptions)}</Text>
 
-        <Spacer height={32} />
+        <Spacer fill />
 
         <Button
           shelleyTheme
@@ -77,8 +77,6 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
             closeModal()
           }}
         />
-
-        <Spacer height={23} />
       </View>,
       modalHeight,
     )
@@ -222,7 +220,9 @@ const styles = StyleSheet.create({
   disabled: {
     opacity: 0.5,
   },
-  buyModalContent: {flex: 1, flexDirection: 'column'},
+  buyModalContent: {
+    flex: 1,
+  },
 })
 
 const useStrings = () => {

From 9f4fe6b306e0b6e85e38e752df47a7026a266acc Mon Sep 17 00:00:00 2001
From: banklesss <105349292+banklesss@users.noreply.github.com>
Date: Wed, 8 Nov 2023 15:28:37 +0100
Subject: [PATCH 36/40] fix: buy modal (#2887)

---
 apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx b/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx
index 60c0888965..8f672c9952 100644
--- a/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx
+++ b/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx
@@ -42,7 +42,7 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
   const handleOnBuy = () => {
     track.walletPageExchangeBottomSheetClicked()
 
-    const modalHeight = 300
+    const modalHeight = 310
     const modalTextFormattingOptions: BuyInfoFormattingOptions = {
       b: (text) => <Text style={[styles.buyInfo, styles.bold]}>{text}</Text>,
       textComponent: (text) => <Text style={styles.buyInfo}>{text}</Text>,

From c3e6a4a749dde0d44080789a4d985cbe40e19fc3 Mon Sep 17 00:00:00 2001
From: Ruslan Dudin <vantuz-subhuman@yandex.ru>
Date: Wed, 8 Nov 2023 17:29:10 +0300
Subject: [PATCH 37/40] chore: New Crowdin updates (#2886)

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

diff --git a/apps/wallet-mobile/src/i18n/locales/bn-BD.json b/apps/wallet-mobile/src/i18n/locales/bn-BD.json
index ef40a0c682..2cad70cdf3 100644
--- a/apps/wallet-mobile/src/i18n/locales/bn-BD.json
+++ b/apps/wallet-mobile/src/i18n/locales/bn-BD.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "You already have a wallet with this name",
   "global.error.walletNameTooLong": "Wallet name cannot exceed 40 letters",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/cs-CZ.json b/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
index 90fb187a54..4d1fcf738b 100644
--- a/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
+++ b/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "Peněženka s tímto názvem již existuje",
   "global.error.walletNameTooLong": "Název peněženky nemůže překročit 40 písmen",
   "global.error.walletNameMustBeFilled": "Musí být vyplněno",
diff --git a/apps/wallet-mobile/src/i18n/locales/de-DE.json b/apps/wallet-mobile/src/i18n/locales/de-DE.json
index 0e44ccf172..d7e08c0b8c 100644
--- a/apps/wallet-mobile/src/i18n/locales/de-DE.json
+++ b/apps/wallet-mobile/src/i18n/locales/de-DE.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "Du hast bereits eine Wallet mit diesem Namen",
   "global.error.walletNameTooLong": "Der Wallet-namen kann nicht länger als 40 Zeichen sein",
   "global.error.walletNameMustBeFilled": "Muss ausgefüllt werden",
diff --git a/apps/wallet-mobile/src/i18n/locales/el-GR.json b/apps/wallet-mobile/src/i18n/locales/el-GR.json
index 123d141ce6..e65f448deb 100644
--- a/apps/wallet-mobile/src/i18n/locales/el-GR.json
+++ b/apps/wallet-mobile/src/i18n/locales/el-GR.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "You already have a wallet with this name",
   "global.error.walletNameTooLong": "Wallet name cannot exceed 40 letters",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/es-ES.json b/apps/wallet-mobile/src/i18n/locales/es-ES.json
index 27b90f46a1..b0ea14b667 100644
--- a/apps/wallet-mobile/src/i18n/locales/es-ES.json
+++ b/apps/wallet-mobile/src/i18n/locales/es-ES.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "Dólar americano",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "Ya tienes una billetera con este nombre",
   "global.error.walletNameTooLong": "El nombre de la billetera no puede exceder los 40 caracteres",
   "global.error.walletNameMustBeFilled": "Debe llenarse",
diff --git a/apps/wallet-mobile/src/i18n/locales/fil-PH.json b/apps/wallet-mobile/src/i18n/locales/fil-PH.json
index ef40a0c682..2cad70cdf3 100644
--- a/apps/wallet-mobile/src/i18n/locales/fil-PH.json
+++ b/apps/wallet-mobile/src/i18n/locales/fil-PH.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "You already have a wallet with this name",
   "global.error.walletNameTooLong": "Wallet name cannot exceed 40 letters",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/fr-FR.json b/apps/wallet-mobile/src/i18n/locales/fr-FR.json
index 0214babd93..2115f4c438 100644
--- a/apps/wallet-mobile/src/i18n/locales/fr-FR.json
+++ b/apps/wallet-mobile/src/i18n/locales/fr-FR.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Identifiant de la transaction ",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Prix limite ",
   "swap.swapScreen.limitPriceWarningDescription": "Êtes-vous sûr(e) de vouloir poursuivre cette commande avec un prix limite qui est plus de 10 %  au-dessus du prix du marché ?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Votre prix limite",
@@ -662,6 +665,8 @@
   "global.currency.USD": "Dollar US",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "Vous avez déjà un wallet avec ce nom",
   "global.error.walletNameTooLong": "Le nom du wallet ne doit pas dépasser 40 caractères",
   "global.error.walletNameMustBeFilled": "Doit être rempli",
diff --git a/apps/wallet-mobile/src/i18n/locales/hr-HR.json b/apps/wallet-mobile/src/i18n/locales/hr-HR.json
index c5dd396127..7fd8b07fc8 100644
--- a/apps/wallet-mobile/src/i18n/locales/hr-HR.json
+++ b/apps/wallet-mobile/src/i18n/locales/hr-HR.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "You already have a wallet with this name",
   "global.error.walletNameTooLong": "Wallet name cannot exceed 40 letters",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/hu-HU.json b/apps/wallet-mobile/src/i18n/locales/hu-HU.json
index a336d4c850..4f16361dd6 100644
--- a/apps/wallet-mobile/src/i18n/locales/hu-HU.json
+++ b/apps/wallet-mobile/src/i18n/locales/hu-HU.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "Már van ilyen nevű pénztárca.",
   "global.error.walletNameTooLong": "Tárca név nem haladhatja meg a 40 karaktert",
   "global.error.walletNameMustBeFilled": "Kötelező kitölteni",
diff --git a/apps/wallet-mobile/src/i18n/locales/id-ID.json b/apps/wallet-mobile/src/i18n/locales/id-ID.json
index 41079a1d8c..a6155c7797 100644
--- a/apps/wallet-mobile/src/i18n/locales/id-ID.json
+++ b/apps/wallet-mobile/src/i18n/locales/id-ID.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "Kamu sudah mempunyai wallet dengan nama ini",
   "global.error.walletNameTooLong": "Nama wallet tidak boleh melebihi dari 40 huruf",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/it-IT.json b/apps/wallet-mobile/src/i18n/locales/it-IT.json
index 7986b6e1eb..c8385dac76 100644
--- a/apps/wallet-mobile/src/i18n/locales/it-IT.json
+++ b/apps/wallet-mobile/src/i18n/locales/it-IT.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "Hai già un portafoglio con questo nome",
   "global.error.walletNameTooLong": "Il nome del portafoglio non può superare le 40 lettere",
   "global.error.walletNameMustBeFilled": "Deve essere compilato",
diff --git a/apps/wallet-mobile/src/i18n/locales/ja-JP.json b/apps/wallet-mobile/src/i18n/locales/ja-JP.json
index e4eae0eb87..c60cc6a859 100644
--- a/apps/wallet-mobile/src/i18n/locales/ja-JP.json
+++ b/apps/wallet-mobile/src/i18n/locales/ja-JP.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "同じ名前のウォレットが存在します。",
   "global.error.walletNameTooLong": "ウォレット名が40文字を超えています。",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/ko-KR.json b/apps/wallet-mobile/src/i18n/locales/ko-KR.json
index 442b038f0f..83cb59ebf8 100644
--- a/apps/wallet-mobile/src/i18n/locales/ko-KR.json
+++ b/apps/wallet-mobile/src/i18n/locales/ko-KR.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "이미 사용하고 있는 지갑명입니다.",
   "global.error.walletNameTooLong": "지갑 이름은 40자를 초과할 수 없습니다",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/nl-NL.json b/apps/wallet-mobile/src/i18n/locales/nl-NL.json
index ca8e8bc631..51affae0a1 100644
--- a/apps/wallet-mobile/src/i18n/locales/nl-NL.json
+++ b/apps/wallet-mobile/src/i18n/locales/nl-NL.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "Dollar(VS)",
   "global.error": "Fout",
   "global.error.insufficientBalance": "Ontoereikend saldo",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "U heeft al een portemonnee met deze naam",
   "global.error.walletNameTooLong": "Portemonneenaam kan niet langer zijn dan 40 karakters",
   "global.error.walletNameMustBeFilled": "Moet gevuld zijn",
diff --git a/apps/wallet-mobile/src/i18n/locales/pl-PL.json b/apps/wallet-mobile/src/i18n/locales/pl-PL.json
index ef40a0c682..2cad70cdf3 100644
--- a/apps/wallet-mobile/src/i18n/locales/pl-PL.json
+++ b/apps/wallet-mobile/src/i18n/locales/pl-PL.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "You already have a wallet with this name",
   "global.error.walletNameTooLong": "Wallet name cannot exceed 40 letters",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/pt-BR.json b/apps/wallet-mobile/src/i18n/locales/pt-BR.json
index e9facd2ecf..34e9cb35ce 100644
--- a/apps/wallet-mobile/src/i18n/locales/pt-BR.json
+++ b/apps/wallet-mobile/src/i18n/locales/pt-BR.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "Dólar americano",
   "global.error": "Erro",
   "global.error.insufficientBalance": "Sem saldo",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "Você já tem uma carteira com esse nome",
   "global.error.walletNameTooLong": "O nome da carteira não pode exceder 40 caracteres",
   "global.error.walletNameMustBeFilled": "Precisa ser preenchido",
diff --git a/apps/wallet-mobile/src/i18n/locales/ru-RU.json b/apps/wallet-mobile/src/i18n/locales/ru-RU.json
index 2eb8ce8183..d6557037a8 100644
--- a/apps/wallet-mobile/src/i18n/locales/ru-RU.json
+++ b/apps/wallet-mobile/src/i18n/locales/ru-RU.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "Доллар США",
   "global.error": "Ошибка",
   "global.error.insufficientBalance": "Недостаточный баланс",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "У Вас уже есть кошелек с таким именем",
   "global.error.walletNameTooLong": "Имя кошелька не может превышать 40 символов",
   "global.error.walletNameMustBeFilled": "Должно быть заполнено",
diff --git a/apps/wallet-mobile/src/i18n/locales/sk-SK.json b/apps/wallet-mobile/src/i18n/locales/sk-SK.json
index c06e8857c9..47bbebacf2 100644
--- a/apps/wallet-mobile/src/i18n/locales/sk-SK.json
+++ b/apps/wallet-mobile/src/i18n/locales/sk-SK.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "Peňaženka s týmto názvom už existuje",
   "global.error.walletNameTooLong": "Názov peňaženky nesmie byť dlhší než 40 písmen",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/sl-SI.json b/apps/wallet-mobile/src/i18n/locales/sl-SI.json
index ef40a0c682..2cad70cdf3 100644
--- a/apps/wallet-mobile/src/i18n/locales/sl-SI.json
+++ b/apps/wallet-mobile/src/i18n/locales/sl-SI.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "You already have a wallet with this name",
   "global.error.walletNameTooLong": "Wallet name cannot exceed 40 letters",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/sv-SE.json b/apps/wallet-mobile/src/i18n/locales/sv-SE.json
index ef40a0c682..2cad70cdf3 100644
--- a/apps/wallet-mobile/src/i18n/locales/sv-SE.json
+++ b/apps/wallet-mobile/src/i18n/locales/sv-SE.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "You already have a wallet with this name",
   "global.error.walletNameTooLong": "Wallet name cannot exceed 40 letters",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/sw-KE.json b/apps/wallet-mobile/src/i18n/locales/sw-KE.json
index ef40a0c682..2cad70cdf3 100644
--- a/apps/wallet-mobile/src/i18n/locales/sw-KE.json
+++ b/apps/wallet-mobile/src/i18n/locales/sw-KE.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "You already have a wallet with this name",
   "global.error.walletNameTooLong": "Wallet name cannot exceed 40 letters",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/tr-TR.json b/apps/wallet-mobile/src/i18n/locales/tr-TR.json
index 35327caacb..fea7b9cf0e 100644
--- a/apps/wallet-mobile/src/i18n/locales/tr-TR.json
+++ b/apps/wallet-mobile/src/i18n/locales/tr-TR.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "You already have a wallet with this name",
   "global.error.walletNameTooLong": "Wallet name cannot exceed 40 letters",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/uk-UA.json b/apps/wallet-mobile/src/i18n/locales/uk-UA.json
index ef40a0c682..2cad70cdf3 100644
--- a/apps/wallet-mobile/src/i18n/locales/uk-UA.json
+++ b/apps/wallet-mobile/src/i18n/locales/uk-UA.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "You already have a wallet with this name",
   "global.error.walletNameTooLong": "Wallet name cannot exceed 40 letters",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/vi-VN.json b/apps/wallet-mobile/src/i18n/locales/vi-VN.json
index 0521bfcbe0..0c1383f454 100644
--- a/apps/wallet-mobile/src/i18n/locales/vi-VN.json
+++ b/apps/wallet-mobile/src/i18n/locales/vi-VN.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "Đô la mỹ",
   "global.error": "Lỗi",
   "global.error.insufficientBalance": "Số dư không đủ",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "Bạn đã có ví với tên này",
   "global.error.walletNameTooLong": "Tên ví không được vượt quá 40 chữ cái",
   "global.error.walletNameMustBeFilled": "Phải được điền",
diff --git a/apps/wallet-mobile/src/i18n/locales/zh-Hans.json b/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
index 617d740b00..d137a991d8 100644
--- a/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
+++ b/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "您已经有一个使用此名称的钱包",
   "global.error.walletNameTooLong": "钱包名称不能超过40个字符",
   "global.error.walletNameMustBeFilled": "Must be filled",
diff --git a/apps/wallet-mobile/src/i18n/locales/zh-Hant.json b/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
index 0660fd230b..795335249c 100644
--- a/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
+++ b/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
@@ -189,6 +189,9 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
+  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
+  "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
   "swap.swapScreen.limitPriceWarningDescription": "Are you sure you want to proceed this order with the limit price that is 10% or more higher than the market price?",
   "swap.swapScreen.limitPriceWarningYourPrice": "Your limit price",
@@ -662,6 +665,8 @@
   "global.currency.USD": "US Dollar",
   "global.error": "Error",
   "global.error.insufficientBalance": "Insufficent balance",
+  "global.error.serviceUnavailable": "Service unavailable",
+  "global.error.serviceUnavailableInfo": "The server is temporarily busy due to maintenance downtime or capacity problems",
   "global.error.walletNameAlreadyTaken": "You already have a wallet with this name",
   "global.error.walletNameTooLong": "Wallet name cannot exceed 40 letters",
   "global.error.walletNameMustBeFilled": "Must be filled",

From bdb252603406b8272f37875d2f41babddf9872a4 Mon Sep 17 00:00:00 2001
From: Javier Bueno <javierbueno@emurgo.io>
Date: Wed, 8 Nov 2023 16:10:18 +0100
Subject: [PATCH 38/40] fix(swap): orders list empty status typos and styles

---
 apps/wallet-mobile/src/features/Swap/common/strings.ts          | 2 +-
 .../useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx     | 1 +
 .../Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx     | 1 +
 apps/wallet-mobile/src/i18n/locales/en-US.json                  | 2 +-
 .../translations/messages/src/features/Swap/common/strings.json | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Swap/common/strings.ts b/apps/wallet-mobile/src/features/Swap/common/strings.ts
index 668c8cdb39..aad5bd2c06 100644
--- a/apps/wallet-mobile/src/features/Swap/common/strings.ts
+++ b/apps/wallet-mobile/src/features/Swap/common/strings.ts
@@ -586,7 +586,7 @@ export const messages = defineMessages({
   },
   emptyOpenOrders: {
     id: 'swap.listOrders.emptyOpenOrders',
-    defaultMessage: '!!!No orders avaliable yet',
+    defaultMessage: '!!!No orders available yet',
   },
   emptyOpenOrdersSub: {
     id: 'swap.listOrders.emptyOpenOrdersSub',
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
index 06bc6a36a8..e9fe0fe739 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
@@ -391,5 +391,6 @@ const styles = StyleSheet.create({
     fontWeigh: '500',
     fontSize: 20,
     color: '#000',
+    lineHeight: 30,
   },
 })
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx
index 7728c6ad08..4711b384ac 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx
@@ -723,6 +723,7 @@ const styles = StyleSheet.create({
     fontWeigh: '500',
     fontSize: 20,
     color: '#000',
+    lineHeight: 30,
   },
   contentSubText: {
     flex: 1,
diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json
index 1783c8c298..4603415490 100644
--- a/apps/wallet-mobile/src/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/i18n/locales/en-US.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
index f205ad651d..d42037a1b6 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Swap/common/strings.json
@@ -1621,7 +1621,7 @@
   },
   {
     "id": "swap.listOrders.emptyOpenOrders",
-    "defaultMessage": "!!!No orders avaliable yet",
+    "defaultMessage": "!!!No orders available yet",
     "file": "src/features/Swap/common/strings.ts",
     "start": {
       "line": 587,

From 58929df5a7fed9d628ba3b441d2df26d7ae4e6ab Mon Sep 17 00:00:00 2001
From: Javier Bueno <javierbueno@emurgo.io>
Date: Wed, 8 Nov 2023 16:13:28 +0100
Subject: [PATCH 39/40] fix(swap): orders list empty status typos and styles

---
 .../useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx     | 2 +-
 .../Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
index e9fe0fe739..b573238d4d 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
@@ -336,7 +336,7 @@ const NoOrdersYet = () => {
 
       <EmptyCompletedOrdersLogo style={styles.image} />
 
-      <Spacer height={25} />
+      <Spacer height={15} />
 
       <Text style={styles.contentText}>{strings.emptyCompletedOrders}</Text>
     </View>
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx
index 4711b384ac..152182f694 100644
--- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx
+++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/OpenOrders.tsx
@@ -616,7 +616,7 @@ const NoOrdersYet = () => {
 
       <EmptyOpenOrdersLogo style={styles.image} />
 
-      <Spacer height={25} />
+      <Spacer height={15} />
 
       <Text style={styles.contentText}>{strings.emptyOpenOrders}</Text>
 

From ce984893f29ffeb68084dbfc7022e23dbfc3c344 Mon Sep 17 00:00:00 2001
From: Ruslan Dudin <vantuz-subhuman@yandex.ru>
Date: Thu, 9 Nov 2023 13:24:03 +0300
Subject: [PATCH 40/40] New Crowdin updates (#2889)

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

diff --git a/apps/wallet-mobile/src/i18n/locales/bn-BD.json b/apps/wallet-mobile/src/i18n/locales/bn-BD.json
index 2cad70cdf3..f08e12c2ce 100644
--- a/apps/wallet-mobile/src/i18n/locales/bn-BD.json
+++ b/apps/wallet-mobile/src/i18n/locales/bn-BD.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/cs-CZ.json b/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
index 4d1fcf738b..09e9efc818 100644
--- a/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
+++ b/apps/wallet-mobile/src/i18n/locales/cs-CZ.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/de-DE.json b/apps/wallet-mobile/src/i18n/locales/de-DE.json
index d7e08c0b8c..3dfbd537fd 100644
--- a/apps/wallet-mobile/src/i18n/locales/de-DE.json
+++ b/apps/wallet-mobile/src/i18n/locales/de-DE.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/el-GR.json b/apps/wallet-mobile/src/i18n/locales/el-GR.json
index e65f448deb..42d2036632 100644
--- a/apps/wallet-mobile/src/i18n/locales/el-GR.json
+++ b/apps/wallet-mobile/src/i18n/locales/el-GR.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/es-ES.json b/apps/wallet-mobile/src/i18n/locales/es-ES.json
index b0ea14b667..9299a318ff 100644
--- a/apps/wallet-mobile/src/i18n/locales/es-ES.json
+++ b/apps/wallet-mobile/src/i18n/locales/es-ES.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/fil-PH.json b/apps/wallet-mobile/src/i18n/locales/fil-PH.json
index 2cad70cdf3..f08e12c2ce 100644
--- a/apps/wallet-mobile/src/i18n/locales/fil-PH.json
+++ b/apps/wallet-mobile/src/i18n/locales/fil-PH.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/hr-HR.json b/apps/wallet-mobile/src/i18n/locales/hr-HR.json
index 7fd8b07fc8..9cee05d838 100644
--- a/apps/wallet-mobile/src/i18n/locales/hr-HR.json
+++ b/apps/wallet-mobile/src/i18n/locales/hr-HR.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/hu-HU.json b/apps/wallet-mobile/src/i18n/locales/hu-HU.json
index 4f16361dd6..2694616d7a 100644
--- a/apps/wallet-mobile/src/i18n/locales/hu-HU.json
+++ b/apps/wallet-mobile/src/i18n/locales/hu-HU.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/id-ID.json b/apps/wallet-mobile/src/i18n/locales/id-ID.json
index a6155c7797..6c3c4e802d 100644
--- a/apps/wallet-mobile/src/i18n/locales/id-ID.json
+++ b/apps/wallet-mobile/src/i18n/locales/id-ID.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/it-IT.json b/apps/wallet-mobile/src/i18n/locales/it-IT.json
index c8385dac76..5e780df20c 100644
--- a/apps/wallet-mobile/src/i18n/locales/it-IT.json
+++ b/apps/wallet-mobile/src/i18n/locales/it-IT.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/ja-JP.json b/apps/wallet-mobile/src/i18n/locales/ja-JP.json
index c60cc6a859..f8e8bac29e 100644
--- a/apps/wallet-mobile/src/i18n/locales/ja-JP.json
+++ b/apps/wallet-mobile/src/i18n/locales/ja-JP.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/ko-KR.json b/apps/wallet-mobile/src/i18n/locales/ko-KR.json
index 83cb59ebf8..f57de71f4c 100644
--- a/apps/wallet-mobile/src/i18n/locales/ko-KR.json
+++ b/apps/wallet-mobile/src/i18n/locales/ko-KR.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/nl-NL.json b/apps/wallet-mobile/src/i18n/locales/nl-NL.json
index 51affae0a1..20354dd234 100644
--- a/apps/wallet-mobile/src/i18n/locales/nl-NL.json
+++ b/apps/wallet-mobile/src/i18n/locales/nl-NL.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/pl-PL.json b/apps/wallet-mobile/src/i18n/locales/pl-PL.json
index 2cad70cdf3..f08e12c2ce 100644
--- a/apps/wallet-mobile/src/i18n/locales/pl-PL.json
+++ b/apps/wallet-mobile/src/i18n/locales/pl-PL.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/pt-BR.json b/apps/wallet-mobile/src/i18n/locales/pt-BR.json
index 34e9cb35ce..2ddc6cae76 100644
--- a/apps/wallet-mobile/src/i18n/locales/pt-BR.json
+++ b/apps/wallet-mobile/src/i18n/locales/pt-BR.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/ru-RU.json b/apps/wallet-mobile/src/i18n/locales/ru-RU.json
index d6557037a8..1c01907770 100644
--- a/apps/wallet-mobile/src/i18n/locales/ru-RU.json
+++ b/apps/wallet-mobile/src/i18n/locales/ru-RU.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/sk-SK.json b/apps/wallet-mobile/src/i18n/locales/sk-SK.json
index 47bbebacf2..5184943ae6 100644
--- a/apps/wallet-mobile/src/i18n/locales/sk-SK.json
+++ b/apps/wallet-mobile/src/i18n/locales/sk-SK.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/sl-SI.json b/apps/wallet-mobile/src/i18n/locales/sl-SI.json
index 2cad70cdf3..f08e12c2ce 100644
--- a/apps/wallet-mobile/src/i18n/locales/sl-SI.json
+++ b/apps/wallet-mobile/src/i18n/locales/sl-SI.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/sv-SE.json b/apps/wallet-mobile/src/i18n/locales/sv-SE.json
index 2cad70cdf3..f08e12c2ce 100644
--- a/apps/wallet-mobile/src/i18n/locales/sv-SE.json
+++ b/apps/wallet-mobile/src/i18n/locales/sv-SE.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/sw-KE.json b/apps/wallet-mobile/src/i18n/locales/sw-KE.json
index 2cad70cdf3..f08e12c2ce 100644
--- a/apps/wallet-mobile/src/i18n/locales/sw-KE.json
+++ b/apps/wallet-mobile/src/i18n/locales/sw-KE.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/tr-TR.json b/apps/wallet-mobile/src/i18n/locales/tr-TR.json
index fea7b9cf0e..3d654fe886 100644
--- a/apps/wallet-mobile/src/i18n/locales/tr-TR.json
+++ b/apps/wallet-mobile/src/i18n/locales/tr-TR.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/uk-UA.json b/apps/wallet-mobile/src/i18n/locales/uk-UA.json
index 2cad70cdf3..f08e12c2ce 100644
--- a/apps/wallet-mobile/src/i18n/locales/uk-UA.json
+++ b/apps/wallet-mobile/src/i18n/locales/uk-UA.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/vi-VN.json b/apps/wallet-mobile/src/i18n/locales/vi-VN.json
index 0c1383f454..fd852fd1da 100644
--- a/apps/wallet-mobile/src/i18n/locales/vi-VN.json
+++ b/apps/wallet-mobile/src/i18n/locales/vi-VN.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/zh-Hans.json b/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
index d137a991d8..cc50fa3a15 100644
--- a/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
+++ b/apps/wallet-mobile/src/i18n/locales/zh-Hans.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",
diff --git a/apps/wallet-mobile/src/i18n/locales/zh-Hant.json b/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
index 795335249c..2d94a05b21 100644
--- a/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
+++ b/apps/wallet-mobile/src/i18n/locales/zh-Hant.json
@@ -189,7 +189,7 @@
   "swap.listOrders.timeCreated": "Time created",
   "swap.listOrders.timeCompleted": "Time completed",
   "swap.listOrders.txId": "Transaction ID",
-  "swap.listOrders.emptyOpenOrders": "No orders avaliable yet",
+  "swap.listOrders.emptyOpenOrders": "No orders available yet",
   "swap.listOrders.emptyOpenOrdersSub": "Start doing the swap operations to your open orders here",
   "swap.listOrders.emptyCompletedOrders": "No orders completed yet",
   "swap.swapScreen.limitPriceWarningTitle": "Limit price",