From 7381a84ae4cf5fdd2135f138744d0cb131163b8d Mon Sep 17 00:00:00 2001
From: Amir Ekbatanifard <amiref007@gmail.com>
Date: Sun, 3 Nov 2024 12:17:53 +0330
Subject: [PATCH 1/2] fix: displaying locked amount btn

---
 .../delegate/partial/AmountWithOptionsAndLockAmount.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/extension-polkagate/src/fullscreen/governance/delegate/partial/AmountWithOptionsAndLockAmount.tsx b/packages/extension-polkagate/src/fullscreen/governance/delegate/partial/AmountWithOptionsAndLockAmount.tsx
index 70f098e5c..1411987d3 100644
--- a/packages/extension-polkagate/src/fullscreen/governance/delegate/partial/AmountWithOptionsAndLockAmount.tsx
+++ b/packages/extension-polkagate/src/fullscreen/governance/delegate/partial/AmountWithOptionsAndLockAmount.tsx
@@ -103,7 +103,7 @@ export default function AmountWithOptionsAndLockAmount({ accountLocks, amount, b
         label={t<string>('Amount ({{token}})', { replace: { token } })}
         onChangeAmount={onValueChange}
         onPrimary={onMaxAmount}
-        onSecondary={onLockedAmount}
+        onSecondary={lockedAmount && !lockedAmount?.isZero() ? onLockedAmount : undefined}
         primaryBtnText={t<string>('Max amount')}
         secondaryBtnText={t<string>('Locked amount')}
         style={{

From cf41c382265904043043478b4ee88be3ed02ea11 Mon Sep 17 00:00:00 2001
From: Amir Ekbatanifard <amiref007@gmail.com>
Date: Sun, 3 Nov 2024 15:51:14 +0330
Subject: [PATCH 2/2] fix: confilict

---
 .../AmountWithOptionsAndLockAmount.tsx        | 71 ++++++++++---------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/packages/extension-polkagate/src/fullscreen/governance/delegate/partial/AmountWithOptionsAndLockAmount.tsx b/packages/extension-polkagate/src/fullscreen/governance/delegate/partial/AmountWithOptionsAndLockAmount.tsx
index 41a90d1fc..7977d20c6 100644
--- a/packages/extension-polkagate/src/fullscreen/governance/delegate/partial/AmountWithOptionsAndLockAmount.tsx
+++ b/packages/extension-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>
   );
 };
 
@@ -133,8 +134,8 @@ export default function AmountWithOptionsAndLockAmount ({ accountLocks, amount,
         onChangeAmount={onValueChange}
         onPrimary={onMaxAmount}
         onSecondary={lockedAmount && !lockedAmount?.isZero() ? onLockedAmount : undefined}
-        primaryBtnText={t<string>('Max amount')}
-        secondaryBtnText={t<string>('Locked amount')}
+        primaryBtnText={t('Max amount')}
+        secondaryBtnText={t('Locked amount')}
         style={{
           '> div div div': { fontSize: '16px', fontWeight: 400 },
           fontSize: '16px',