Merge branch 'fix/meme-staging' into tanya/fix-flickering

frontend/components/AddressLink.tsx

@@ -7,16 +7,13 @@ import { truncateAddress } from '@/utils/truncate';
 type AddressLinkProps = {
   address?: Address;
   hideLinkArrow?: boolean;
-
-  // TODO: mark as required once balance breakdown is updated.
-  // and remove the default value
-  middlewareChain?: MiddlewareChain;
+  middlewareChain: MiddlewareChain;
 };
 
 export const AddressLink = ({
   address,
   hideLinkArrow = false,
-  middlewareChain = MiddlewareChain.GNOSIS,
+  middlewareChain,
 }: AddressLinkProps) => {
   if (!address) return null;
   if (!middlewareChain) return null;

frontend/components/MainPage/header/AgentButton/AgentNotRunningButton.tsx

@@ -59,26 +59,27 @@ export const AgentNotRunningButton = () => {
     selectedService?.service_config_id,
   );
 
-  const {
-    setIsPaused: setIsBalancePollingPaused,
-    totalStakedOlasBalance,
-    updateBalances,
-  } = useBalanceContext();
+  const { setIsPaused: setIsBalancePollingPaused, updateBalances } =
+    useBalanceContext();
 
   const { serviceStakedBalances, serviceSafeBalances } = useServiceBalances(
     selectedService?.service_config_id,
   );
 
-  const serviceStakedOlasBalanceOnHomeChain = serviceStakedBalances?.find(
+  const serviceStakedOlasBalancesOnHomeChain = serviceStakedBalances?.find(
     (stakedBalance) =>
       stakedBalance.evmChainId === selectedAgentConfig.evmHomeChainId,
   );
 
   const serviceTotalStakedOlas = sum([
-    serviceStakedOlasBalanceOnHomeChain?.olasBondBalance,
-    serviceStakedOlasBalanceOnHomeChain?.olasDepositBalance,
+    serviceStakedOlasBalancesOnHomeChain?.olasBondBalance,
+    serviceStakedOlasBalancesOnHomeChain?.olasDepositBalance,
   ]);
 
+  const serviceOlasBalanceOnHomeChain = serviceSafeBalances?.find(
+    (balance) => balance.evmChainId === selectedAgentConfig.evmHomeChainId,
+  )?.balance;
+
   const { masterSafeBalances, masterSafeNativeGasBalance } =
     useMasterBalances();
 
@@ -103,7 +104,10 @@ export const AgentNotRunningButton = () => {
       selectedStakingProgramId
     ]?.stakingRequirements[TokenSymbol.OLAS];
 
-  const serviceSafeOlasWithStaked = sum([totalStakedOlasBalance]);
+  const serviceSafeOlasWithStaked = sum([
+    serviceOlasBalanceOnHomeChain,
+    serviceTotalStakedOlas,
+  ]);
 
   const isDeployable = useMemo(() => {
     if (isServicesLoading) return false;
@@ -143,25 +147,27 @@ export const AgentNotRunningButton = () => {
       selectedAgentConfig.operatingThresholds[WalletOwnerType.Master];
     const tokenSymbol =
       CHAIN_CONFIG[selectedAgentConfig.evmHomeChainId].nativeToken.symbol;
-    const agentSafeNativeBalance = serviceSafeBalances?.find(
-      ({ symbol }) => symbol === tokenSymbol,
-    )?.balance;
+
     const safeThreshold = masterThresholds[WalletType.Safe][tokenSymbol];
 
+    // SERVICE IS STAKED, AND STARTING AGAIN
     if (isServiceStaked) {
-      const hasEnoughOlas =
-        (serviceSafeOlasWithStaked ?? 0) >= requiredStakedOlas;
+      const hasEnoughOlas = serviceSafeOlasWithStaked >= requiredStakedOlas;
 
-      // @note: Funds are transferred to the agent safe from the master safe.
-      // Hence, if the agent safe has enough funds, it is considered as enough.
       const hasEnoughNativeGas =
-        (masterSafeNativeGasBalance ?? 0) > safeThreshold ||
-        (agentSafeNativeBalance ?? 0) > safeThreshold;
-      return hasEnoughOlas && hasEnoughNativeGas;
+        (masterSafeNativeGasBalance ?? 0) > safeThreshold;
+      return hasEnoughNativeGas && hasEnoughOlas;
     }
 
+    // SERVICE IS NOT STAKED AND/OR IS STARTING FOR THE FIRST TIME
+    const totalOlasStakedAndInSafes = sum([
+      serviceOlasBalanceOnHomeChain,
+      serviceTotalStakedOlas,
+      masterSafeOlasBalance,
+    ]);
+
     const hasEnoughForInitialDeployment =
-      (masterSafeOlasBalance ?? 0) >= requiredStakedOlas &&
+      (totalOlasStakedAndInSafes ?? 0) >= requiredStakedOlas &&
       (masterSafeNativeGasBalance ?? 0) >= safeThreshold;
 
     return hasEnoughForInitialDeployment;
@@ -176,14 +182,14 @@ export const AgentNotRunningButton = () => {
     service,
     storeState,
     selectedAgentType,
-    isEligibleForStaking,
     isAgentEvicted,
-    masterSafeNativeGasBalance,
+    isEligibleForStaking,
     selectedAgentConfig.operatingThresholds,
     selectedAgentConfig.evmHomeChainId,
+    serviceOlasBalanceOnHomeChain,
     serviceTotalStakedOlas,
+    masterSafeNativeGasBalance,
     serviceSafeOlasWithStaked,
-    serviceSafeBalances,
   ]);
 
   const pauseAllPolling = useCallback(() => {
@@ -245,7 +251,7 @@ export const AgentNotRunningButton = () => {
     // Update the service if the hash is different
     if (!middlewareServiceResponse && service) {
       if (service.hash !== serviceTemplate.hash) {
-        return ServicesService.updateService({
+        await ServicesService.updateService({
           serviceConfigId: service.service_config_id,
           stakingProgramId: selectedStakingProgramId,
           // chainId: selectedAgentConfig.evmHomeChainId,

frontend/components/SettingsPage/index.tsx

@@ -18,7 +18,6 @@ import { CustomAlert } from '../Alert';
 import { CardTitle } from '../Card/CardTitle';
 import { CardSection } from '../styled/CardSection';
 import { AddBackupWalletPage } from './AddBackupWalletPage';
-import { DebugInfoSection } from './DebugInfoSection';
 
 const { Text, Paragraph } = Typography;
 
@@ -161,9 +160,6 @@ const SettingsMain = () => {
         <Text strong>Backup wallet</Text>
         {walletBackup}
       </CardSection>
-
-      {/* Debug info */}
-      <DebugInfoSection />
     </Card>
   );
 };

frontend/components/YourWalletPage/Titles.tsx

@@ -1,5 +1,6 @@
 import { Flex, Typography } from 'antd';
 
+import { MiddlewareChain } from '@/client';
 import { InfoTooltip } from '@/components/InfoTooltip';
 import { TokenSymbol } from '@/enums/Token';
 import { Address } from '@/types/Address';
@@ -8,11 +9,16 @@ import { AddressLink } from '../AddressLink';
 
 const { Paragraph, Text, Title } = Typography;
 
-type SignerTitleProps = { signerText: string; signerAddress?: Address };
+type SignerTitleProps = {
+  signerText: string;
+  signerAddress: Address;
+  middlewareChain: MiddlewareChain;
+};
 
 export const SignerTitle = ({
   signerText,
   signerAddress,
+  middlewareChain,
 }: SignerTitleProps) => (
   <>
     Signer&nbsp;
@@ -28,7 +34,10 @@ export const SignerTitle = ({
       <Paragraph className="text-sm m-0">
         <Flex gap={4} vertical>
           <Text className="text-sm">{signerText}</Text>
-          <AddressLink address={signerAddress} />
+          <AddressLink
+            address={signerAddress}
+            middlewareChain={middlewareChain}
+          />
         </Flex>
       </Paragraph>
     </InfoTooltip>
@@ -58,7 +67,7 @@ export const NativeTokenTitle = ({ symbol }: { symbol: TokenSymbol }) => (
     </Title>
     &nbsp;
     <InfoTooltip>
-      {/* TODO: address multi-agent tooltip, specfic to agent config */}
+      {/* TODO: address multi-agent tooltip, specific to agent config */}
       <Paragraph className="text-sm m-0">
         {symbol} is used by the agent to engage in prediction markets. This
         amount will fluctuate based on your agent&apos;s performance.

frontend/components/YourWalletPage/WithdrawFunds.tsx

@@ -5,6 +5,7 @@ import React, { useCallback, useMemo, useState } from 'react';
 
 import { COLOR } from '@/constants/colors';
 import { useBalanceContext } from '@/hooks/useBalanceContext';
+import { useFeatureFlag } from '@/hooks/useFeatureFlag';
 import { useService } from '@/hooks/useService';
 import { useServices } from '@/hooks/useServices';
 import { useStakingContractCountdown } from '@/hooks/useStakingContractCountdown';
@@ -14,6 +15,7 @@ import { ServicesService } from '@/service/Services';
 import { Address } from '@/types/Address';
 
 import { CustomAlert } from '../Alert';
+import { FeatureNotEnabled } from '../FeatureNotEnabled';
 
 const { Text } = Typography;
 
@@ -54,7 +56,6 @@ const CompatibleMessage = () => (
 export const WithdrawFunds = () => {
   const { selectedService, refetch: refetchServices } = useServices();
   const { refetch: refetchMasterWallets } = useMasterWalletContext();
-
   const { updateBalances } = useBalanceContext();
 
   const { service, isServiceRunning } = useService(
@@ -64,6 +65,7 @@ export const WithdrawFunds = () => {
   const { isServiceStakedForMinimumDuration, selectedStakingContractDetails } =
     useActiveStakingContractDetails();
 
+  // state
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [withdrawAddress, setWithdrawAddress] = useState('');
   const [isWithdrawalLoading, setIsWithdrawalLoading] = useState(false);
@@ -148,6 +150,9 @@ export const WithdrawFunds = () => {
     [service, isServiceStakedForMinimumDuration, showModal],
   );
 
+  const isWithdrawFundsEnabled = useFeatureFlag('withdraw-funds');
+  if (!isWithdrawFundsEnabled) return <FeatureNotEnabled />;
+
   return (
     <>
       {isServiceStakedForMinimumDuration ? (