diff --git a/frontend/src/components/RobotAvatar/index.tsx b/frontend/src/components/RobotAvatar/index.tsx
index f655a131..7d2da0b0 100644
--- a/frontend/src/components/RobotAvatar/index.tsx
+++ b/frontend/src/components/RobotAvatar/index.tsx
@@ -128,7 +128,7 @@ const RobotAvatar: React.FC<Props> = ({
         />
       );
     }
-  }, [nickname, nicknameReady, avatarSrc]);
+  }, [nickname, nicknameReady, avatarSrc, statusColor, tooltip]);
 
   const getAvatarWithBadges = useCallback(() => {
     let component = avatar;
diff --git a/frontend/src/components/TradeBox/Prompts/Successful.tsx b/frontend/src/components/TradeBox/Prompts/Successful.tsx
index 05d515d4..4c9e7abb 100644
--- a/frontend/src/components/TradeBox/Prompts/Successful.tsx
+++ b/frontend/src/components/TradeBox/Prompts/Successful.tsx
@@ -151,7 +151,7 @@ export const SuccessfulPrompt = ({
         </Alert>
       </Collapse>
 
-      <Collapse in={order.tx_queued && order.address != undefined}>
+      <Collapse in={order.tx_queued && order.address != undefined && !order.txid}>
         <Alert severity='info'>
           <AlertTitle>
             <CircularProgress sx={{ maxWidth: '0.8em', maxHeight: '0.8em' }} />