Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 22 additions & 4 deletions src/atoms/wallet-atom.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { Atom } from "@effect-atom/atom-react";
import { Effect, Stream } from "effect";
import type { WalletConnected } from "@/domain/wallet";
import type {
BrowserWalletConnected,
LedgerWalletConnected,
} from "@/domain/wallet";
import { runtimeAtom } from "@/services/runtime";
import { WalletService } from "@/services/wallet/wallet-service";

Expand All @@ -14,14 +17,29 @@ export const walletAtom = runtimeAtom.atom(
}

if (a.status === "connected" && b.status === "connected") {
return a.currentAccount.id === b.currentAccount.id;
const addressMatch =
a.currentAccount.address === b.currentAccount.address;

if (a.type === "ledger" && b.type === "ledger") {
const aAccount = a.currentAccount;
const bAccount = b.currentAccount;
return addressMatch && aAccount.id === bAccount.id;
}

if (a.type === "browser") {
return addressMatch;
}
}

return true;
}),
),
);

export const switchAccountAtom = Atom.family((wallet: WalletConnected) =>
runtimeAtom.fn(wallet.switchAccount),
export const switchLedgerAccountAtom = Atom.family(
(wallet: LedgerWalletConnected) => runtimeAtom.fn(wallet.switchAccount),
);

export const switchBrowserAccountAtom = Atom.family(
(wallet: BrowserWalletConnected) => runtimeAtom.fn(wallet.switchAccount),
);
28 changes: 18 additions & 10 deletions src/components/modules/Account/Deposit/state.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
Number as _Number,
Effect,
Option,
Predicate,
Record,
Schema,
} from "effect";
Expand All @@ -22,6 +23,7 @@ import {
} from "@/atoms/tokens-atoms";
import { walletAtom } from "@/atoms/wallet-atom";
import { AmountField } from "@/components/molecules/forms";
import { isArbUsdcToken, isEthNativeToken, makeToken } from "@/domain/tokens";
import type { TokenBalance } from "@/domain/types";
import {
isWalletConnected,
Expand Down Expand Up @@ -147,8 +149,10 @@ export const depositFormBuilder = FormBuilder.empty

const cryptoAmount = values.Amount / tokenBalance.price;

if (values.Amount < 10) {
return { path: ["Amount"], message: "Minimum deposit is $10" };
const usdMin = isArbUsdcToken(makeToken(tokenBalance.token)) ? 5 : 10;

if (values.Amount < usdMin) {
return { path: ["Amount"], message: `Minimum deposit is $${usdMin}` };
}

if (Number(tokenBalance.amount) < cryptoAmount) {
Expand Down Expand Up @@ -191,8 +195,7 @@ export const DepositForm = FormReact.make(depositFormBuilder, {
amount: cryptoAmount.toString(),
fromToken: {
network: selectedTokenBalance.token.network,
...(selectedTokenBalance.token.address !==
"0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" && {
...(!isEthNativeToken(makeToken(selectedTokenBalance.token)) && {
address: selectedTokenBalance.token.address,
}),
},
Expand All @@ -217,19 +220,24 @@ export const useDepositPercentage = (

const setAmount = useAtomSet(setAmountFieldAtom);

const tokenBalance = useAtomValue(
const availableBalanceUsd = useAtomValue(
selectedTokenBalanceAtom(walletAddress),
).pipe(Result.getOrElse(() => null));

const availableBalanceUsd = tokenBalance
? Number(tokenBalance.amount) * tokenBalance.price
: 0;
).pipe(
Result.value,
Option.filter(Predicate.isNotNull),
Option.map((balance) => Number(balance.amount) * balance.price),
Option.getOrElse(() => 0),
);

const percentage = _Number.clamp({ minimum: 0, maximum: 100 })(
(amount / availableBalanceUsd) * 100,
);

const handlePercentageChange = (newPercentage: number) => {
if (newPercentage >= 100) {
return setAmount(availableBalanceUsd.toString());
}

const amount = (availableBalanceUsd * newPercentage) / 100;
setAmount(truncateNumber(amount).toString());
};
Expand Down
16 changes: 11 additions & 5 deletions src/components/modules/Account/Withdraw/state.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,21 @@ export const useWithdrawPercentage = (wallet: WalletConnected) => {

const setAmount = useAtomSet(setAmountFieldAtom);

const providerBalance = useAtomValue(
const availableBalance = useAtomValue(
selectedProviderBalancesAtom(wallet.currentAccount.address),
).pipe(Result.getOrElse(() => null));

const availableBalance = providerBalance?.availableBalance ?? 0;
).pipe(
Result.value,
Option.map((v) => v.availableBalance),
Option.getOrElse(() => 0),
);

const handlePercentageChange = (newPercentage: number) => {
if (newPercentage >= 100) {
return setAmount(availableBalance.toString());
}

const amount = (availableBalance * newPercentage) / 100;
setAmount(truncateNumber(amount).toString());
setAmount(truncateNumber(amount, 6).toString());
};

const percentage = _Number.clamp({ minimum: 0, maximum: 100 })(
Expand Down
Loading
Loading