import router in client.ts (#1086)

CruGlobal · Sep 23, 2024 · 6c1e09f · 6c1e09f
1 parent a536cc4
commit 6c1e09f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/pages/_app.page.tsx b/pages/_app.page.tsx
@@ -1,7 +1,6 @@
 import { NextPage } from 'next';
 import type { AppProps } from 'next/app';
 import Head from 'next/head';
-import { useRouter } from 'next/router';
 import React, { ReactElement, useMemo } from 'react';
 import { ApolloProvider } from '@apollo/client';
 import createEmotionCache from '@emotion/cache';
@@ -59,11 +58,7 @@ const GraphQLProviders: React.FC<{
   children: React.ReactNode;
 }> = ({ children = null }) => {
   const { apiToken } = useRequiredSession();
-  const { replace } = useRouter();
-  const client = useMemo(
-    () => makeClient(apiToken, replace),
-    [apiToken, replace],
-  );
+  const client = useMemo(() => makeClient(apiToken), [apiToken]);
 
   return (
     <ApolloProvider client={client}>

diff --git a/src/lib/apollo/client.ts b/src/lib/apollo/client.ts
@@ -1,4 +1,4 @@
-import { Router } from 'next/router';
+import router from 'next/router';
 import { ApolloClient, from } from '@apollo/client';
 import { onError } from '@apollo/client/link/error';
 import { LocalStorageWrapper, persistCache } from 'apollo3-cache-persist';
@@ -25,7 +25,7 @@ if (typeof window !== 'undefined' && process.env.NODE_ENV === 'production') {
   });
 }
 
-const makeClient = (apiToken: string, routerReplace: Router['replace']) => {
+const makeClient = (apiToken: string) => {
   const client = new ApolloClient({
     link: from([
       makeAuthLink(apiToken),
@@ -47,7 +47,7 @@ const makeClient = (apiToken: string, routerReplace: Router['replace']) => {
                 .then((response) => {
                   // eslint-disable-next-line no-console
                   console.log('Incorrect accountListId provided. Redirecting.');
-                  routerReplace(
+                  router.replace(
                     replaceUrlAccountList(
                       window.location.pathname,
                       response.data.user.defaultAccountList,