Merge branch 'develop' into YV-47-alt

Emurgo · Jan 8, 2025 · 74e5d4b · 74e5d4b
2 parents e23fa49 + 522cf9b
commit 74e5d4b
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/...allet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx b/...allet-mobile/src/features/Send/useCases/ListAmountsToSend/EditAmount/EditAmountScreen.tsx
@@ -75,6 +75,7 @@ export const EditAmountScreen = () => {
     (text: string) => {
       try {
         const [input, quantity] = Quantities.parseFromText(text, amount.info.decimals ?? 0, numberLocale)
+
         setInputValue(input)
         setQuantity(BigInt(quantity))
       } catch (error) {
@@ -85,10 +86,9 @@ export const EditAmountScreen = () => {
   )
 
   const handleOnMaxBalance = React.useCallback(() => {
-    const [input, quantity] = Quantities.parseFromText(spendable.toString(), amount.info.decimals ?? 0, numberLocale)
-    setInputValue(input)
-    setQuantity(BigInt(quantity))
-  }, [amount.info.decimals, numberLocale, spendable])
+    setInputValue(atomicBreakdown(spendable, amount.info.decimals).bn.toFormat())
+    setQuantity(spendable)
+  }, [amount.info.decimals, spendable])
 
   const handleOnApply = React.useCallback(() => {
     amountChanged({

diff --git a/...atures/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.tsx b/...atures/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.tsx
@@ -54,7 +54,7 @@ export const ManageCollateralScreen = () => {
   const {openModal, closeModal} = useModal()
   const strings = useStrings()
   const balances = useBalances(wallet)
-  const {navigateToTxReview} = useWalletNavigation()
+  const {navigateToTxReview, resetToTxHistory} = useWalletNavigation()
   const {unsignedTxChanged} = useReviewTx()
   const lockedAmount = asQuantity(wallet.primaryBreakdown.lockedAsStorageCost.toString())
 
@@ -79,6 +79,7 @@ export const ManageCollateralScreen = () => {
   const onSuccess = (signedTx: YoroiSignedTx) => {
     const collateralId = `${signedTx.signedTx.id}:0`
     setCollateralId(collateralId)
+    resetToTxHistory()
   }
 
   const createCollateralTransaction = () => {

diff --git a/apps/wallet-mobile/src/legacy/Dashboard/ShowFailedTxScreen/FailedTxScreen.tsx b/apps/wallet-mobile/src/legacy/Dashboard/ShowFailedTxScreen/FailedTxScreen.tsx
@@ -8,14 +8,14 @@ import {SafeArea} from '../../../components/SafeArea'
 import {Space} from '../../../components/Space/Space'
 import {Spacer} from '../../../components/Spacer/Spacer'
 import {FailedTxIcon} from '../../../features/ReviewTx/illustrations/FailedTxIcon'
-import {useBlockGoBack} from '../../../kernel/navigation'
-import {useNavigateTo} from '../Dashboard'
+import {useBlockGoBack, useWalletNavigation} from '../../../kernel/navigation'
 
 export const FailedTxScreen = () => {
   useBlockGoBack()
   const {styles} = useStyles()
   const strings = useStrings()
-  const navigateTo = useNavigateTo()
+
+  const {resetToTxHistory} = useWalletNavigation()
 
   return (
     <SafeArea style={styles.root}>
@@ -34,7 +34,7 @@ export const FailedTxScreen = () => {
       <Space fill />
 
       <Actions>
-        <Button onPress={navigateTo.stakingCenter} title={strings.failedTxButton} style={styles.button} />
+        <Button onPress={resetToTxHistory} title={strings.failedTxButton} style={styles.button} />
       </Actions>
     </SafeArea>
   )

diff --git a/apps/wallet-mobile/src/legacy/Dashboard/ShowSubmittedTxScreen/SubmittedTxScreen.tsx b/apps/wallet-mobile/src/legacy/Dashboard/ShowSubmittedTxScreen/SubmittedTxScreen.tsx
@@ -8,14 +8,13 @@ import {SafeArea} from '../../../components/SafeArea'
 import {Space} from '../../../components/Space/Space'
 import {Spacer} from '../../../components/Spacer/Spacer'
 import {SuccessfulTxIcon} from '../../../features/ReviewTx/illustrations/SuccessfulTxIcon'
-import {useBlockGoBack} from '../../../kernel/navigation'
-import {useNavigateTo} from '../Dashboard'
+import {useBlockGoBack, useWalletNavigation} from '../../../kernel/navigation'
 
 export const SubmittedTxScreen = () => {
   useBlockGoBack()
   const strings = useStrings()
   const {styles} = useStyles()
-  const navigateTo = useNavigateTo()
+  const {resetToTxHistory} = useWalletNavigation()
 
   return (
     <SafeArea style={styles.root}>
@@ -34,7 +33,7 @@ export const SubmittedTxScreen = () => {
       <Space fill />
 
       <Actions>
-        <Button onPress={navigateTo.submittedTx} title={strings.submittedTxButton} style={styles.button} />
+        <Button onPress={resetToTxHistory} title={strings.submittedTxButton} style={styles.button} />
       </Actions>
     </SafeArea>
   )

diff --git a/...-mobile/translations/messages/src/legacy/Dashboard/ShowFailedTxScreen/FailedTxScreen.json b/...-mobile/translations/messages/src/legacy/Dashboard/ShowFailedTxScreen/FailedTxScreen.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 91,
       "column": 17,
-      "index": 2311
+      "index": 2296
     },
     "end": {
       "line": 94,
       "column": 3,
-      "index": 2408
+      "index": 2393
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 95,
       "column": 16,
-      "index": 2426
+      "index": 2411
     },
     "end": {
       "line": 98,
       "column": 3,
-      "index": 2578
+      "index": 2563
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 99,
       "column": 18,
-      "index": 2598
+      "index": 2583
     },
     "end": {
       "line": 102,
       "column": 3,
-      "index": 2688
+      "index": 2673
     }
   }
 ]
diff --git a/...e/translations/messages/src/legacy/Dashboard/ShowSubmittedTxScreen/SubmittedTxScreen.json b/...e/translations/messages/src/legacy/Dashboard/ShowSubmittedTxScreen/SubmittedTxScreen.json
@@ -4,44 +4,44 @@
     "defaultMessage": "!!!Transaction signed",
     "file": "src/legacy/Dashboard/ShowSubmittedTxScreen/SubmittedTxScreen.tsx",
     "start": {
-      "line": 92,
+      "line": 91,
       "column": 20,
-      "index": 2375
+      "index": 2361
     },
     "end": {
-      "line": 95,
+      "line": 94,
       "column": 3,
-      "index": 2476
+      "index": 2462
     }
   },
   {
     "id": "components.delegation.submittedTx.text",
     "defaultMessage": "!!!It will show up in the transaction list once it's confirmed by the network.",
     "file": "src/legacy/Dashboard/ShowSubmittedTxScreen/SubmittedTxScreen.tsx",
     "start": {
-      "line": 96,
+      "line": 95,
       "column": 19,
-      "index": 2497
+      "index": 2483
     },
     "end": {
-      "line": 99,
+      "line": 98,
       "column": 3,
-      "index": 2654
+      "index": 2640
     }
   },
   {
     "id": "components.delegation.submittedTx.button",
     "defaultMessage": "!!!Close",
     "file": "src/legacy/Dashboard/ShowSubmittedTxScreen/SubmittedTxScreen.tsx",
     "start": {
-      "line": 100,
+      "line": 99,
       "column": 21,
-      "index": 2677
+      "index": 2663
     },
     "end": {
-      "line": 103,
+      "line": 102,
       "column": 3,
-      "index": 2766
+      "index": 2752
     }
   }
 ]