Merge pull request #753 from bancorprotocol/feature/vote-bnt

bancorprotocol · Nov 7, 2023 · f7cbd0a · f7cbd0a
2 parents 357a8d9 + 304c98f
commit f7cbd0a
Show file tree

Hide file tree

Showing 24 changed files with 603 additions and 347 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,6 @@ Open Source Token Swap and Pool Liquidity Portal
 |                 | City                                                                |
 | --------------- | ------------------------------------------------------------------- |
 | Jan Langheimer  | [Freiburg](https://www.timeanddate.com/worldclock/germany/freiburg) |
-| Ran Cohen       | [Tel Aviv](https://www.timeanddate.com/worldclock/israel/tel-aviv)  |
 | Doron Z         | [Tel Aviv](https://www.timeanddate.com/worldclock/israel/tel-aviv)  |
 
 ## How to contribute

diff --git a/src/components/button/Button.stories.tsx b/src/components/button/Button.stories.tsx
@@ -71,7 +71,7 @@ export const Playground: ComponentStory<typeof Button> = (args) => (
 Playground.args = {
   children: 'Primary Button',
   variant: ButtonVariant.Primary,
-  size: ButtonSize.Meduim,
+  size: ButtonSize.Medium,
   disabled: false,
   className: '',
 };

diff --git a/src/components/button/Button.tsx b/src/components/button/Button.tsx
@@ -12,7 +12,7 @@ export enum ButtonSize {
   Full,
   ExtraLarge,
   Large,
-  Meduim,
+  Medium,
   Small,
   ExtraSmall,
 }
@@ -45,7 +45,7 @@ const getSizeStyle = (size: ButtonSize) => {
       return 'w-[428px] h-[53px]';
     case ButtonSize.Large:
       return 'w-[335px] h-[53px]';
-    case ButtonSize.Meduim:
+    case ButtonSize.Medium:
       return 'w-[266px] h-[47px]';
     case ButtonSize.Small:
       return 'w-[142px] h-[39px]';

diff --git a/src/elements/earn/portfolio/v3/pendingWithdraw/confirm/V3WithdrawConfirmInfo.tsx b/src/elements/earn/portfolio/v3/pendingWithdraw/confirm/V3WithdrawConfirmInfo.tsx
@@ -22,7 +22,7 @@ export const V3WithdrawConfirmInfo = ({ handleCancelClick }: Props) => {
       <Button
         className="mt-50"
         onClick={handleCancelClick}
-        size={ButtonSize.Meduim}
+        size={ButtonSize.Medium}
         variant={ButtonVariant.Secondary}
       >
         Cancel withdrawal

diff --git a/src/elements/modalVbnt/ModalVbnt.tsx b/src/elements/modalVbnt/ModalVbnt.tsx
@@ -77,16 +77,16 @@ export const ModalVbnt = ({
   }, [amount, token, percentages, fieldBlance]);
 
   const handleStakeUnstake = async () => {
+    setAmount('');
     if (stakeDisabled || !account) return;
-
     sendGovEvent(GovEvent.Click, govProperties, stake);
     sendGovEvent(GovEvent.WalletRequest, govProperties, stake);
     if (stake)
       await stakeAmount(
         amount,
         token,
         (txHash: string) => {
-          stakeNotification(dispatch, amount, txHash);
+          stakeNotification(dispatch, amount, txHash, token.symbol);
           sendGovEvent(GovEvent.WalletConfirm, govProperties, stake);
         },
         () => {
@@ -98,7 +98,7 @@ export const ModalVbnt = ({
           sendGovEvent(GovEvent.Failed, govProperties, stake, undefined, error);
         },
         (error: string) => {
-          stakeFailedNotification(dispatch, amount);
+          stakeFailedNotification(dispatch, amount, token.symbol);
           sendGovEvent(GovEvent.Failed, govProperties, stake, undefined, error);
         }
       );
@@ -107,7 +107,7 @@ export const ModalVbnt = ({
         amount,
         token,
         (txHash: string) => {
-          unstakeNotification(dispatch, amount, txHash);
+          unstakeNotification(dispatch, amount, txHash, token.symbol);
           sendGovEvent(GovEvent.WalletConfirm, govProperties, stake);
         },
         () => {
@@ -119,7 +119,7 @@ export const ModalVbnt = ({
           sendGovEvent(GovEvent.Failed, govProperties, stake, undefined, error);
         },
         (error: string) => {
-          unstakeFailedNotification(dispatch, amount);
+          unstakeFailedNotification(dispatch, amount, token.symbol);
           sendGovEvent(GovEvent.Failed, govProperties, stake, undefined, error);
         }
       );
@@ -128,7 +128,9 @@ export const ModalVbnt = ({
   const [checkApprove, ModalApprove] = useApproveModal(
     [{ amount: amount, token: token }],
     handleStakeUnstake,
-    ApprovalContract.Governance,
+    token.symbol === 'BNT'
+      ? ApprovalContract.GovernanceBnt
+      : ApprovalContract.GovernanceVbnt,
     () => sendGovEvent(GovEvent.UnlimitedPopup, govProperties, stake),
     (isUnlimited: boolean) =>
       sendGovEvent(
@@ -148,7 +150,7 @@ export const ModalVbnt = ({
   return (
     <>
       <Modal
-        title={`${stake ? 'Stake' : 'Unstake'} vBNT`}
+        title={`${stake ? 'Stake' : 'Unstake'} ${token.symbol}`}
         titleElement={<SwapSwitch />}
         setIsOpen={setIsOpen}
         isOpen={isOpen}
@@ -167,7 +169,6 @@ export const ModalVbnt = ({
             />
             <Button
               onClick={() => {
-                setAmount('');
                 setIsOpen(false);
                 if (stake) checkApprove();
                 else handleStakeUnstake();
@@ -176,7 +177,7 @@ export const ModalVbnt = ({
               className="mt-30 mb-20"
               size={ButtonSize.Full}
             >
-              {`${stake ? 'Stake' : 'Unstake'} vBNT`}
+              {`${stake ? 'Stake' : 'Unstake'} ${token.symbol}`}
             </Button>
           </div>
         </div>

diff --git a/src/elements/walletConnect/WalletConnectRequest.tsx b/src/elements/walletConnect/WalletConnectRequest.tsx
@@ -13,7 +13,7 @@ export const WalletConnectRequest = () => {
       </div>
       <Button
         variant={ButtonVariant.Secondary}
-        size={ButtonSize.Meduim}
+        size={ButtonSize.Medium}
         onClick={() => handleWalletButtonClick()}
       >
         Connect Wallet

diff --git a/src/pages/UnsupportedNetwork.tsx b/src/pages/UnsupportedNetwork.tsx
@@ -17,7 +17,7 @@ export const UnsupportedNetwork = () => {
       <div className="flex items-center gap-15">
         <Button
           variant={ButtonVariant.Secondary}
-          size={isMobile ? ButtonSize.Small : ButtonSize.Meduim}
+          size={isMobile ? ButtonSize.Small : ButtonSize.Medium}
         >
           <Navigate
             to="https://support.bancor.network/hc/en-us/articles/5463892405010-MetaMask-Setup-Guide"
@@ -29,7 +29,7 @@ export const UnsupportedNetwork = () => {
         </Button>
         <Button
           variant={ButtonVariant.Primary}
-          size={isMobile ? ButtonSize.Small : ButtonSize.Meduim}
+          size={isMobile ? ButtonSize.Small : ButtonSize.Medium}
           onClick={() => requestSwitchChain()}
         >
           Switch Network