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

feat(mfi-v2-ui): improved toasts throughout the app #377

Closed
wants to merge 14 commits into from
Closed

feat(mfi-v2-ui): improved toasts throughout the app #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fe64f1a
feat: add liquidation price to position data
losman0s Nov 23, 2023
b20e346
chore: fetch and log user positions in asset list
chambaz Nov 25, 2023
6de3183
feat: conditionally render position row and print out user position d…
chambaz Nov 25, 2023
f064434
feat: style inline user positions
chambaz Nov 25, 2023
ca44621
chore: override text focus color in select ui component
chambaz Nov 25, 2023
e0f01f3
feat: add token symbol to inline position / add liq price back to len…
chambaz Nov 25, 2023
ce6f174
feat: remove user positions and update user positions filter
chambaz Nov 25, 2023
0224493
feat: mobile inline positions
chambaz Nov 25, 2023
051442d
feat: more padding around asset row buttons
chambaz Nov 25, 2023
4731113
chore: various inline position fixes / improvements
chambaz Nov 25, 2023
1e4b989
feat: higlight inline positions with poor health
chambaz Nov 27, 2023
1b01d03
fix: liq alert range logic
chambaz Nov 27, 2023
2742026
chore: simplify alert logic
chambaz Nov 27, 2023
9683ecd
feat: improved toasts throughout the app
k0beLeenders Nov 27, 2023
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
4 changes: 2 additions & 2 deletions apps/marginfi-v2-ui/src/components/common/AssetList/AssetRowInputBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { InputAdornment, TextField } from "@mui/material";
import { FC, MouseEventHandler, useCallback } from "react";
import { NumberFormatValues, NumericFormat } from "react-number-format";
import { toast } from "react-toastify";
import { showErrorToast } from "~/utils/toastUtils";

interface AssetRowInputBox {
value: number;
Expand All @@ -28,7 +28,7 @@ const AssetRowInputBox: FC<AssetRowInputBox> = ({
if (maxValue !== undefined) {
setValue(maxValue);
} else {
toast.error("Not implemented");
showErrorToast("Not implemented");
}
}, [maxValue, setValue]);

Expand Down
14 changes: 9 additions & 5 deletions apps/marginfi-v2-ui/src/components/common/Staking/StakingCard/StakingCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import { SwapMode, useJupiter } from "@jup-ag/react-hook";
import JSBI from "jsbi";
import { StakeData, usePrevious } from "~/utils";
import { createJupiterApiClient } from "@jup-ag/api";
import { toast } from "react-toastify";
import { SettingsModal } from "./SettingsModal";
import { SettingsIcon } from "./SettingsIcon";
import { LST_MINT, TokenData, TokenDataMap } from "~/store/lstStore";
Expand All @@ -46,6 +45,7 @@ import { IconLoader } from "~/components/ui/icons";
import BN from "bn.js";
import debounce from "lodash.debounce";
import { Desktop, Mobile } from "~/mediaQueries";
import { MultiStepToastHandle, showErrorToast } from "~/utils/toastUtils";

const QUOTE_EXPIRY_MS = 30_000;
const DEFAULT_DEPOSIT_OPTION: DepositOption = { type: "native", amount: new BN(0), maxAmount: new BN(0) };
Expand Down Expand Up @@ -182,7 +182,7 @@ export const StakingCard: FC = () => {
[depositOption, refresh, lastRefreshTimestamp]
);

const showErrotToast = useRef(debounce(() => toast.error("Failed to find route"), 250));
const showErrotToast = useRef(debounce(() => showErrorToast("Failed to find route"), 250));

const prevError = usePrevious(error);
useEffect(() => {
Expand Down Expand Up @@ -267,6 +267,9 @@ export const StakingCard: FC = () => {

setOngoingAction("minting");

const multiStepToast = new MultiStepToastHandle("Stake", [{ label: "Minting LST" }]);
multiStepToast.start();

try {
if (depositOption.type === "stake") {
const { instructions, signers } = await makeDepositStakeToStakePoolIx(
Expand All @@ -293,6 +296,7 @@ export const StakingCard: FC = () => {
} else if (depositOption.type === "token") {
const quote = quoteResponseMeta?.original;
if (!quote) {
multiStepToast.setFailed("Route not calculated yet");
console.error("Route not calculated yet");
return;
}
Expand Down Expand Up @@ -346,10 +350,10 @@ export const StakingCard: FC = () => {
"confirmed"
);
} else {
throw new Error("Invalid deposit option");
multiStepToast.setFailed("Invalid deposit option");
}

toast.success("Minting complete");
multiStepToast.setSuccessAndNext();
} catch (error: any) {
if (error.logs) {
console.log("------ Logs 👇 ------");
Expand All @@ -360,7 +364,7 @@ export const StakingCard: FC = () => {
if (errorMsg) {
errorMsg = errorMsg ? errorMsg : "Transaction failed!";
}
toast.error(errorMsg);
multiStepToast.setFailed(errorMsg);
} finally {
await Promise.all([refresh(), fetchLstState()]);
setDepositOption((currentDepositOption) =>
Expand Down
Loading