fix: Show recommended nonce when nonce is 0, fix msgSummary layout (#…

…2562)
safe-global · Sep 28, 2023 · a44252b · a44252b
1 parent d1a0a56
commit a44252b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/safe-messages/MsgSummary/index.tsx b/src/components/safe-messages/MsgSummary/index.tsx
@@ -34,7 +34,7 @@ const MsgSummary = ({ msg }: { msg: SafeMessage }): ReactElement => {
   const isConfirmed = msg.status === SafeMessageStatus.CONFIRMED
 
   return (
-    <Box className={classNames(txSummaryCss.gridContainer, txSummaryCss.columnTemplateWithoutNonce)}>
+    <Box className={classNames(txSummaryCss.gridContainer, txSummaryCss.columnTemplate)}>
       <Box gridArea="type" className={txSummaryCss.columnWrap}>
         <MsgType msg={msg} />
       </Box>

diff --git a/src/components/tx/SignOrExecuteForm/hooks.ts b/src/components/tx/SignOrExecuteForm/hooks.ts
@@ -170,7 +170,7 @@ export const useRecommendedNonce = (): number | undefined => {
 
       const recommendedNonce = await getRecommendedNonce(safe.chainId, safeAddress)
 
-      return recommendedNonce ? Math.max(safe.nonce, recommendedNonce) : undefined
+      return recommendedNonce !== undefined ? Math.max(safe.nonce, recommendedNonce) : undefined
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [safeAddress, safe.chainId, safe.txQueuedTag], // update when tx queue changes