fix: displaying locked amount button (#1626)

* fix: displaying locked amount btn * fix: confilict
PolkaGate · Nov 3, 2024 · dbc15f0 · dbc15f0
1 parent 0fd9de8
commit dbc15f0
Showing 1 changed file with 35 additions and 34 deletions.
diff --git a/...n-polkagate/src/fullscreen/governance/delegate/partial/AmountWithOptionsAndLockAmount.tsx b/...n-polkagate/src/fullscreen/governance/delegate/partial/AmountWithOptionsAndLockAmount.tsx
@@ -40,40 +40,41 @@ interface AlreadyLockedTooltipTextProps {
 const AlreadyLockedTooltipText = ({ accountLocks, currentBlock, decimal, token }: AlreadyLockedTooltipTextProps) => {
   const { t } = useTranslation();
 
-  return (<Grid container item sx={{ maxHeight: '400px', overflow: 'hidden', overflowY: 'scroll' }}>
-    <Typography variant='body2'>
-      <Grid container spacing={2}>
-        <Grid item xs={2.5}>
-          {t('Ref.')}
-        </Grid>
-        <Grid item xs={3.6}>
-          {t('Amount')}
-        </Grid>
-        <Grid item xs={2.9}>
-          {t('Multiplier')}
-        </Grid>
-        <Grid item xs={3}>
-          {t('Expires')}
+  return (
+    <Grid container item sx={{ maxHeight: '400px', overflow: 'hidden', overflowY: 'scroll' }}>
+      <Typography variant='body2'>
+        <Grid container spacing={2}>
+          <Grid item xs={2.5}>
+            {t('Ref.')}
+          </Grid>
+          <Grid item xs={3.6}>
+            {t('Amount')}
+          </Grid>
+          <Grid item xs={2.9}>
+            {t('Multiplier')}
+          </Grid>
+          <Grid item xs={3}>
+            {t('Expires')}
+          </Grid>
+          {accountLocks.map((l, index) =>
+            <React.Fragment key={index}>
+              <Grid item xs={2.5}>
+                {isBn(l.refId) ? l.refId.toNumber() : 'N/A'}
+              </Grid>
+              <Grid item xs={3.6}>
+                {amountToHuman(l.total, decimal)} {token}
+              </Grid>
+              <Grid item xs={2.9}>
+                {l.locked === 'None' ? 'N/A' : l.locked.replace('Locked', '')}
+              </Grid>
+              <Grid item xs={3}>
+                {getLockedUntil(l.endBlock, currentBlock)}
+              </Grid>
+            </React.Fragment>
+          )}
         </Grid>
-        {accountLocks.map((l, index) =>
-          <React.Fragment key={index}>
-            <Grid item xs={2.5}>
-              {isBn(l.refId) ? l.refId.toNumber() : 'N/A'}
-            </Grid>
-            <Grid item xs={3.6}>
-              {amountToHuman(l.total, decimal)} {token}
-            </Grid>
-            <Grid item xs={2.9}>
-              {l.locked === 'None' ? 'N/A' : l.locked.replace('Locked', '')}
-            </Grid>
-            <Grid item xs={3}>
-              {getLockedUntil(l.endBlock, currentBlock)}
-            </Grid>
-          </React.Fragment>
-        )}
-      </Grid>
-    </Typography>
-  </Grid>
+      </Typography>
+    </Grid>
   );
 };
 
@@ -132,7 +133,7 @@ export default function AmountWithOptionsAndLockAmount ({ accountLocks, amount,
         label={t('Amount ({{token}})', { replace: { token } })}
         onChangeAmount={onValueChange}
         onPrimary={onMaxAmount}
-        onSecondary={onLockedAmount}
+        onSecondary={lockedAmount && !lockedAmount?.isZero() ? onLockedAmount : undefined}
         primaryBtnText={t('Max amount')}
         secondaryBtnText={t('Locked amount')}
         style={{