fix: back button navigate (#390)

stationmoney · May 26, 2023 · 4f90330 · 4f90330
1 parent 52f4b3d
commit 4f90330
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 18 deletions.
diff --git a/src/auth/modules/create/RecoverWalletPage.tsx b/src/auth/modules/create/RecoverWalletPage.tsx
@@ -6,7 +6,7 @@ const RecoverWalletPage = () => {
   const { t } = useTranslation()
 
   return (
-    <Page title={t("Import from seed phrase")} backButton small>
+    <Page title={t("Import from seed phrase")} backButtonPath="/" small>
       <Card>
         <RecoverWalletForm />
       </Card>

diff --git a/src/components/layout/Page.tsx b/src/components/layout/Page.tsx
@@ -16,7 +16,7 @@ interface Props extends QueryState {
   small?: boolean
   sub?: boolean // used as a page in a page
   invisible?: boolean // used as a page in a page with no margin
-  backButton?: boolean
+  backButtonPath?: string
 }
 
 const Page = (props: PropsWithChildren<Props>) => {
@@ -29,7 +29,7 @@ const Page = (props: PropsWithChildren<Props>) => {
     sub,
     invisible,
     mainClassName,
-    backButton,
+    backButtonPath,
   } = props
 
   return (
@@ -43,7 +43,9 @@ const Page = (props: PropsWithChildren<Props>) => {
               {title && (
                 <header className={styles.header}>
                   <div className={styles.titleWrapper}>
-                    {backButton && <ArrowBack onClick={() => navigate(-1)} />}
+                    {backButtonPath && (
+                      <ArrowBack onClick={() => navigate(backButtonPath)} />
+                    )}
                     <h1 className={styles.title}>{title}</h1>
                   </div>
                   {extra}

diff --git a/src/pages/gov/ProposalDetails.tsx b/src/pages/gov/ProposalDetails.tsx
@@ -21,11 +21,12 @@ const ProposalDetails = () => {
 
   useGoBackOnError(state)
 
-  const render = () => {
-    if (!proposal) return null
-
-    const { status } = proposal
+  if (!proposal) {
+    return null
+  }
+  const { status } = proposal
 
+  const render = () => {
     return (
       <Col>
         <Row>
@@ -70,7 +71,7 @@ const ProposalDetails = () => {
       {...state}
       title={t("Proposal details")}
       extra={proposal && <ProposalActions proposal={proposal} />}
-      backButton
+      backButtonPath={`/gov#${status}`}
     >
       {render()}
     </Page>

diff --git a/src/pages/multisig/SignMultisigTxPage.tsx b/src/pages/multisig/SignMultisigTxPage.tsx
@@ -22,7 +22,7 @@ const SignMultisigTxPage = () => {
   }
 
   return (
-    <Page backButton title={t("Sign a multisig tx")}>
+    <Page backButtonPath="/" title={t("Sign a multisig tx")}>
       {render()}
     </Page>
   )

diff --git a/src/pages/stake/ValidatorDetails.tsx b/src/pages/stake/ValidatorDetails.tsx
@@ -33,7 +33,7 @@ const ValidatorDetails = () => {
   }
 
   return (
-    <Page {...state} title={t("Validator details")} backButton>
+    <Page {...state} title={t("Validator details")} backButtonPath="/stake">
       {render()}
     </Page>
   )

diff --git a/src/txs/gov/DepositTx.tsx b/src/txs/gov/DepositTx.tsx
@@ -11,7 +11,7 @@ const DepositTx = () => {
   const { data: proposal, ...state } = useProposal(id, chain)
 
   return (
-    <Page title={t("Deposit")} backButton>
+    <Page title={t("Deposit")} backButtonPath={`/proposal/${chain}/${id}`}>
       <Auto
         columns={[
           <Card inputCard>

diff --git a/src/txs/gov/SubmitProposalTx.tsx b/src/txs/gov/SubmitProposalTx.tsx
@@ -12,7 +12,7 @@ const SubmitProposalTx = () => {
   }
 
   return (
-    <Page backButton title={t("New proposal")} small>
+    <Page backButtonPath="/gov" title={t("New proposal")} small>
       <ChainFilter outside>{(chain) => render(chain)}</ChainFilter>
     </Page>
   )

diff --git a/src/txs/gov/VoteTx.tsx b/src/txs/gov/VoteTx.tsx
@@ -11,7 +11,7 @@ const VoteTx = () => {
   const { data: proposal, ...state } = useProposal(id, chain)
 
   return (
-    <Page backButton title={t("Vote")}>
+    <Page backButtonPath={`/proposal/${chain}/${id}`} title={t("Vote")}>
       <Auto
         columns={[
           <Card inputCard>

diff --git a/src/txs/stake/StakeTx.tsx b/src/txs/stake/StakeTx.tsx
@@ -109,7 +109,7 @@ const StakeTx = () => {
   }
 
   return (
-    <Page {...state} title={t("Delegate")} backButton>
+    <Page {...state} title={t("Delegate")} backButtonPath="/stake">
       <Auto
         columns={[
           <Tabs

diff --git a/src/txs/stake/WithdrawRewards.tsx b/src/txs/stake/WithdrawRewards.tsx
@@ -32,7 +32,12 @@ const WithdrawRewards = () => {
   }
 
   return (
-    <Page {...state} backButton title={t("Withdraw rewards")} small>
+    <Page
+      {...state}
+      backButtonPath="/stake"
+      title={t("Withdraw rewards")}
+      small
+    >
       {render()}
     </Page>
   )

diff --git a/src/txs/wasm/InstantiateContractTx.tsx b/src/txs/wasm/InstantiateContractTx.tsx
@@ -7,7 +7,7 @@ const InstantiateContractTx = () => {
   const { t } = useTranslation()
 
   return (
-    <Page title={t("Instantiate a code")} small backButton>
+    <Page title={t("Instantiate a code")} small backButtonPath="/contract">
       <ChainFilter>
         {(chainID) => (
           <IBCHelperContext>

diff --git a/src/txs/wasm/StoreCodeTx.tsx b/src/txs/wasm/StoreCodeTx.tsx
@@ -6,7 +6,7 @@ const StoreCodeTx = () => {
   const { t } = useTranslation()
 
   return (
-    <Page title={t("Upload a wasm file")} small backButton>
+    <Page title={t("Upload a wasm file")} small backButtonPath="/contract">
       <ChainFilter>
         {(chainID) => <StoreCodeForm chainID={chainID ?? ""} />}
       </ChainFilter>