From 9f070ef7a578a49c5201b864a0ed7f9ac6ed3a2f Mon Sep 17 00:00:00 2001
From: Digberi <orkepuma@gmail.com>
Date: Thu, 2 Jun 2022 09:25:22 +0300
Subject: [PATCH 1/3] QUIPU-89 add loading for remove stableswap liquidity

---
 .../components/forms/remove-liq-form/remove-liq-form.tsx    | 5 ++---
 .../forms/remove-liq-form/use-remove-liq-form.vm.ts         | 6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/modules/stableswap/stableswap-liquidity/pages/item/components/forms/remove-liq-form/remove-liq-form.tsx b/src/modules/stableswap/stableswap-liquidity/pages/item/components/forms/remove-liq-form/remove-liq-form.tsx
index a40e0b1a6..0c74c170c 100644
--- a/src/modules/stableswap/stableswap-liquidity/pages/item/components/forms/remove-liq-form/remove-liq-form.tsx
+++ b/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
diff --git a/src/modules/stableswap/stableswap-liquidity/pages/item/components/forms/remove-liq-form/use-remove-liq-form.vm.ts b/src/modules/stableswap/stableswap-liquidity/pages/item/components/forms/remove-liq-form/use-remove-liq-form.vm.ts
index eb5cb62e6..e785c351e 100644
--- a/src/modules/stableswap/stableswap-liquidity/pages/item/components/forms/remove-liq-form/use-remove-liq-form.vm.ts
+++ b/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,

From 2ac0d1be9b5a7d59ab72768bcbb87cba1370b2fb Mon Sep 17 00:00:00 2001
From: Artem <violence044@gmail.com>
Date: Tue, 7 Jun 2022 15:07:54 +0300
Subject: [PATCH 2/3] QUIPU-121 Add new label to new farms, remove from other

---
 src/config/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/config.ts b/src/config/config.ts
index c3d2ef5ce..45133c6b1 100644
--- a/src/config/config.ts
+++ b/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'];

From d81e1eff5eac217878d97650782c06e48aaec1a8 Mon Sep 17 00:00:00 2001
From: Artem <violence044@gmail.com>
Date: Tue, 7 Jun 2022 16:11:11 +0300
Subject: [PATCH 3/3] v3.0.18

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 467ddb516..c4fce6982 100644
--- a/package.json
+++ b/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",