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.

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

feature(ui-ux): refetch hot wallet balance and transfer guard #763

Merged
merged 23 commits into from
Mar 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
96 changes: 64 additions & 32 deletions apps/web/src/components/BridgeForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ import { ConnectKitButton } from "connectkit";
import { autoUpdate, shift, size, useFloating } from "@floating-ui/react-dom";
import { networks, useNetworkContext } from "@contexts/NetworkContext";
import { useNetworkEnvironmentContext } from "@contexts/NetworkEnvironmentContext";
import { Network, NetworkOptionsI, SelectionType, TokensI } from "types";
import {
Network,
NetworkOptionsI,
SelectionType,
TokensI,
TokenBalances,
} from "types";
import SwitchIcon from "@components/icons/SwitchIcon";
import UtilityModal, {
ModalConfigType,
Expand Down Expand Up @@ -129,29 +135,50 @@ export default function BridgeForm({

const { getBalance } = useCheckBalance();
const [isBalanceSufficient, setIsBalanceSufficient] = useState(true);
const [tokenBalances, setTokenBalances] = useState({});
const [tokenBalances, setTokenBalances] = useState<TokenBalances | {}>({});
const [isVerifyingTransaction, setIsVerifyingTransaction] = useState(false);

const checkBalance = debounce(async () => {
async function getBalanceFn(): Promise<TokenBalances | {}> {
const key = `${selectedNetworkA.name}-${selectedTokensA.tokenB.symbol}`;
const balance = await getBalance(selectedTokensA.tokenB.symbol);
setTokenBalances({
const updatedBalances = {
...tokenBalances,
[key]: balance,
});
};

setTokenBalances(updatedBalances);
return updatedBalances;
}

const checkBalance = debounce(async () => {
await getBalanceFn();
}, 200);

useEffect(() => {
async function verifySufficientHWBalance(
refetch?: boolean
): Promise<boolean | undefined> {
const key = `${selectedNetworkA.name}-${selectedTokensA.tokenB.symbol}`;
const balance = tokenBalances[key];
const balance = (refetch ? await getBalanceFn() : tokenBalances)[key];

if (balance === null) {
setIsBalanceSufficient(false);
return false;
}

if (balance) {
const isSufficientBalance = new BigNumber(balance).isGreaterThanOrEqualTo(
amount !== "" ? amount : 0
);

setIsBalanceSufficient(isSufficientBalance);
return isSufficientBalance;
}

return undefined;
}

useEffect(() => {
verifySufficientHWBalance();
}, [selectedNetworkA, selectedTokensA, networkEnv, tokenBalances, amount]);

useEffect(() => {
Expand Down Expand Up @@ -198,33 +225,38 @@ export default function BridgeForm({
};

const onTransferTokens = async (): Promise<void> => {
if (isSendingFromEthNetwork) {
// Revalidate entered amount after refetching EVM balance
const refetchedEvmBalance = await refetchEvmBalance();
if (
validateAmountInput(
setIsVerifyingTransaction(true);
const isBalanceSufficientVerified = await verifySufficientHWBalance(true);
if (isBalanceSufficientVerified) {
if (isSendingFromEthNetwork) {
// Revalidate entered amount after refetching EVM balance
const refetchedEvmBalance = await refetchEvmBalance();
if (
validateAmountInput(
amount,
new BigNumber(refetchedEvmBalance.data?.formatted ?? 0)
)
) {
setIsVerifyingTransaction(false);
return;
G9000 marked this conversation as resolved.
Show resolved Hide resolved
}
}
if (!hasUnconfirmedTxn) {
const newTxn = {
selectedNetworkA,
selectedTokensA,
selectedNetworkB,
selectedTokensB,
networkEnv,
amount,
new BigNumber(refetchedEvmBalance.data?.formatted ?? 0)
)
) {
return;
fromAddress,
toAddress: addressInput,
};
setStorage("txn-form", JSON.stringify(newTxn));
}
setShowConfirmModal(true);
}

if (!hasUnconfirmedTxn) {
const newTxn = {
selectedNetworkA,
selectedTokensA,
selectedNetworkB,
selectedTokensB,
networkEnv,
amount,
fromAddress,
toAddress: addressInput,
};
setStorage("txn-form", JSON.stringify(newTxn));
}
setShowConfirmModal(true);
setIsVerifyingTransaction(false);
};

const onResetTransferForm = () => {
Expand Down Expand Up @@ -524,7 +556,7 @@ export default function BridgeForm({
<ActionButton
testId="transfer-btn"
label={getActionBtnLabel()}
isLoading={hasPendingTxn}
isLoading={hasPendingTxn || isVerifyingTransaction}
disabled={
(isConnected && !isFormValid) ||
hasPendingTxn ||
Expand Down
4 changes: 4 additions & 0 deletions apps/web/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ export interface NetworkOptionsI {
tokens: TokensI[];
}

export interface TokenBalances {
[key: string]: number;
}

export interface ProgressStepI {
step: number;
label: string;
Expand Down