Merge branch 'main' into ahe/discount-api

guardian · Dec 14, 2023 · bd92664 · bd92664
2 parents bd3d214 + 4121257
commit bd92664
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/client/components/mma/accountoverview/manageProducts/ManageProductV2.tsx b/client/components/mma/accountoverview/manageProducts/ManageProductV2.tsx
@@ -14,7 +14,7 @@ import {
 	SvgClock,
 	SvgCreditCard,
 } from '@guardian/source-react-components';
-import { Navigate, useLocation, useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { PageContainer } from '@/client/components/mma/Page';
 import { ErrorIcon } from '@/client/components/mma/shared/assets/ErrorIcon';
 import { JsonResponseHandler } from '@/client/components/mma/shared/asyncComponents/DefaultApiResponseHandler';
@@ -275,6 +275,8 @@ interface ManageProductV2RouterState {
 }
 
 const AsyncLoadedInnerContent = (props: WithProductType<ProductType>) => {
+	const navigate = useNavigate();
+
 	const request = createProductDetailFetcher(
 		props.productType.allProductsProductTypeFilterString,
 	);
@@ -292,7 +294,8 @@ const AsyncLoadedInnerContent = (props: WithProductType<ProductType>) => {
 	}
 
 	if (data == null || data.products.length == 0) {
-		return <Navigate to="/" />;
+		navigate('/');
+		return null;
 	}
 
 	const productDetail = data.products.filter(isProduct)[0];

diff --git a/client/components/mma/cancel/cancellationSaves/SelectReason.tsx b/client/components/mma/cancel/cancellationSaves/SelectReason.tsx
@@ -216,7 +216,7 @@ export const SelectReason = () => {
 			const canContinue = !!selectedReasonId.length;
 			if (canContinue) {
 				await postReason();
-				navigate(navigateToReminder ? '../reminder' : './', {
+				navigate(navigateToReminder ? '../reminder' : '/', {
 					state: {
 						selectedReasonId,
 					},