Merge branch 'feat/safe-sign-text' into tmp/20241101

RabbyHub · Nov 1, 2024 · e21acfa · e21acfa
2 parents 412def1 + 44f4822
commit e21acfa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/src/ui/views/Approval/components/SignText.tsx b/src/ui/views/Approval/components/SignText.tsx
@@ -595,7 +595,11 @@ const SignText = ({ params }: { params: SignTextProps }) => {
             safeInfo={safeInfo}
             onCancel={handleDrawerCancel}
             onConfirm={handleGnosisConfirm}
-            confirmations={currentSafeMessage?.safeMessage?.confirmations}
+            confirmations={
+              isGnosisAccount
+                ? currentSafeMessage?.safeMessage?.confirmations || []
+                : undefined
+            }
           />
         </Drawer>
       )}

diff --git a/src/ui/views/Approval/components/SignTypedData.tsx b/src/ui/views/Approval/components/SignTypedData.tsx
@@ -748,7 +748,11 @@ const SignTypedData = ({ params }: { params: SignTypedDataProps }) => {
               safeInfo={safeInfo}
               onCancel={handleDrawerCancel}
               onConfirm={handleGnosisConfirm}
-              confirmations={currentSafeMessage?.safeMessage?.confirmations}
+              confirmations={
+                isGnosisAccount
+                  ? currentSafeMessage?.safeMessage?.confirmations || []
+                  : undefined
+              }
             />
           </Drawer>
         )}

diff --git a/src/ui/views/GnosisQueue/components/GnosisMessageQueue/GnosisMessageExplain.tsx b/src/ui/views/GnosisQueue/components/GnosisMessageQueue/GnosisMessageExplain.tsx
@@ -9,6 +9,7 @@ import { Button, Skeleton } from 'antd';
 import { isString } from 'lodash';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
+import IconUnknown from 'ui/assets/icon-unknown.svg';
 
 export const GnosisMessageExplain = ({
   onView,
@@ -69,6 +70,8 @@ export const GnosisMessageExplain = ({
 
   return (
     <div className="tx-explain">
+      {/* todo icon */}
+      <img className="icon icon-explain" src={IconUnknown} />
       <span>{content}</span>
       <Button
         type="primary"

diff --git a/src/ui/views/GnosisQueue/style.less b/src/ui/views/GnosisQueue/style.less
@@ -98,6 +98,7 @@
           line-height: 15px;
           color: #ffffff;
           height: auto;
+          box-shadow: none !important;
         }
       }
     }
@@ -143,6 +144,7 @@
           }
           background-color: #8697ff1a !important;
           box-shadow: none;
+          color: var(--r-blue-default) !important;
         }
       }
     }