From 1a5383b79cdc67026f158c700e68cf77061e4954 Mon Sep 17 00:00:00 2001
From: soulBit <its.soulBit@gmail.com>
Date: Thu, 13 Oct 2022 18:22:12 +0100
Subject: [PATCH 1/3] chore: increase suggested gas limit for adding AMM
 liquidity (#2435)

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

diff --git a/src/utils/classifiers.ts b/src/utils/classifiers.ts
index c20a57f7ea..66bdc0666b 100644
--- a/src/utils/classifiers.ts
+++ b/src/utils/classifiers.ts
@@ -94,7 +94,7 @@ export const gasLimit = {
   [TxType.TRADE]: 3750000,
   [TxType.CLOSE_WITH_SWAP]: 2300000,
   [TxType.CLOSE_WITH_DEPOSIT]: 950000,
-  [TxType.ADD_LIQUIDITY]: 525000,
+  [TxType.ADD_LIQUIDITY]: 550000,
   [TxType.REMOVE_LIQUIDITY]: 650000,
   [TxType.BORROW]: 1500000,
   [TxType.CONVERT_BY_PATH]: 750000,

From 5329248525f00683850600a6f6d4ecbeb979e9da Mon Sep 17 00:00:00 2001
From: soulBit <its.soulBit@gmail.com>
Date: Mon, 17 Oct 2022 11:55:55 +0100
Subject: [PATCH 2/3] feat: disable RBTC fee claiming on Rewards page (#2437)

---
 .../ClaimForms/FeesEarnedClaimRow/index.tsx           | 11 ++++++++---
 .../RewardPage/components/FeesEarnedTab/index.tsx     |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/RewardPage/components/ClaimForms/FeesEarnedClaimRow/index.tsx b/src/app/pages/RewardPage/components/ClaimForms/FeesEarnedClaimRow/index.tsx
index c790328cb9..3e90bfb492 100644
--- a/src/app/pages/RewardPage/components/ClaimForms/FeesEarnedClaimRow/index.tsx
+++ b/src/app/pages/RewardPage/components/ClaimForms/FeesEarnedClaimRow/index.tsx
@@ -24,6 +24,7 @@ interface IFeesEarnedClaimRowProps extends IClaimFormProps {
   contractAddress: string;
   asset: Asset;
   loading?: boolean;
+  assetClaimLocked?: boolean;
 }
 
 export const FeesEarnedClaimRow: React.FC<IFeesEarnedClaimRowProps> = ({
@@ -32,6 +33,7 @@ export const FeesEarnedClaimRow: React.FC<IFeesEarnedClaimRowProps> = ({
   asset,
   rbtcValue,
   loading,
+  assetClaimLocked = false,
 }) => {
   const { t } = useTranslation();
   const address = useAccount();
@@ -47,8 +49,11 @@ export const FeesEarnedClaimRow: React.FC<IFeesEarnedClaimRowProps> = ({
   const { send, ...tx } = useSendContractTx('feeSharingProxy', 'withdraw');
 
   const isClaimDisabled = useMemo(
-    () => claimFeesEarnedLocked || !bignumber(amountToClaim).greaterThan(0),
-    [claimFeesEarnedLocked, amountToClaim],
+    () =>
+      claimFeesEarnedLocked ||
+      !bignumber(amountToClaim).greaterThan(0) ||
+      assetClaimLocked,
+    [claimFeesEarnedLocked, amountToClaim, assetClaimLocked],
   );
 
   const onSubmit = useCallback(() => {
@@ -91,7 +96,7 @@ export const FeesEarnedClaimRow: React.FC<IFeesEarnedClaimRowProps> = ({
           textClassName="tw-text-xs tw-overflow-visible tw-font-bold"
           disabled={isClaimDisabled}
           title={
-            (claimFeesEarnedLocked &&
+            ((claimFeesEarnedLocked || assetClaimLocked) &&
               t(translations.maintenance.claimRewards).replace(
                 /<\/?\d+>/g,
                 '',
diff --git a/src/app/pages/RewardPage/components/FeesEarnedTab/index.tsx b/src/app/pages/RewardPage/components/FeesEarnedTab/index.tsx
index ea660c819f..44031c6380 100644
--- a/src/app/pages/RewardPage/components/FeesEarnedTab/index.tsx
+++ b/src/app/pages/RewardPage/components/FeesEarnedTab/index.tsx
@@ -78,6 +78,7 @@ export const FeesEarnedTab: React.FC<IFeesEarnedTabProps> = ({
                     rbtcValue={earnedFee.rbtcValue}
                     loading={loading}
                     key={earnedFee.contractAddress}
+                    assetClaimLocked={earnedFee.asset === Asset.RBTC} //hardcoded lock on claiming RBTC fees as loan token contract is currently paused
                   />
                 ))}
               </tbody>

From a75513b4ca331713e5dfb882e913fc26757d42e9 Mon Sep 17 00:00:00 2001
From: soulBit <its.soulBit@gmail.com>
Date: Mon, 24 Oct 2022 17:00:48 +0100
Subject: [PATCH 3/3] feat: enable RBTC fee claiming in Rewards page (#2448)

---
 src/app/pages/RewardPage/components/FeesEarnedTab/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/pages/RewardPage/components/FeesEarnedTab/index.tsx b/src/app/pages/RewardPage/components/FeesEarnedTab/index.tsx
index 44031c6380..ea660c819f 100644
--- a/src/app/pages/RewardPage/components/FeesEarnedTab/index.tsx
+++ b/src/app/pages/RewardPage/components/FeesEarnedTab/index.tsx
@@ -78,7 +78,6 @@ export const FeesEarnedTab: React.FC<IFeesEarnedTabProps> = ({
                     rbtcValue={earnedFee.rbtcValue}
                     loading={loading}
                     key={earnedFee.contractAddress}
-                    assetClaimLocked={earnedFee.asset === Asset.RBTC} //hardcoded lock on claiming RBTC fees as loan token contract is currently paused
                   />
                 ))}
               </tbody>