From 07f9ed7db66417dc398a2f2a919c6c6e01e4208d Mon Sep 17 00:00:00 2001
From: Usame Algan <usame@safe.global>
Date: Thu, 10 Oct 2024 13:44:07 +0200
Subject: [PATCH] fix: Copy owners to address book when replaying safe

---
 src/components/new-safe/create/steps/ReviewStep/index.tsx | 2 +-
 .../multichain/components/CreateSafeOnNewChain/index.tsx  | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/new-safe/create/steps/ReviewStep/index.tsx b/src/components/new-safe/create/steps/ReviewStep/index.tsx
index f9a195c414..96af64a8ec 100644
--- a/src/components/new-safe/create/steps/ReviewStep/index.tsx
+++ b/src/components/new-safe/create/steps/ReviewStep/index.tsx
@@ -263,7 +263,7 @@ const ReviewStep = ({ data, onSubmit, onBack, setStep }: StepRenderProps<NewSafe
       gtmSetChainId(chain.chainId)
 
       if (isCounterfactualEnabled && payMethod === PayMethod.PayLater) {
-        router?.push({
+        await router?.push({
           pathname: AppRoutes.home,
           query: { safe: `${data.networks[0].shortName}:${safeAddress}` },
         })
diff --git a/src/features/multichain/components/CreateSafeOnNewChain/index.tsx b/src/features/multichain/components/CreateSafeOnNewChain/index.tsx
index 376a9c0a16..2839301922 100644
--- a/src/features/multichain/components/CreateSafeOnNewChain/index.tsx
+++ b/src/features/multichain/components/CreateSafeOnNewChain/index.tsx
@@ -2,6 +2,7 @@ import ModalDialog from '@/components/common/ModalDialog'
 import NetworkInput from '@/components/common/NetworkInput'
 import { updateAddressBook } from '@/components/new-safe/create/logic/address-book'
 import ErrorMessage from '@/components/tx/ErrorMessage'
+import useAddressBook from '@/hooks/useAddressBook'
 import { CREATE_SAFE_CATEGORY, CREATE_SAFE_EVENTS, OVERVIEW_EVENTS, trackEvent } from '@/services/analytics'
 import { gtmSetChainId } from '@/services/analytics/gtm'
 import { showNotification } from '@/store/notificationsSlice'
@@ -60,6 +61,7 @@ const ReplaySafeDialog = ({
   })
   const { handleSubmit, formState } = formMethods
   const router = useRouter()
+  const addressBook = useAddressBook()
 
   const customRpc = useAppSelector(selectRpc)
   const dispatch = useAppDispatch()
@@ -73,6 +75,7 @@ const ReplaySafeDialog = ({
     trackEvent({ ...OVERVIEW_EVENTS.CANCEL_ADD_NEW_NETWORK })
     onClose()
   }
+  console.log(addressBook)
 
   const onFormSubmit = handleSubmit(async (data) => {
     setIsSubmitting(true)
@@ -127,7 +130,10 @@ const ReplaySafeDialog = ({
           [selectedChain.chainId],
           safeAddress,
           currentName || '',
-          safeCreationData.safeAccountConfig.owners.map((owner) => ({ address: owner, name: '' })),
+          safeCreationData.safeAccountConfig.owners.map((owner) => ({
+            address: owner,
+            name: addressBook[owner] || '',
+          })),
           safeCreationData.safeAccountConfig.threshold,
         ),
       )