fix(web): correct back button behavior and auto focus

SFTtech · Aug 26, 2023 · bda7ea4 · bda7ea4
1 parent ed84659
commit bda7ea4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/frontend/apps/web/src/pages/accounts/AccountDetail/AccountInfo.tsx b/frontend/apps/web/src/pages/accounts/AccountDetail/AccountInfo.tsx
@@ -87,7 +87,7 @@ export const AccountInfo: React.FC<Props> = ({ groupId, accountId }) => {
             .then(({ oldAccountId, account }) => {
                 setShowProgress(false);
                 if (oldAccountId !== account.id) {
-                    navigate(getAccountLink(groupId, "clearing", account.id) + "?no-redirect=true");
+                    navigate(getAccountLink(groupId, "clearing", account.id) + "?no-redirect=true", { replace: true });
                 }
             })
             .catch((err) => {

diff --git a/frontend/apps/web/src/pages/transactions/TransactionDetail/TransactionActions.tsx b/frontend/apps/web/src/pages/transactions/TransactionDetail/TransactionActions.tsx
@@ -12,7 +12,7 @@ import {
     LinearProgress,
 } from "@mui/material";
 import React, { useState } from "react";
-import { Link as RouterLink, useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { selectTransactionSlice, useAppSelector } from "../../../store";
 
 interface Props {

diff --git a/frontend/apps/web/src/pages/transactions/TransactionDetail/TransactionDetail.tsx b/frontend/apps/web/src/pages/transactions/TransactionDetail/TransactionDetail.tsx
@@ -137,7 +137,10 @@ export const TransactionDetail: React.FC<Props> = ({ groupId }) => {
             .then(({ oldTransactionId, transactionContainer }) => {
                 setShowProgress(false);
                 if (oldTransactionId !== transactionContainer.transaction.id) {
-                    navigate(`/groups/${groupId}/transactions/${transactionContainer.transaction.id}?no-redirect=true`);
+                    navigate(
+                        `/groups/${groupId}/transactions/${transactionContainer.transaction.id}?no-redirect=true`,
+                        { replace: true }
+                    );
                 }
             })
             .catch((err) => {

diff --git a/frontend/apps/web/src/pages/transactions/TransactionDetail/TransactionMetadata.tsx b/frontend/apps/web/src/pages/transactions/TransactionDetail/TransactionMetadata.tsx
@@ -125,7 +125,6 @@ export const TransactionMetadata: React.FC<Props> = ({
                         name="description"
                         variant="standard"
                         margin="dense"
-                        autoFocus
                         fullWidth
                         error={!!validationErrors.fieldErrors.description}
                         helperText={validationErrors.fieldErrors.description}
@@ -139,7 +138,6 @@ export const TransactionMetadata: React.FC<Props> = ({
                     name="value"
                     variant="standard"
                     margin="dense"
-                    autoFocus
                     fullWidth
                     error={!!validationErrors.fieldErrors.value}
                     helperText={validationErrors.fieldErrors.value}