Merge branch 'develop' into feat/swap-cancellation-hw

Emurgo · Oct 8, 2023 · 64841f7 · 64841f7
2 parents 6e0a9ec + 351f520
commit 64841f7
Show file tree

Hide file tree

Showing 37 changed files with 1,520 additions and 260 deletions.
diff --git a/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx b/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx
@@ -1,5 +1,5 @@
 import {createStackNavigator} from '@react-navigation/stack'
-import {swapApiMaker, swapManagerMaker, SwapProvider, swapStorageMaker} from '@yoroi/swap'
+import {supportedProviders, swapApiMaker, swapManagerMaker, SwapProvider, swapStorageMaker} from '@yoroi/swap'
 import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 import {StyleSheet, Text, TouchableOpacity, TouchableOpacityProps} from 'react-native'
@@ -53,6 +53,7 @@ export const TxHistoryNavigator = () => {
         isMainnet: wallet.networkId !== 300,
         stakingKey,
         primaryTokenId: wallet.primaryTokenInfo.id,
+        supportedProviders,
       }),
     [wallet.networkId, stakingKey, wallet.primaryTokenInfo.id],
   )

diff --git a/...ile/src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.stories.tsx b/...ile/src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.stories.tsx
@@ -18,13 +18,14 @@ storiesOf('Swap List Pool', module)
         {
           tokenA: {quantity: '4500000', tokenId: 'tokenA'},
           tokenB: {quantity: '9000000', tokenId: 'tokenB'},
+          ptPriceTokenA: '0',
+          ptPriceTokenB: '0',
           fee: '0.3', // 0.3%
           provider: 'minswap',
           price: 2,
           batcherFee: {quantity: '1', tokenId: ''},
           deposit: {quantity: '1', tokenId: ''},
           poolId: '0',
-          lastUpdate: '0',
           lpToken: {
             quantity: '0',
             tokenId: '0',
@@ -33,13 +34,14 @@ storiesOf('Swap List Pool', module)
         {
           tokenA: {quantity: '4500000', tokenId: 'tokenA'},
           tokenB: {quantity: '9000000', tokenId: 'tokenB'},
+          ptPriceTokenA: '0',
+          ptPriceTokenB: '0',
           fee: '0.3', // 0.3%
           provider: 'sundaeswap',
           price: 6,
           batcherFee: {quantity: '122', tokenId: ''},
           deposit: {quantity: '432', tokenId: ''},
           poolId: '23455',
-          lastUpdate: '235',
           lpToken: {
             quantity: '13524',
             tokenId: '1355',

diff --git a/apps/wallet-mobile/src/features/Swap/common/mocks.ts b/apps/wallet-mobile/src/features/Swap/common/mocks.ts
@@ -26,7 +26,6 @@ export const mocks = {
         batcherFee: {quantity: asQuantity(2500000), tokenId: ''},
         deposit: {quantity: asQuantity(2000000), tokenId: ''},
         fee: '0.05',
-        lastUpdate: '2023-09-08 09:56:13',
         lpToken: {
           quantity: asQuantity(68917682),
           tokenId: '0029cb7c88c7567b63d1a512c0ed626aa169688ec980730c0473b913.6c702083',
@@ -39,6 +38,8 @@ export const mocks = {
           quantity: asQuantity(231696922),
           tokenId: '208a2ca888886921513cb777bb832a8dc685c04de990480151f12150.53484942414441',
         },
+        ptPriceTokenA: '0',
+        ptPriceTokenB: '0',
       },
       slippage: 1,
       type: 'market' as Type,

diff --git a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json
@@ -4,209 +4,209 @@
     "defaultMessage": "!!!Receive",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 266,
+      "line": 267,
       "column": 16,
-      "index": 9262
+      "index": 9310
     },
     "end": {
-      "line": 269,
+      "line": 270,
       "column": 3,
-      "index": 9351
+      "index": 9399
     }
   },
   {
     "id": "swap.swapScreen.swapTitle",
     "defaultMessage": "!!!Swap",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 270,
+      "line": 271,
       "column": 13,
-      "index": 9366
+      "index": 9414
     },
     "end": {
-      "line": 273,
+      "line": 274,
       "column": 3,
-      "index": 9439
+      "index": 9487
     }
   },
   {
     "id": "swap.swapScreen.swapFrom",
     "defaultMessage": "!!!Swap from",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 274,
+      "line": 275,
       "column": 17,
-      "index": 9458
+      "index": 9506
     },
     "end": {
-      "line": 277,
+      "line": 278,
       "column": 3,
-      "index": 9535
+      "index": 9583
     }
   },
   {
     "id": "swap.swapScreen.swapTo",
     "defaultMessage": "!!!Swap to",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 278,
+      "line": 279,
       "column": 15,
-      "index": 9552
+      "index": 9600
     },
     "end": {
-      "line": 281,
+      "line": 282,
       "column": 3,
-      "index": 9625
+      "index": 9673
     }
   },
   {
     "id": "swap.swapScreen.slippageTolerance",
     "defaultMessage": "!!!Slippage Tolerance",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 282,
+      "line": 283,
       "column": 21,
-      "index": 9648
+      "index": 9696
     },
     "end": {
-      "line": 285,
+      "line": 286,
       "column": 3,
-      "index": 9743
+      "index": 9791
     }
   },
   {
     "id": "swap.swapScreen.selectPool",
     "defaultMessage": "!!!Select pool",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 286,
+      "line": 287,
       "column": 14,
-      "index": 9759
+      "index": 9807
     },
     "end": {
-      "line": 289,
+      "line": 290,
       "column": 3,
-      "index": 9840
+      "index": 9888
     }
   },
   {
     "id": "components.send.sendscreen.title",
     "defaultMessage": "!!!Send",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 290,
+      "line": 291,
       "column": 13,
-      "index": 9855
+      "index": 9903
     },
     "end": {
-      "line": 293,
+      "line": 294,
       "column": 3,
-      "index": 9935
+      "index": 9983
     }
   },
   {
     "id": "components.send.addressreaderqr.title",
     "defaultMessage": "!!!Scan QR code address",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 294,
+      "line": 295,
       "column": 18,
-      "index": 9955
+      "index": 10003
     },
     "end": {
-      "line": 297,
+      "line": 298,
       "column": 3,
-      "index": 10056
+      "index": 10104
     }
   },
   {
     "id": "components.send.selectasset.title",
     "defaultMessage": "!!!Select asset",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 298,
+      "line": 299,
       "column": 20,
-      "index": 10078
+      "index": 10126
     },
     "end": {
-      "line": 301,
+      "line": 302,
       "column": 3,
-      "index": 10167
+      "index": 10215
     }
   },
   {
     "id": "components.send.listamountstosendscreen.title",
     "defaultMessage": "!!!Selected tokens",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 302,
+      "line": 303,
       "column": 26,
-      "index": 10195
+      "index": 10243
     },
     "end": {
-      "line": 305,
+      "line": 306,
       "column": 3,
-      "index": 10299
+      "index": 10347
     }
   },
   {
     "id": "components.send.editamountscreen.title",
     "defaultMessage": "!!!Edit amount",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 306,
+      "line": 307,
       "column": 19,
-      "index": 10320
+      "index": 10368
     },
     "end": {
-      "line": 309,
+      "line": 310,
       "column": 3,
-      "index": 10413
+      "index": 10461
     }
   },
   {
     "id": "components.send.confirmscreen.title",
     "defaultMessage": "!!!Confirm",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 310,
+      "line": 311,
       "column": 16,
-      "index": 10431
+      "index": 10479
     },
     "end": {
-      "line": 313,
+      "line": 314,
       "column": 3,
-      "index": 10517
+      "index": 10565
     }
   },
   {
     "id": "components.receive.receivescreen.infoText",
     "defaultMessage": "!!!Share this address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 314,
+      "line": 315,
       "column": 19,
-      "index": 10538
+      "index": 10586
     },
     "end": {
-      "line": 320,
+      "line": 321,
       "column": 3,
-      "index": 10776
+      "index": 10824
     }
   },
   {
     "id": "global.confirmationTransaction",
     "defaultMessage": "!!!Confirm transaction",
     "file": "src/TxHistory/TxHistoryNavigator.tsx",
     "start": {
-      "line": 321,
+      "line": 322,
       "column": 27,
-      "index": 10805
+      "index": 10853
     },
     "end": {
-      "line": 324,
+      "line": 325,
       "column": 3,
-      "index": 10898
+      "index": 10946
     }
   }
 ]