Merge branch 'main' into lykhoyda/update_settings_page

ChainSafe · Sep 22, 2023 · 76da7dc · 76da7dc
2 parents 38b3d8d + 707011a
commit 76da7dc
Show file tree

Hide file tree

Showing 5 changed files with 229 additions and 143 deletions.
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -17,7 +17,7 @@
     "@walletconnect/web3wallet": "^1.8.8",
     "dayjs": "^1.11.9",
     "eslint-plugin-ternary": "^2.0.0",
-    "graphql": "^16.7.1",
+    "graphql": "^16.8.1",
     "graphql-request": "^6.1.0",
     "graphql-ws": "^5.14.0",
     "react": "18.2.0",

diff --git a/packages/ui/src/pages/Creation/Summary.tsx b/packages/ui/src/pages/Creation/Summary.tsx
@@ -22,6 +22,7 @@ interface Props {
   isBalanceError?: boolean
   selectedMultisig?: MultiProxy['multisigs'][0] // this is only relevant for swaps
   withProxy?: boolean
+  isSubmittingExtrinsic?: boolean
 }
 
 const Summary = ({
@@ -34,7 +35,8 @@ const Summary = ({
   balanceMin,
   isBalanceError,
   selectedMultisig,
-  withProxy = true
+  withProxy = true,
+  isSubmittingExtrinsic = false
 }: Props) => {
   const { ownAddressList } = useAccounts()
   const { chainInfo } = useApi()
@@ -118,8 +120,8 @@ const Summary = ({
           possibleSigners={possibleSigners}
         />
       </Box>
-      {isBalanceError && balanceMin && (
-        <Alert severity="warning">
+      {isBalanceError && balanceMin && !isSubmittingExtrinsic && (
+        <Alert severity="error">
           The selected signer requires at least{' '}
           {formatBnBalance(balanceMin, chainInfo?.tokenDecimals, {
             tokenSymbol: chainInfo?.tokenSymbol

diff --git a/packages/ui/src/pages/Creation/index.tsx b/packages/ui/src/pages/Creation/index.tsx
@@ -415,6 +415,7 @@ const MultisigCreation = ({ className }: Props) => {
               isBalanceError={!hasSignerEnoughFunds}
               balanceMin={neededBalance}
               withProxy={withProxy}
+              isSubmittingExtrinsic={isSubmitted}
             />
           </Grid>
         )}