From c2413b7c11f10081b0346b469a3f26b4861fb8ef Mon Sep 17 00:00:00 2001
From: eli-d <64763513+eli-d@users.noreply.github.com>
Date: Wed, 3 Apr 2024 13:24:45 +1030
Subject: [PATCH 1/2] add get fly to mobile navbar
---
.../app/routes/$network/dashboard.tsx | 67 +++++++++++--------
1 file changed, 40 insertions(+), 27 deletions(-)
diff --git a/web/app.fluidity.money/app/routes/$network/dashboard.tsx b/web/app.fluidity.money/app/routes/$network/dashboard.tsx
index 1a0d9ac44..faf521654 100644
--- a/web/app.fluidity.money/app/routes/$network/dashboard.tsx
+++ b/web/app.fluidity.money/app/routes/$network/dashboard.tsx
@@ -179,29 +179,29 @@ const NAVIGATION_MAP: {
icon: JSX.Element;
};
}[] = [
- ...airdropTab,
- {
- home: {
- name: "dashboard",
- path: (network: string) => `/${network}/dashboard/home`,
- icon: ,
+ ...airdropTab,
+ {
+ home: {
+ name: "dashboard",
+ path: (network: string) => `/${network}/dashboard/home`,
+ icon: ,
+ },
},
- },
- {
- rewards: {
- name: "rewards",
- path: (network: string) => `/${network}/dashboard/rewards`,
- icon: ,
+ {
+ rewards: {
+ name: "rewards",
+ path: (network: string) => `/${network}/dashboard/rewards`,
+ icon: ,
+ },
},
- },
- {
- assets: {
- name: "assets",
- path: (network: string) => `/${network}/dashboard/assets`,
- icon: ,
+ {
+ assets: {
+ name: "assets",
+ path: (network: string) => `/${network}/dashboard/assets`,
+ icon: ,
+ },
},
- },
-];
+ ];
const CHAIN_NAME_MAP: Record<
string,
@@ -425,9 +425,9 @@ export default function Dashboard() {
const otherModalOpen =
openMobModal ||
- walletModalVisibility ||
- connectedWalletModalVisibility ||
- chainModalVisibility
+ walletModalVisibility ||
+ connectedWalletModalVisibility ||
+ chainModalVisibility
? true
: false;
@@ -503,9 +503,8 @@ export default function Dashboard() {
{/* Fluidify Money button, in a portal with z-index above tooltip if another modal isn't open */}
navigate("../fluidify")}
@@ -892,7 +891,21 @@ export default function Dashboard() {
setStakingStatsModalVisibility(true)}>
STAKING
- ]}
+ ,
+
+
+
+
+ GET FLY
+
+
+
+ ]}
activeIndex={activeIndex}
chains={chainNameMap}
unclaimedFluid={userUnclaimedRewards}
From 9a0e6d834bbd3f7ee6e154b870657e067e9abc10 Mon Sep 17 00:00:00 2001
From: user
Date: Thu, 4 Apr 2024 15:56:35 +1030
Subject: [PATCH 2/2] Fix issue with the navbar display
---
.../app/routes/$network/dashboard.tsx | 25 +++++++++----------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/web/app.fluidity.money/app/routes/$network/dashboard.tsx b/web/app.fluidity.money/app/routes/$network/dashboard.tsx
index be14e12e5..e7c016a88 100644
--- a/web/app.fluidity.money/app/routes/$network/dashboard.tsx
+++ b/web/app.fluidity.money/app/routes/$network/dashboard.tsx
@@ -178,20 +178,19 @@ const NAVIGATION_MAP: {
icon: JSX.Element;
};
}[] = [
- ...airdropTab,
- {
- home: {
- name: "dashboard",
- path: (network: string) => `/${network}/dashboard/home`,
- icon: ,
- },
+ ...airdropTab,
+ {
+ home: {
+ name: "dashboard",
+ path: (network: string) => `/${network}/dashboard/home`,
+ icon: ,
},
- {
- rewards: {
- name: "rewards",
- path: (network: string) => `/${network}/dashboard/rewards`,
- icon: ,
- },
+ },
+ {
+ rewards: {
+ name: "rewards",
+ path: (network: string) => `/${network}/dashboard/rewards`,
+ icon: ,
},
},
];