From a44252b930248ab557adb04e3b79cfc666d06da9 Mon Sep 17 00:00:00 2001
From: Usame Algan <5880855+usame-algan@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:33:07 +0200
Subject: [PATCH] fix: Show recommended nonce when nonce is 0, fix msgSummary
 layout (#2562)

---
 src/components/safe-messages/MsgSummary/index.tsx | 2 +-
 src/components/tx/SignOrExecuteForm/hooks.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/safe-messages/MsgSummary/index.tsx b/src/components/safe-messages/MsgSummary/index.tsx
index 21651cd01b..87fe2b9752 100644
--- 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
index 2cf77b95e0..a0a4a712c0 100644
--- 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