refactor(wallet): remove dead self-custody branches from deploy-web consumers

.eslintrc.js

@@ -5,6 +5,7 @@ const nextConfig = require("@akashnetwork/dev-config/.eslintrc.next");
 
 module.exports = {
   ...baseConfig,
+  root: true,
   settings: {
     next: {
       rootDir: "apps/*"

apps/deploy-web/src/components/deployments/DeploymentDetailTopBar/DeploymentDetailTopBar.spec.tsx

@@ -109,22 +109,13 @@ describe(DeploymentDetailTopBar.name, () => {
       expect(screen.queryByText("Redeploy")).not.toBeInTheDocument();
     });
 
-    it("renders auto top-up section when wallet is managed", () => {
-      setup({
-        deployment: createDeployment({ state: "active" }),
-        wallet: { isManaged: true }
+    it("renders auto top-up section", () => {
+      const deps = setup({
+        deployment: createDeployment({ state: "active" })
       });
 
       expect(screen.getByText("Auto top-up")).toBeInTheDocument();
-    });
-
-    it("does not render auto top-up section when wallet is not managed", () => {
-      setup({
-        deployment: createDeployment({ state: "active" }),
-        wallet: { isManaged: false }
-      });
-
-      expect(screen.queryByText("Auto top-up")).not.toBeInTheDocument();
+      expect(deps.Switch).toHaveBeenCalledWith(expect.objectContaining({ checked: false, disabled: false, onCheckedChange: expect.any(Function) }), {});
     });
 
     it("renders DeploymentDepositModal after Add funds click", () => {
@@ -244,18 +235,18 @@ describe(DeploymentDetailTopBar.name, () => {
       })) as typeof DEPENDENCIES.useLocalNotes,
       useWallet: vi.fn(() => ({
         signAndBroadcastTx: input?.wallet?.signAndBroadcastTx ?? vi.fn(() => Promise.resolve(true)),
-        isManaged: input?.wallet?.isManaged ?? false,
-        denom: input?.wallet?.denom ?? "uakt",
+        isManaged: true,
+        denom: input?.wallet?.denom ?? "uact",
         address: "akash1test",
         walletName: "test",
         isWalletConnected: true,
         isWalletLoaded: true,
         connectManagedWallet: vi.fn(),
         logout: vi.fn(),
-        isCustodial: false,
         isWalletLoading: false,
         isTrialing: false,
         isOnboarding: false,
+        topUpMinAmountUsd: 20,
         hasManagedWallet: false
       })) as typeof DEPENDENCIES.useWallet,
       usePricing: vi.fn(() => ({

apps/deploy-web/src/components/deployments/DeploymentDetailTopBar/DeploymentDetailTopBar.tsx

@@ -244,28 +244,26 @@ export const DeploymentDetailTopBar: React.FunctionComponent<Props> = ({
               Add funds
             </d.Button>
 
-            {wallet.isManaged && (
-              <div className="ml-4 flex items-center gap-2">
-                <d.Switch checked={deploymentSetting.data?.autoTopUpEnabled} onCheckedChange={setAutoTopUpEnabled} disabled={deploymentSetting.isLoading} />
-                <span>Auto top-up</span>
-                <d.CustomTooltip
-                  title={
-                    <div className="space-y-2">
-                      <div>
-                        <div>Estimated amount: ${udenomToUsd(deploymentSetting.data?.estimatedTopUpAmount || 0, wallet.denom)}</div>
-                        <div>Check period: {formatDuration(intervalToDuration({ start: 0, end: deploymentSetting.data?.topUpFrequencyMs || 0 }))}</div>
-                      </div>
-                      <div className="text-xs text-muted-foreground">
-                        Auto top-up will only occur if there are insufficient funds to maintain the deployment until the next scheduled check.
-                      </div>
+            <div className="ml-4 flex items-center gap-2">
+              <d.Switch checked={deploymentSetting.data?.autoTopUpEnabled} onCheckedChange={setAutoTopUpEnabled} disabled={deploymentSetting.isLoading} />
+              <span>Auto top-up</span>
+              <d.CustomTooltip
+                title={
+                  <div className="space-y-2">
+                    <div>
+                      <div>Estimated amount: ${udenomToUsd(deploymentSetting.data?.estimatedTopUpAmount || 0, wallet.denom)}</div>
+                      <div>Check period: {formatDuration(intervalToDuration({ start: 0, end: deploymentSetting.data?.topUpFrequencyMs || 0 }))}</div>
                     </div>
-                  }
-                >
-                  <span className="cursor-help text-muted-foreground">ⓘ</span>
-                </d.CustomTooltip>
-                {deploymentSetting.isLoading && <d.Spinner size="small" />}
-              </div>
-            )}
+                    <div className="text-xs text-muted-foreground">
+                      Auto top-up will only occur if there are insufficient funds to maintain the deployment until the next scheduled check.
+                    </div>
+                  </div>
+                }
+              >
+                <span className="cursor-help text-muted-foreground">ⓘ</span>
+              </d.CustomTooltip>
+              {deploymentSetting.isLoading && <d.Spinner size="small" />}
+            </div>
           </div>
         )}
 

apps/deploy-web/src/components/deployments/DeploymentSubHeader.tsx

@@ -3,7 +3,7 @@ import type { ReactNode } from "react";
 import { CustomTooltip } from "@akashnetwork/ui/components";
 import formatDistanceToNow from "date-fns/formatDistanceToNow";
 import isValid from "date-fns/isValid";
-import { InfoCircle, WarningCircle } from "iconoir-react";
+import { WarningCircle } from "iconoir-react";
 
 import { CopyTextToClipboardButton } from "@src/components/shared/CopyTextToClipboardButton";
 import { LabelValue } from "@src/components/shared/LabelValue";
@@ -15,10 +15,8 @@ import { useServices } from "@src/context/ServicesProvider";
 import { useWallet } from "@src/context/WalletProvider";
 import { useDeploymentMetrics } from "@src/hooks/useDeploymentMetrics";
 import { useTrialDeploymentTimeRemaining } from "@src/hooks/useTrialDeploymentTimeRemaining";
-import { useDenomData } from "@src/hooks/useWalletBalance";
 import type { DeploymentDto, LeaseDto } from "@src/types/deployment";
 import { udenomToDenom } from "@src/utils/mathHelpers";
-import { getAvgCostPerMonth } from "@src/utils/priceUtils";
 
 type Props = {
   deployment: DeploymentDto;
@@ -28,13 +26,11 @@ type Props = {
 
 export const DeploymentSubHeader: React.FunctionComponent<Props> = ({ deployment, leases }) => {
   const { deploymentCost, realTimeLeft } = useDeploymentMetrics({ deployment, leases });
-  const avgCost = udenomToDenom(getAvgCostPerMonth(deploymentCost));
   const isActive = deployment.state === "active";
   const hasLeases = !!leases && leases.length > 0;
   const hasActiveLeases = hasLeases && leases.some(l => l.state === "active");
   const hasGpu = leases?.some(l => l.state === "active" && l.gpuAmount && l.gpuAmount > 0);
-  const denomData = useDenomData(deployment.escrowAccount.state.funds[0]?.denom || "");
-  const { isCustodial, isTrialing } = useWallet();
+  const { isTrialing } = useWallet();
   const { publicConfig: appConfig } = useServices();
 
   const trialDuration = appConfig.NEXT_PUBLIC_TRIAL_DEPLOYMENTS_DURATION_HOURS;
@@ -56,22 +52,6 @@ export const DeploymentSubHeader: React.FunctionComponent<Props> = ({ deployment
                 denom={deployment.escrowAccount.state.funds[0]?.denom || ""}
                 value={udenomToDenom(isActive && hasActiveLeases && realTimeLeft ? realTimeLeft?.escrow : deployment.escrowBalance, 6)}
               />
-              {isCustodial && (
-                <CustomTooltip
-                  title={
-                    <>
-                      <strong>
-                        {udenomToDenom(isActive && hasActiveLeases && realTimeLeft ? realTimeLeft?.escrow : deployment.escrowBalance, 6)}&nbsp;
-                        {denomData?.label}
-                      </strong>
-                      <br />
-                      The escrow account balance will be fully returned to your wallet balance when the deployment is closed.{" "}
-                    </>
-                  }
-                >
-                  <InfoCircle className="text-xs text-muted-foreground" />
-                </CustomTooltip>
-              )}
 
               {isActive && hasActiveLeases && !!realTimeLeft && realTimeLeft.escrow <= 0 && (
                 <CustomTooltip title="Your deployment is out of funds and can be closed by your provider at any time now. You can add funds to keep active.">
@@ -92,18 +72,6 @@ export const DeploymentSubHeader: React.FunctionComponent<Props> = ({ deployment
                   perBlockValue={udenomToDenom(deploymentCost, 10)}
                   showAsHourly={hasGpu}
                 />
-
-                {isCustodial && (
-                  <CustomTooltip
-                    title={
-                      <span>
-                        {avgCost} {denomData?.label} / month
-                      </span>
-                    }
-                  >
-                    <InfoCircle className="text-xs text-muted-foreground" />
-                  </CustomTooltip>
-                )}
               </div>
             )
           }
@@ -117,19 +85,6 @@ export const DeploymentSubHeader: React.FunctionComponent<Props> = ({ deployment
                 denom={deployment.escrowAccount.state.funds[0]?.denom || ""}
                 value={udenomToDenom(isActive && hasActiveLeases && realTimeLeft ? realTimeLeft?.amountSpent : parseFloat(deployment.transferred.amount), 6)}
               />
-
-              {isCustodial && (
-                <CustomTooltip
-                  title={
-                    <span>
-                      {udenomToDenom(isActive && hasActiveLeases && realTimeLeft ? realTimeLeft?.amountSpent : parseFloat(deployment.transferred.amount), 6)}{" "}
-                      {denomData?.label}
-                    </span>
-                  }
-                >
-                  <InfoCircle className="text-xs text-muted-foreground" />
-                </CustomTooltip>
-              )}
             </div>
           }
         />

apps/deploy-web/src/components/deployments/ManifestUpdate/ManifestUpdate.spec.tsx

@@ -326,16 +326,16 @@ describe(ManifestUpdate.name, () => {
       ({
         address: input?.wallet?.address || "akash1test",
         signAndBroadcastTx: input?.wallet?.signAndBroadcastTx || vi.fn(),
-        isManaged: input?.wallet?.isManaged ?? false,
+        isManaged: true,
         walletName: "",
         isWalletConnected: true,
         isWalletLoaded: true,
         connectManagedWallet: vi.fn(),
         logout: vi.fn(),
-        isCustodial: false,
         isWalletLoading: false,
         isTrialing: false,
         isOnboarding: false,
+        topUpMinAmountUsd: 20,
         hasManagedWallet: false,
         denom: "uact"
       }) as ReturnType<typeof DEPENDENCIES.useWallet>;

apps/deploy-web/src/components/deployments/ManifestUpdate/ManifestUpdate.tsx

@@ -70,10 +70,10 @@ export const ManifestUpdate: React.FunctionComponent<Props> = ({
   const [deploymentVersion, setDeploymentVersion] = useState<string | null>(null);
   const [showOutsideDeploymentMessage, setShowOutsideDeploymentMessage] = useState(false);
   const [isSendingManifest, setIsSendingManifest] = useState(false);
-  const { address, signAndBroadcastTx, isManaged: isManagedWallet } = d.useWallet();
+  const { address, signAndBroadcastTx } = d.useWallet();
   const { data: providers } = d.useProviderList();
   const providerCredentials = d.useProviderCredentials();
-  const { enqueueSnackbar, closeSnackbar } = d.useSnackbar();
+  const { enqueueSnackbar } = d.useSnackbar();
   const { settings } = d.useSettings();
 
   useEffect(() => {
@@ -126,7 +126,7 @@ export const ManifestUpdate: React.FunctionComponent<Props> = ({
   }
 
   async function handleUpdateClick() {
-    let response, sendManifestKey;
+    let response;
 
     try {
       const doc = yaml.load(editedManifest);
@@ -150,13 +150,6 @@ export const ManifestUpdate: React.FunctionComponent<Props> = ({
           manifestVersion: dd.hash
         });
 
-        sendManifestKey =
-          !isManagedWallet &&
-          enqueueSnackbar(<d.Snackbar title="Deploying! 🚀" subTitle="Please wait a few seconds..." showLoading />, {
-            variant: "info",
-            autoHideDuration: null
-          });
-
         const leaseProviders = leases.map(lease => lease.provider).filter((v, i, s) => s.indexOf(v) === i);
 
         for (const provider of leaseProviders) {
@@ -170,11 +163,6 @@ export const ManifestUpdate: React.FunctionComponent<Props> = ({
         });
 
         setIsSendingManifest(false);
-
-        if (sendManifestKey) {
-          closeSnackbar(sendManifestKey);
-        }
-
         closeManifestEditor();
       }
     } catch (error: any) {
@@ -185,10 +173,6 @@ export const ManifestUpdate: React.FunctionComponent<Props> = ({
         console.error(error);
       }
       setIsSendingManifest(false);
-
-      if (sendManifestKey) {
-        closeSnackbar(sendManifestKey);
-      }
     }
   }
 

apps/deploy-web/src/components/home/YourAccount/YourAccount.spec.tsx

@@ -34,7 +34,7 @@ describe(YourAccount.name, () => {
 
     expect(AccountHeaderMock).toHaveBeenCalledWith(
       expect.objectContaining({
-        isManagedWallet: false,
+        isManagedWallet: true,
         isBlockchainDown: false
       }),
       expect.anything()
@@ -71,7 +71,7 @@ describe(YourAccount.name, () => {
       expect.objectContaining({
         walletBalance,
         activeDeploymentsCount: 0,
-        isManagedWallet: false
+        isManagedWallet: true
       }),
       expect.anything()
     );
@@ -304,11 +304,12 @@ describe(YourAccount.name, () => {
         connectManagedWallet: vi.fn(),
         logout: vi.fn(),
         signAndBroadcastTx: vi.fn(),
-        isManaged: input.wallet?.isManaged ?? false,
-        isCustodial: false,
+        isManaged: true,
+        denom: "uact",
         isWalletLoading: false,
         isTrialing: false,
         isOnboarding: false,
+        topUpMinAmountUsd: 20,
         hasManagedWallet: false
       }) as ReturnType<typeof DEPENDENCIES.useWallet>;
 

apps/deploy-web/src/components/layout/AccountMenu.spec.tsx

@@ -7,7 +7,6 @@ import { AccountMenu } from "./AccountMenu";
 
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { buildWallet } from "@tests/seeders/wallet";
 import { TestContainerProvider } from "@tests/unit/TestContainerProvider";
 
 describe(AccountMenu.name, () => {
@@ -57,11 +56,10 @@ describe(AccountMenu.name, () => {
     expect(authService.logout).toHaveBeenCalledTimes(1);
   });
 
-  it("shows Billing & Usage when flag, userId, and managed wallet are all present", async () => {
+  it("shows Billing & Usage when flag and userId are both present", async () => {
     setup({
       username: "carol",
       userId: "user-1",
-      isManagedWallet: true,
       isBillingUsageEnabled: true
     });
 
@@ -74,7 +72,6 @@ describe(AccountMenu.name, () => {
     setup({
       username: "dan",
       userId: "user-1",
-      isManagedWallet: true,
       isBillingUsageEnabled: false
     });
 
@@ -84,7 +81,7 @@ describe(AccountMenu.name, () => {
     expect(screen.queryByText("Billing & Usage")).not.toBeInTheDocument();
   });
 
-  function setup(input: { isLoading?: boolean; username?: string; userId?: string; isManagedWallet?: boolean; isBillingUsageEnabled?: boolean }) {
+  function setup(input: { isLoading?: boolean; username?: string; userId?: string; isBillingUsageEnabled?: boolean }) {
     const push = vi.fn();
     const authService = mock<AuthService>();
 
@@ -95,8 +92,7 @@ describe(AccountMenu.name, () => {
           isLoading: input.isLoading ?? false
         }),
       useRouter: () => mock<ReturnType<typeof DEPENDENCIES.useRouter>>({ push }),
-      useFlag: flagName => (flagName === "billing_usage" && input.isBillingUsageEnabled) ?? false,
-      useWallet: () => buildWallet({ isManaged: input.isManagedWallet ?? false })
+      useFlag: flagName => (flagName === "billing_usage" && input.isBillingUsageEnabled) ?? false
     };
 
     render(

apps/deploy-web/src/components/layout/AccountMenu.tsx

@@ -14,12 +14,11 @@ import { GraphUp, Key, LogOut, MultiplePages, Settings, Star, User } from "icono
 import { useRouter } from "next/navigation";
 
 import { useServices } from "@src/context/ServicesProvider";
-import { useWallet } from "@src/context/WalletProvider";
 import { useCustomUser } from "@src/hooks/useCustomUser";
 import { useFlag } from "@src/hooks/useFlag";
 import { CustomDropdownLinkItem } from "../shared/CustomDropdownLinkItem";
 
-export const DEPENDENCIES = { useCustomUser, useRouter, useFlag, useWallet };
+export const DEPENDENCIES = { useCustomUser, useRouter, useFlag };
 
 interface Props {
   dependencies?: typeof DEPENDENCIES;
@@ -30,7 +29,6 @@ export function AccountMenu({ dependencies: d = DEPENDENCIES }: Props = {}) {
   const username = user?.username;
   const router = d.useRouter();
   const isBillingUsageEnabled = d.useFlag("billing_usage");
-  const wallet = d.useWallet();
   const { authService, urlService } = useServices();
 
   return (
@@ -81,7 +79,7 @@ export function AccountMenu({ dependencies: d = DEPENDENCIES }: Props = {}) {
                       <CustomDropdownLinkItem onClick={() => router.push(urlService.userFavorites())} icon={<Star />}>
                         Favorites
                       </CustomDropdownLinkItem>
-                      {isBillingUsageEnabled && user?.userId && wallet.isManaged && (
+                      {isBillingUsageEnabled && user?.userId && (
                         <CustomDropdownLinkItem onClick={() => router.push(urlService.billing())} icon={<GraphUp />}>
                           Billing & Usage
                         </CustomDropdownLinkItem>