Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(billing): enable balances fetching back #602

Merged
merged 1 commit into from
Dec 30, 2024
Merged

fix(billing): enable balances fetching back #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions apps/deploy-web/src/components/deployments/DeploymentDepositModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ export const DeploymentDepositModal: React.FunctionComponent<DeploymentDepositMo
label: "Use depositor to deposit in deployment"
});
} else if (depositData && amountInDenom > depositData?.balance) {
// setError(`You can't deposit more than you currently have in your balance. Current balance is: ${depositData?.balance} ${depositData?.label}.`);
// return;
setError(`You can't deposit more than you currently have in your balance. Current balance is: ${depositData?.balance} ${depositData?.label}.`);
return;
}

onDeploymentDeposit(deposit, isManaged ? browserEnvConfig.NEXT_PUBLIC_MASTER_WALLET_ADDRESS : (depositorAddress as string));
Expand All @@ -218,6 +218,7 @@ export const DeploymentDepositModal: React.FunctionComponent<DeploymentDepositMo
color: "secondary",
variant: "default",
side: "right",
disabled: !amount || isCheckingDepositor || (useDepositor && validGrants.length === 0) || !walletBalance,
isLoading: isCheckingDepositor,
onClick: onDepositClick,
"data-testid": "deposit-modal-continue-button"
Expand Down
16 changes: 8 additions & 8 deletions apps/deploy-web/src/components/layout/CreditCardBanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { useWallet } from "@src/context/WalletProvider/WalletProvider";
import { ConnectManagedWalletButton } from "../wallet/ConnectManagedWalletButton";

export function CreditCardBanner() {
const { hasManagedWallet } = useWallet();

return (
<div className="fixed top-0 z-10 flex h-[40px] w-full items-center justify-center bg-primary px-3 py-2 md:space-x-4">
<span className="text-xs font-semibold text-white md:text-sm">
Console is experiencing issues causing balance not being reflected accurately. Other functionality should work as expected. Reach out to the console
team on{" "}
<a href="https://discord.com/invite/akash" className="text-white underline">
discord
</a>
, if you experience issues.
</span>
<span className="text-xs font-semibold text-white md:text-sm">Credit Card payments are now available!</span>

{!hasManagedWallet && <ConnectManagedWalletButton className="flex-shrink-0 text-white hover:text-white" size="sm" variant="text" />}
</div>
);
}
6 changes: 3 additions & 3 deletions apps/deploy-web/src/components/layout/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { IntlProvider } from "react-intl";
import { ErrorFallback, Spinner } from "@akashnetwork/ui/components";
import { cn } from "@akashnetwork/ui/utils";
import { useMediaQuery, useTheme as useMuiTheme } from "@mui/material";
import { millisecondsInMinute } from "date-fns/constants";

import { ACCOUNT_BAR_HEIGHT } from "@src/config/ui.config";
import { useSettings } from "@src/context/SettingsProvider";
Expand Down Expand Up @@ -55,8 +56,7 @@ const LayoutApp: React.FunctionComponent<Props> = ({ children, isLoading, isUsin
const { refreshNodeStatuses, isSettingsInit } = useSettings();
const { isWalletLoaded } = useWallet();
const smallScreen = useMediaQuery(muiTheme.breakpoints.down("md"));
// const hasCreditCardBanner = useHasCreditCardBanner();
const hasCreditCardBanner = true;
const hasCreditCardBanner = useHasCreditCardBanner();

useEffect(() => {
const _isNavOpen = localStorage.getItem("isNavOpen");
Expand All @@ -67,7 +67,7 @@ const LayoutApp: React.FunctionComponent<Props> = ({ children, isLoading, isUsin

const refreshNodeIntervalId = setInterval(async () => {
await refreshNodeStatuses();
}, 60_000); // refresh every 1min
}, millisecondsInMinute);

return () => {
clearInterval(refreshNodeIntervalId);
Expand Down
56 changes: 28 additions & 28 deletions apps/deploy-web/src/hooks/useManagedDeploymentConfirm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,34 +44,34 @@ export const useManagedDeploymentConfirm = () => {
title: "Confirm deployment creation?",
message: (
<div className="space-y-2">
{/*{!hasEnoughForDeposit && (*/}
{/* <Alert variant="destructive" className="text-primary">*/}
{/* <AlertTitle className="font-bold">Insufficient funds</AlertTitle>*/}
{/* <AlertDescription>*/}
{/* <p>*/}
{/* You need more than{" "}*/}
{/* <FormattedNumber*/}
{/* value={minDeposit.usdc}*/}
{/* // eslint-disable-next-line react/style-prop-object*/}
{/* style="currency"*/}
{/* currency="USD"*/}
{/* />{" "}*/}
{/* available to create a deployment.*/}
{/* </p>*/}
{/* <p>*/}
{/* Current available balance:{" "}*/}
{/* <span className="font-bold">*/}
{/* <FormattedNumber*/}
{/* value={walletBalance?.totalDeploymentGrantsUSD || 0}*/}
{/* // eslint-disable-next-line react/style-prop-object*/}
{/* style="currency"*/}
{/* currency="USD"*/}
{/* />*/}
{/* </span>*/}
{/* </p>*/}
{/* </AlertDescription>*/}
{/* </Alert>*/}
{/*)}*/}
{!hasEnoughForDeposit && (
<Alert variant="destructive" className="text-primary">
<AlertTitle className="font-bold">Insufficient funds</AlertTitle>
<AlertDescription>
<p>
You need more than{" "}
<FormattedNumber
value={minDeposit.usdc}
// eslint-disable-next-line react/style-prop-object
style="currency"
currency="USD"
/>{" "}
available to create a deployment.
</p>
<p>
Current available balance:{" "}
<span className="font-bold">
<FormattedNumber
value={walletBalance?.totalDeploymentGrantsUSD || 0}
// eslint-disable-next-line react/style-prop-object
style="currency"
currency="USD"
/>
</span>
</p>
</AlertDescription>
</Alert>
)}

{services.map(service => {
return (
Expand Down
Loading