diff --git a/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.tsx b/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.tsx
index eece263d79..6648dad69a 100644
--- a/apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/ManageCollateral/ManageCollateralScreen.tsx
+++ b/apps/wallet-mobile/src/features/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
index 2d1a63f810..be7c66df22 100644
--- 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 (
@@ -34,7 +34,7 @@ export const FailedTxScreen = () => {
-
+
)
diff --git a/apps/wallet-mobile/src/legacy/Dashboard/ShowSubmittedTxScreen/SubmittedTxScreen.tsx b/apps/wallet-mobile/src/legacy/Dashboard/ShowSubmittedTxScreen/SubmittedTxScreen.tsx
index 5b1316213c..328fe0767c 100644
--- 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 (
@@ -34,7 +33,7 @@ export const SubmittedTxScreen = () => {
-
+
)
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/ShowFailedTxScreen/FailedTxScreen.json b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/ShowFailedTxScreen/FailedTxScreen.json
index 984b3db2ba..5d71eeb2ba 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/ShowFailedTxScreen/FailedTxScreen.json
+++ b/apps/wallet-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
}
}
]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/ShowSubmittedTxScreen/SubmittedTxScreen.json b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/ShowSubmittedTxScreen/SubmittedTxScreen.json
index dd8bc7f888..65441492cb 100644
--- a/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/ShowSubmittedTxScreen/SubmittedTxScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/legacy/Dashboard/ShowSubmittedTxScreen/SubmittedTxScreen.json
@@ -4,14 +4,14 @@
"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
}
},
{
@@ -19,14 +19,14 @@
"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
}
},
{
@@ -34,14 +34,14 @@
"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
}
}
]
\ No newline at end of file