Merge branch 'dev' into 'staging'

--

See merge request frontend/marketplace!225

src/pages/QuizPayment/QuizPayment.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import { ApologyPage } from "../ApologyPage";
-import { useNavigate } from "react-router-dom";
+import { redirect, useNavigate } from "react-router-dom";
 import {
   clearAuthToken,
   getMessageFromFetchError,
@@ -78,9 +78,7 @@ export default function QuizPayment() {
           // setAuthToken(data.data.accessToken)
           setUserId(userId);
 
-          navigate(`/payment`, {
-            replace: true,
-          });
+          redirect(`/payment`);
           // useUserFetcher({
           // 	url: process.env.REACT_APP_DOMAIN + `/user/${userId}`,
           // 	userId,