Merge branch 'dev' of github.com:safe-global/safe-wallet-web into nect

safe-global · Oct 27, 2023 · c35bc78 · c35bc78
2 parents 68655b7 + 04cd78f
commit c35bc78
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/components/new-safe/create/steps/StatusStep/useSafeCreationEffects.ts b/src/components/new-safe/create/steps/StatusStep/useSafeCreationEffects.ts
@@ -7,6 +7,7 @@ import { updateAddressBook } from '@/components/new-safe/create/logic/address-bo
 import { useAppDispatch } from '@/store'
 import useChainId from '@/hooks/useChainId'
 import { usePendingSafe } from './usePendingSafe'
+import { gtmSetSafeAddress } from '@/services/analytics/gtm'
 
 const useSafeCreationEffects = ({
   status,
@@ -74,6 +75,7 @@ const useSafeCreationEffects = ({
   // Tracking
   useEffect(() => {
     if (status === SafeCreationStatus.SUCCESS) {
+      pendingSafe?.safeAddress && gtmSetSafeAddress(pendingSafe.safeAddress)
       trackEvent(CREATE_SAFE_EVENTS.CREATED_SAFE)
       return
     }
@@ -82,7 +84,7 @@ const useSafeCreationEffects = ({
       trackEvent(CREATE_SAFE_EVENTS.REJECT_CREATE_SAFE)
       return
     }
-  }, [status])
+  }, [pendingSafe?.safeAddress, status])
 }
 
 export default useSafeCreationEffects
diff --git a/src/components/transactions/HumanDescription/index.tsx b/src/components/transactions/HumanDescription/index.tsx
@@ -58,14 +58,14 @@ export const TransferDescription = ({ txInfo, isSendTx }: { txInfo: Transfer; is
 export const HumanDescription = ({ fragments }: RichDecodedInfo) => {
   return (
     <>
-      {fragments.map((fragment) => {
+      {fragments.map((fragment, index) => {
         switch (fragment.type) {
           case RichFragmentType.Text:
-            return <span>{fragment.value}</span>
+            return <span key={index}>{fragment.value}</span>
           case RichFragmentType.Address:
-            return <AddressFragment fragment={fragment} />
+            return <AddressFragment key={index} fragment={fragment} />
           case RichFragmentType.TokenValue:
-            return <TokenValueFragment fragment={fragment} />
+            return <TokenValueFragment key={index} fragment={fragment} />
         }
       })}
     </>