Merge pull request #750 from madfish-solutions/v3.0.18

V3.0.18

package.json

@@ -1,6 +1,6 @@
 {
   "name": "quipuswap-webapp",
-  "version": "3.0.17",
+  "version": "3.0.18",
   "private": true,
   "scripts": {
     "dev:mainnet": "cross-env REACT_APP_NETWORK=mainnet REACT_APP_MAINNET_BASE_URL=http://localhost:3000 REACT_APP_HANGZHOUNET_BASE_URL=http://localhost:3002 REACT_APP_ITHACANET_BASE_URL=http://localhost:3003 PORT=3000 craco start",

src/config/config.ts

@@ -91,7 +91,7 @@ export const TOKEN_TO_TOKEN_DEX = TTDEX_CONTRACTS[NETWORK_ID];
 export const HIDE_ANALYTICS = true;
 
 // FarmingItems with the "NEW" label
-export const NEW_FARMINGS = ['7', '8', '9', '10'];
+export const NEW_FARMINGS = ['11', '12'];
 
 // FarmingItems with Youves
 export const YOUVES_FARMINGS = ['5', '6'];

src/modules/stableswap/stableswap-liquidity/pages/item/components/forms/remove-liq-form/remove-liq-form.tsx

@@ -31,14 +31,13 @@ export const RemoveLiqForm: FC = observer(() => {
     labelInput,
     tooltip,
     switcherValue,
+    isSubmitting,
+    disabled,
     handleSwitcherClick,
     handleSubmit,
     handleLpInputChange
   } = removeLiqFormViewModel;
 
-  const disabled = false;
-  const isSubmitting = false;
-
   return (
     <form onSubmit={handleSubmit}>
       <StableLpInput

src/modules/stableswap/stableswap-liquidity/pages/item/components/forms/remove-liq-form/use-remove-liq-form.vm.ts

@@ -14,7 +14,7 @@ import {
   saveBigNumber,
   toFixed
 } from '@shared/helpers';
-import { useTokenBalance, useTokensWithBalances } from '@shared/hooks';
+import { useAuthStore, useTokenBalance, useTokensWithBalances } from '@shared/hooks';
 import { useTranslation } from '@translation';
 
 import {
@@ -63,6 +63,7 @@ const useRemoveLiqFormService = (item: Nullable<StableswapItem>, isBalancedPropo
 export const useRemoveLiqFormViewModel = () => {
   const { calcTokenAmountView } = useCalcTokenAmountView();
   const { removeStableswapLiquidity } = useRemoveStableswapLiquidity();
+  const { accountPkh } = useAuthStore();
   const stableswapItemStore = useStableswapItemStore();
   const stableswapItemFormStore = useStableswapItemFormStore();
   const { t } = useTranslation();
@@ -197,12 +198,15 @@ export const useRemoveLiqFormViewModel = () => {
     return stableswapItemFormStore.setIsBalancedProportion(state);
   };
 
+  const disabled = formik.isSubmitting || !accountPkh;
+
   return {
     data,
     formik,
     tooltip,
     labelInput,
     isSubmitting: formik.isSubmitting,
+    disabled,
     lpBalance,
     switcherValue: stableswapItemFormStore.isBalancedProportion,
     isLpInputDisabled: !stableswapItemFormStore.isBalancedProportion,