{
badgeContent={"l"}
invisible={!showBadges}
>
-
+
lend
@@ -152,7 +152,7 @@ const Navbar: FC = () => {
badgeContent={"s"}
invisible={!showBadges}
>
-
+
swap
@@ -170,7 +170,7 @@ const Navbar: FC = () => {
badgeContent={"b"}
invisible={!showBadges}
>
-
+
bridge
@@ -190,7 +190,7 @@ const Navbar: FC = () => {
invisible={!showBadges}
className="hidden md:block"
>
-
+
earn
@@ -210,15 +210,15 @@ const Navbar: FC = () => {
invisible={!showBadges}
className="hidden md:block"
>
-
+
omni
{process.env.NEXT_PUBLIC_MARGINFI_FEATURES_AIRDROP === "true" && connected &&
}
+
{
if (selectedAccount && extendedBankInfos?.find((b) => b.meta.tokenSymbol === "UXD")?.info.rawBank) {
selectedAccount!.withdrawEmissions(
@@ -236,10 +236,10 @@ const Navbar: FC = () => {
} UXP`}
-
+
{connected && currentFirebaseUser
? `${groupedNumberFormatterDyn.format(Math.round(userPointsData.totalPoints))} points`
- : "P...P...POINTS!"}
+ : "points"}
diff --git a/apps/marginfi-v2-ui/src/components/UserPositions/UserPositionRow/UserPositionRow.tsx b/apps/marginfi-v2-ui/src/components/UserPositions/UserPositionRow/UserPositionRow.tsx
index e0d0ce699c..2561f23a6d 100644
--- a/apps/marginfi-v2-ui/src/components/UserPositions/UserPositionRow/UserPositionRow.tsx
+++ b/apps/marginfi-v2-ui/src/components/UserPositions/UserPositionRow/UserPositionRow.tsx
@@ -11,7 +11,6 @@ import { ActiveBankInfo } from "@mrgnlabs/marginfi-v2-ui-state";
const CLOSE_BALANCE_TOAST_ID = "close-balance";
const WITHDRAW_OR_REPAY_TOAST_ID = "withdraw-or-repay";
-const REFRESH_ACCOUNT_TOAST_ID = "refresh-account";
interface UserPositionRowProps {
activeBankInfo: ActiveBankInfo;
@@ -67,22 +66,9 @@ const UserPositionRow: FC
= ({ activeBankInfo, marginfiAcc
setWithdrawOrRepayAmount(0);
- toast.loading("Refreshing state", { toastId: REFRESH_ACCOUNT_TOAST_ID });
try {
await reloadPositions();
- toast.update(REFRESH_ACCOUNT_TOAST_ID, {
- render: "Refreshing state 👍",
- type: toast.TYPE.SUCCESS,
- autoClose: 2000,
- isLoading: false,
- });
} catch (error: any) {
- toast.update(REFRESH_ACCOUNT_TOAST_ID, {
- render: `Error while reloading state: ${error.message}`,
- type: toast.TYPE.ERROR,
- autoClose: 5000,
- isLoading: false,
- });
console.log("Error while reloading state");
console.log(error);
}
@@ -135,22 +121,9 @@ const UserPositionRow: FC = ({ activeBankInfo, marginfiAcc
setWithdrawOrRepayAmount(0);
- toast.loading("Refreshing state", { toastId: REFRESH_ACCOUNT_TOAST_ID });
try {
await reloadPositions();
- toast.update(REFRESH_ACCOUNT_TOAST_ID, {
- render: "Refreshing state 👍",
- type: toast.TYPE.SUCCESS,
- autoClose: 2000,
- isLoading: false,
- });
} catch (error: any) {
- toast.update(REFRESH_ACCOUNT_TOAST_ID, {
- render: `Error while reloading state: ${error.message}`,
- type: toast.TYPE.ERROR,
- autoClose: 5000,
- isLoading: false,
- });
console.log("Error while reloading state");
console.log(error);
}
@@ -208,7 +181,7 @@ const UserPositionRow: FC = ({ activeBankInfo, marginfiAcc
-
+
{
<>
- {walletAddress && wallet && selectedAccount && !selectedAccount.authority.equals(walletAddress) && (
+ {walletAddress && selectedAccount && isOverride && (
)}
diff --git a/apps/marginfi-v2-ui/src/styles/globals.css b/apps/marginfi-v2-ui/src/styles/globals.css
index b851a4a665..9c411aa1cb 100644
--- a/apps/marginfi-v2-ui/src/styles/globals.css
+++ b/apps/marginfi-v2-ui/src/styles/globals.css
@@ -67,6 +67,47 @@ a {
fill: #DCE85D !important;
}
+.hover-underline-static {
+ display: inline-block;
+ position: relative;
+}
+
+.hover-underline-static::after {
+ content: '';
+ position: absolute;
+ width: 100%;
+ transform: scaleX(1);
+ height: 2px;
+ bottom: 0;
+ left: 0;
+ background-color: #7fff00;
+ transform-origin: center;
+ transition: transform 0.25s ease-out;
+}
+
+.hover-underline-animation {
+ display: inline-block;
+ position: relative;
+}
+
+.hover-underline-animation::after {
+ content: '';
+ position: absolute;
+ width: 100%;
+ transform: scaleX(0);
+ height: 2px;
+ bottom: 0;
+ left: 0;
+ background-color: #7fff00;
+ transform-origin: center;
+ transition: transform 0.25s ease-out;
+}
+
+.hover-underline-animation:hover::after {
+ transform: scaleX(1);
+ transform-origin: center;
+}
+
.glow {
text-shadow: 0 0 10px #DCE85D, 0 0 30px #DCE85D;
color: #DCE85D !important;
@@ -81,4 +122,4 @@ a {
width: 420px;
padding-left: 0px;
padding-right: 0px;
-}
\ No newline at end of file
+}