Remove fusdc/arb earned

fluidity-money · Apr 19, 2024 · 506d55b · 506d55b
1 parent 7dd8b75
commit 506d55b
Show file tree

Hide file tree

Showing 12 changed files with 1,120 additions and 757 deletions.
diff --git a/web/app.fluidity.money/app/components/FLYClaimSubmitModal/index.tsx b/web/app.fluidity.money/app/components/FLYClaimSubmitModal/index.tsx
diff --git a/web/app.fluidity.money/app/components/FLYStakingStatsModal/index.tsx b/web/app.fluidity.money/app/components/FLYStakingStatsModal/index.tsx
diff --git a/web/app.fluidity.money/app/components/Fluidify/FluidifyForm.tsx b/web/app.fluidity.money/app/components/Fluidify/FluidifyForm.tsx
@@ -33,7 +33,11 @@ export const FluidifyForm = ({
 
   const [swapInput, setSwapInput] = useState<string>("");
 
-  const swapAmount: BN = snapToValidValue(swapInput, assetToken, assetToken.userTokenBalance);
+  const swapAmount: BN = snapToValidValue(
+    swapInput,
+    assetToken,
+    assetToken.userTokenBalance
+  );
 
   const assertCanSwap =
     connected &&
@@ -72,7 +76,7 @@ export const FluidifyForm = ({
         snapToValidValue(
           assetToken.userTokenBalance.toString(),
           assetToken,
-          assetToken.userTokenBalance,
+          assetToken.userTokenBalance
         ),
         assetToken.decimals
       )

diff --git a/web/app.fluidity.money/app/components/MobileModal.tsx b/web/app.fluidity.money/app/components/MobileModal.tsx
@@ -24,7 +24,9 @@ type IMobileModal = {
     path: (network: string) => string;
     icon: JSX.Element;
   }>;
-  nonNavigationEntries?: Array<React.DetailedHTMLProps<React.LiHTMLAttributes<HTMLElement>, HTMLElement>>;
+  nonNavigationEntries?: Array<
+    React.DetailedHTMLProps<React.LiHTMLAttributes<HTMLElement>, HTMLElement>
+  >;
   activeIndex: number;
   chains: Record<string, { name: string; icon: JSX.Element }>;
   unclaimedFluid: number;
@@ -209,8 +211,7 @@ export default function MobileModal({
           {/* Navigation between pages */}
           <ul className="sidebar-nav">
             <>
-            {navigationMap
-              .map((obj, index) => {
+              {navigationMap.map((obj, index) => {
                 const key = Object.values(obj)[0];
                 const { name, icon, path } = obj;
                 const active = index === activeIndex;
@@ -241,8 +242,8 @@ export default function MobileModal({
                   </li>
                 );
               })}
-              {...(nonNavigationEntries || [])}
-              </>
+              {...nonNavigationEntries || []}
+            </>
           </ul>
 
           {/* Navigation at bottom of modal */}

diff --git a/web/app.fluidity.money/app/queries/addReferral.ts b/web/app.fluidity.money/app/queries/addReferral.ts
@@ -1,7 +1,11 @@
 import { gql, jsonPost } from "~/util";
 
 const mutation = gql`
-  mutation addReferral($referrer: String!, $referee: String!, $epoch: lootbox_epoch!) {
+  mutation addReferral(
+    $referrer: String!
+    $referee: String!
+    $epoch: lootbox_epoch!
+  ) {
     insert_lootbox_referrals_one(
       object: { referrer: $referrer, referee: $referee, epoch: $epoch }
     ) {

diff --git a/web/app.fluidity.money/app/queries/addReferralCode.ts b/web/app.fluidity.money/app/queries/addReferralCode.ts
@@ -1,9 +1,17 @@
 import { gql, jsonPost } from "~/util";
 
 const mutation = gql`
-  mutation addReferral($address: String!, $referral_code: String!, $epoch: lootbox_epoch!) {
+  mutation addReferral(
+    $address: String!
+    $referral_code: String!
+    $epoch: lootbox_epoch!
+  ) {
     insert_lootbox_referral_codes_one(
-      object: { address: $address, referral_code: $referral_code, epoch: $epoch}
+      object: {
+        address: $address
+        referral_code: $referral_code
+        epoch: $epoch
+      }
     ) {
       address
       referral_code

diff --git a/web/app.fluidity.money/app/queries/requestProof.ts b/web/app.fluidity.money/app/queries/requestProof.ts
@@ -15,9 +15,10 @@ export type RequestProofRes = {
 };
 
 export const requestProof = (address: string, signature: string) => {
-  const body = {address, signature};
+  const body = { address, signature };
 
-  const url = "https://lyqieipytnj32qqga7mpgdpn7q0pxmlw.lambda-url.ap-southeast-2.on.aws/";
+  const url =
+    "https://lyqieipytnj32qqga7mpgdpn7q0pxmlw.lambda-url.ap-southeast-2.on.aws/";
 
   return jsonPost<RequestProofBody, RequestProofRes>(url, body, {});
 };
diff --git a/web/app.fluidity.money/app/queries/useReferralCode.ts b/web/app.fluidity.money/app/queries/useReferralCode.ts
@@ -2,7 +2,9 @@ import { gql, jsonPost } from "~/util";
 
 const queryByAddress = gql`
   query getReferralCodeByAddress($address: String!, $epoch: lootbox_epoch!) {
-    lootbox_referral_codes(where: { address: { _eq: $address }, epoch: { _eq: $epoch } }) {
+    lootbox_referral_codes(
+      where: { address: { _eq: $address }, epoch: { _eq: $epoch } }
+    ) {
       address
       referral_code
       epoch
@@ -12,7 +14,9 @@ const queryByAddress = gql`
 
 const queryByCode = gql`
   query getReferralCodeByCode($code: String!, $epoch: lootbox_epoch!) {
-    lootbox_referral_codes(where: { referral_code: { _eq: $code }, epoch: { _eq: $epoch } }) {
+    lootbox_referral_codes(
+      where: { referral_code: { _eq: $code }, epoch: { _eq: $epoch } }
+    ) {
       address
       referral_code
       epoch

diff --git a/web/app.fluidity.money/app/queries/useReferralCount.ts b/web/app.fluidity.money/app/queries/useReferralCount.ts
@@ -1,9 +1,16 @@
 import { gql, jsonPost } from "~/util";
 
 const queryActiveByReferrerAddress = gql`
-  query getClaimedReferrerReferralCount($address: String!, $epoch: lootbox_epoch!) {
-    lootbox_referrals_aggregate (
-      where: { referrer: { _eq: $address }, active: { _eq: true }, epoch: { _eq: $epoch } }
+  query getClaimedReferrerReferralCount(
+    $address: String!
+    $epoch: lootbox_epoch!
+  ) {
+    lootbox_referrals_aggregate(
+      where: {
+        referrer: { _eq: $address }
+        active: { _eq: true }
+        epoch: { _eq: $epoch }
+      }
     ) {
       aggregate {
         count
@@ -13,9 +20,16 @@ const queryActiveByReferrerAddress = gql`
 `;
 
 const queryActiveByRefereeAddress = gql`
-  query getClaimedReferreeReferralCount($address: String!, $epoch: lootbox_epoch!) {
+  query getClaimedReferreeReferralCount(
+    $address: String!
+    $epoch: lootbox_epoch!
+  ) {
     lootbox_referrals_aggregate(
-      where: { referee: { _eq: $address }, active: { _eq: true }, epoch: { _eq: $epoch } }
+      where: {
+        referee: { _eq: $address }
+        active: { _eq: true }
+        epoch: { _eq: $epoch }
+      }
     ) {
       aggregate {
         count
@@ -25,9 +39,16 @@ const queryActiveByRefereeAddress = gql`
 `;
 
 const queryInactiveByRefereeAddress = gql`
-  query getClaimedReferrerReferralCount($address: String!, $epoch: lootbox_epoch!) {
+  query getClaimedReferrerReferralCount(
+    $address: String!
+    $epoch: lootbox_epoch!
+  ) {
     lootbox_referrals_aggregate(
-      where: { referee: { _eq: $address }, active: { _eq: false }, epoch: { _eq: $epoch } }
+      where: {
+        referee: { _eq: $address }
+        active: { _eq: false }
+        epoch: { _eq: $epoch }
+      }
     ) {
       aggregate {
         count
@@ -55,10 +76,13 @@ type ReferralCountRes = {
   errors?: unknown;
 };
 
-const useActiveReferralCountByReferrerAddress = (address: string, epoch: string) => {
+const useActiveReferralCountByReferrerAddress = (
+  address: string,
+  epoch: string
+) => {
   const variables = {
     address,
-    epoch
+    epoch,
   };
 
   const body = {
@@ -79,7 +103,10 @@ const useActiveReferralCountByReferrerAddress = (address: string, epoch: string)
   );
 };
 
-const useActiveReferralCountByRefereeAddress = (address: string, epoch: string) => {
+const useActiveReferralCountByRefereeAddress = (
+  address: string,
+  epoch: string
+) => {
   const variables = {
     address,
     epoch,
@@ -103,7 +130,10 @@ const useActiveReferralCountByRefereeAddress = (address: string, epoch: string)
   );
 };
 
-const useInactiveReferralCountByRefereeAddress = (address: string, epoch: string) => {
+const useInactiveReferralCountByRefereeAddress = (
+  address: string,
+  epoch: string
+) => {
   const variables = {
     address,
     epoch,

diff --git a/web/app.fluidity.money/app/queries/useReferrals.ts b/web/app.fluidity.money/app/queries/useReferrals.ts
@@ -10,9 +10,17 @@ export type Referral = {
 };
 
 const QUERY_BY_ADDRESS = gql`
-  query getReferralByAddress($referrer: String!, $referee: String!, $epoch: lootbox_epoch!) {
+  query getReferralByAddress(
+    $referrer: String!
+    $referee: String!
+    $epoch: lootbox_epoch!
+  ) {
     lootbox_referrals(
-      where: { referrer: { _eq: $referrer }, referee: { _eq: $referee }, epoch: { _eq: $epoch } }
+      where: {
+        referrer: { _eq: $referrer }
+        referee: { _eq: $referee }
+        epoch: { _eq: $epoch }
+      }
     ) {
       active
       createdTime: created_time
@@ -25,9 +33,16 @@ const QUERY_BY_ADDRESS = gql`
 `;
 
 const QUERY_INACTIVE_BY_ADDRESS = gql`
-  query getInactiveReferralByAddress($address: String!, $epoch: lootbox_epoch!) {
+  query getInactiveReferralByAddress(
+    $address: String!
+    $epoch: lootbox_epoch!
+  ) {
     lootbox_referrals(
-      where: { referee: { _eq: $address }, active: { _eq: false }, epoch: { _eq: $epoch } }
+      where: {
+        referee: { _eq: $address }
+        active: { _eq: false }
+        epoch: { _eq: $epoch }
+      }
       order_by: { created_time: asc }
       limit: 1
     ) {
@@ -65,7 +80,11 @@ type ReferralsRes = {
   errors?: unknown;
 };
 
-const useReferralByAddress = (referrer: string, referee: string, epoch: string) => {
+const useReferralByAddress = (
+  referrer: string,
+  referee: string,
+  epoch: string
+) => {
   const variables = {
     referrer,
     referee,

diff --git a/web/app.fluidity.money/app/root.tsx b/web/app.fluidity.money/app/root.tsx
@@ -15,7 +15,11 @@ import { withSentry } from "@sentry/remix";
 
 import globalStylesheetUrl from "./global-styles.css";
 import surfingStylesheetUrl from "@fluidity-money/surfing/dist/style.css";
-import { JoeFarmlandsOrCamelotKingdomLinks, ToolTipLinks, FLYClaimSubmitModalLinks } from "./components";
+import {
+  JoeFarmlandsOrCamelotKingdomLinks,
+  ToolTipLinks,
+  FLYClaimSubmitModalLinks,
+} from "./components";
 import { ToolProvider } from "./components/ToolTip";
 import CacheProvider from "contexts/CacheProvider";
 import { useEffect, useState } from "react";

diff --git a/web/app.fluidity.money/app/routes/$network/dashboard/airdrop/index.tsx b/web/app.fluidity.money/app/routes/$network/dashboard/airdrop/index.tsx
@@ -29,7 +29,6 @@ import {
   toSignificantDecimals,
   numberToCommaSeparated,
   useViewport,
-  numberToMonetaryString,
   toDecimalPlaces,
 } from "@fluidity-money/surfing";
 import {
@@ -519,7 +518,7 @@ const Airdrop = () => {
   const airdropLeaderboardData = useMemo(() => ({
     loaded: airdropLeaderboardData_?.loaded,
     leaderboard: getLeaderboardWithUser(
-      airdropLeaderboardData_?.leaderboard || [], 
+      airdropLeaderboardData_?.leaderboard || [],
       address ?? ""
     )
   }), [airdropLeaderboardData_])
@@ -1597,7 +1596,7 @@ const airdropRankRow = (
   isMobile = false
 ): IRow => {
   const { address } = useContext(FluidityFacadeContext);
-  const { user, rank, referralCount, fusdcEarned, flyStaked, bottles } = data;
+  const { user, rank, referralCount, flyStaked, bottles } = data;
 
   return {
     className: `airdrop-row ${isMobile ? "airdrop-mobile" : ""} ${address && address === user ? "highlighted-row" : ""
@@ -1662,40 +1661,6 @@ const airdropRankRow = (
               </Text>
             </td>
           );
-        case "$fUSDC EARNED":
-          return (
-            <td>
-              <Text
-                prominent
-                style={
-                  address && address === user
-                    ? {
-                      color: "black",
-                    }
-                    : {}
-                }
-              >
-                {numberToMonetaryString(fusdcEarned)}
-              </Text>
-            </td>
-          );
-        case "$ARB EARNED":
-          return (
-            <td>
-              <Text
-                prominent
-                style={
-                  address && address === user
-                    ? {
-                      color: "black",
-                    }
-                    : {}
-                }
-              >
-                0
-              </Text>
-            </td>
-          );
         case "$FLY STAKED":
           return (
             <td>
@@ -1818,8 +1783,6 @@ const Leaderboard = ({
           { name: "RANK" },
           { name: "USER" },
           { name: "BOTTLES" },
-          { name: "$fUSDC EARNED" },
-          { name: "$ARB EARNED" },
           { name: "$FLY STAKED" },
           { name: "REFERRALS" },
         ]}