From c0ae83941324f56489a6bbb0b13c39fc9b9fa238 Mon Sep 17 00:00:00 2001
From: storywithoutend <storywithoutend@gmail.com>
Date: Wed, 20 Nov 2024 21:06:48 +0800
Subject: [PATCH] added additional condition for router ready and function to
 remove renew parameter from query

---
 src/hooks/pages/profile/useRenew/useRenew.ts | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/hooks/pages/profile/useRenew/useRenew.ts b/src/hooks/pages/profile/useRenew/useRenew.ts
index fe7b34e47..3ce349a8f 100644
--- a/src/hooks/pages/profile/useRenew/useRenew.ts
+++ b/src/hooks/pages/profile/useRenew/useRenew.ts
@@ -21,6 +21,7 @@ export const calculateRenewState = ({
   connectModalOpen,
   accountStatus,
   isAbilitiesLoading,
+  isRouterReady,
   name,
 }: {
   registrationStatus?: RegistrationStatus
@@ -30,11 +31,13 @@ export const calculateRenewState = ({
   openConnectModal: ReturnType<typeof useConnectModal>['openConnectModal']
   accountStatus: ReturnType<typeof useAccount>['status']
   isAbilitiesLoading: boolean
+  isRouterReady: boolean
   name?: string
 }): RenewStatus => {
   const isNameRegisteredOrGracePeriod =
     registrationStatus === 'registered' || registrationStatus === 'gracePeriod'
   const isRenewActive =
+    isRouterReady &&
     !isRegistrationStatusLoading &&
     !!name &&
     isNameRegisteredOrGracePeriod &&
@@ -47,6 +50,19 @@ export const calculateRenewState = ({
   return 'idle'
 }
 
+export const removeRenewParam = ({
+  query,
+}: {
+  query: ReturnType<typeof useRouterWithHistory>['query']
+}): string => {
+  const searchParams = new URLSearchParams(query as any)
+  // remove the name param in case the page is a redirect from /profile page
+  searchParams.delete('name')
+  searchParams.delete('renew')
+  const newParams = searchParams.toString()
+  return newParams ? `?${newParams}` : ''
+}
+
 export function useRenew(name: string) {
   const router = useRouterWithHistory()
   const { registrationStatus, isLoading: isBasicNameLoading } = useBasicName({ name })
@@ -70,6 +86,7 @@ export function useRenew(name: string) {
     accountStatus: status,
     isAbilitiesLoading,
     name,
+    isRouterReady: router.isReady,
     openConnectModal,
   })
 
@@ -82,7 +99,8 @@ export function useRenew(name: string) {
           isSelf: canSelfExtend,
           seconds: renewSeconds!,
         })
-        router.replace(`/${name}`)
+        const params = removeRenewParam({ query: router.query })
+        router.replace(`/${name}${params}`)
       })
       .with('idle', () => {})
       .exhaustive()