Merge pull request #793 from valory-xyz/mohan/disabled-modius-withdrawal

feat: Withdrawals disabled for modius

Author: mohandast52

frontend/components/YourWalletPage/WithdrawFunds.tsx

@@ -16,7 +16,6 @@ import { ServicesService } from '@/service/Services';
 import { Address } from '@/types/Address';
 
 import { CustomAlert } from '../Alert';
-import { FeatureNotEnabled } from '../FeatureNotEnabled';
 
 const { Text } = Typography;
 
@@ -76,6 +75,7 @@ export const WithdrawFunds = () => {
   const { selectedService, refetch: refetchServices } = useServices();
   const { refetch: refetchMasterWallets } = useMasterWalletContext();
   const { updateBalances } = useBalanceContext();
+  const isWithdrawFundsEnabled = useFeatureFlag('withdraw-funds');
 
   const { service, isServiceRunning } = useService(
     selectedService?.service_config_id,
@@ -155,46 +155,50 @@ export const WithdrawFunds = () => {
     handleCancel,
   ]);
 
-  const withdrawAllButton = useMemo(
-    () => (
-      <Button
-        onClick={showModal}
-        block
-        size="large"
-        disabled={!service || !isServiceStakedForMinimumDuration}
-      >
-        Withdraw all funds
-      </Button>
-    ),
-    [showModal, service, isServiceStakedForMinimumDuration],
-  );
+  const withdrawAllTooltipText = useMemo(() => {
+    if (!isWithdrawFundsEnabled) {
+      return 'Available soon!';
+    }
 
-  const withdrawAllTooltip = useMemo(() => {
     // countdown to withdrawal
     if (!isServiceStakedForMinimumDuration) {
       return `${minDurationMessage} ${countdownDisplay}`;
     }
 
     return null;
-  }, [countdownDisplay, isServiceStakedForMinimumDuration]);
+  }, [
+    countdownDisplay,
+    isServiceStakedForMinimumDuration,
+    isWithdrawFundsEnabled,
+  ]);
 
   const modalButtonText = useMemo(() => {
-    if (isWithdrawalLoading) return 'Loading';
+    if (isWithdrawalLoading) return 'Loading...';
     return 'Proceed';
   }, [isWithdrawalLoading]);
 
-  const isWithdrawFundsEnabled = useFeatureFlag('withdraw-funds');
-  if (!isWithdrawFundsEnabled) return <FeatureNotEnabled />;
-
   return (
     <>
-      {withdrawAllTooltip ? (
-        <Tooltip title={<Text className="text-sm">{withdrawAllTooltip}</Text>}>
-          {withdrawAllButton}
-        </Tooltip>
-      ) : (
-        withdrawAllButton
-      )}
+      <Tooltip
+        title={
+          withdrawAllTooltipText ? (
+            <Text className="text-sm">{withdrawAllTooltipText}</Text>
+          ) : null
+        }
+      >
+        <Button
+          onClick={showModal}
+          disabled={
+            !service ||
+            !isServiceStakedForMinimumDuration ||
+            !isWithdrawFundsEnabled
+          }
+          block
+          size="large"
+        >
+          Withdraw all funds
+        </Button>
+      </Tooltip>
 
       {!isServiceRunning && <ServiceNotRunning />}
 

frontend/components/YourWalletPage/YourAgent.tsx

@@ -15,7 +15,6 @@ import {
   useBalanceContext,
   useServiceBalances,
 } from '@/hooks/useBalanceContext';
-import { useFeatureFlag } from '@/hooks/useFeatureFlag';
 import { useRewardContext } from '@/hooks/useRewardContext';
 import { useService } from '@/hooks/useService';
 import { useServices } from '@/hooks/useServices';
@@ -358,12 +357,10 @@ const YourAgentWalletBreakdown = () => {
 };
 
 export const YourAgentWallet = () => {
-  const isWithdrawFundsEnabled = useFeatureFlag('withdraw-funds');
-
   return (
     <>
       <YourAgentWalletBreakdown />
-      {isWithdrawFundsEnabled && <WithdrawFunds />}
+      <WithdrawFunds />
     </>
   );
 };

frontend/hooks/useFeatureFlag.ts

@@ -64,7 +64,7 @@ const FEATURES_CONFIG = FeaturesConfigSchema.parse({
   },
   [AgentType.Modius]: {
     'manage-wallet': true,
-    'withdraw-funds': true,
+    'withdraw-funds': false,
     'last-transactions': true,
     'rewards-streak': true,
     'staking-contract-section': true,