Restore the lootbottles to their former glory

fluidity-money · Jan 11, 2024 · 66cea87 · 66cea87
1 parent 9b0bda0
commit 66cea87
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 10 deletions.
diff --git a/web/app.fluidity.money/app/queries/index.ts b/web/app.fluidity.money/app/queries/index.ts
@@ -10,3 +10,4 @@ export * from "./addReferral";
 export * from "./useReferralCode";
 export * from "./addReferralCode";
 export * from "./useLootboxConfig";
+export * from "./useLootBottles";
diff --git a/web/app.fluidity.money/app/queries/useLootBottles.ts b/web/app.fluidity.money/app/queries/useLootBottles.ts
@@ -14,7 +14,7 @@ const QUERY_BY_TX_HASH = gql`
 export type Lootbox = {
   txHash?: string;
   lootboxCount: number;
-  rewardTier: number;
+  rewardTier: Rarity;
 };
 
 type LootboxesByTxHashBody = {

diff --git a/web/app.fluidity.money/app/queries/useUserActionsAggregate.ts b/web/app.fluidity.money/app/queries/useUserActionsAggregate.ts
@@ -1,5 +1,6 @@
 import Transaction from "~/types/Transaction";
 import { fetchGqlEndpoint, gql, jsonPost, Queryable } from "~/util";
+import { Rarity } from "@fluidity-money/surfing";
 
 export type AggregatedTransaction = Omit<
   Transaction,
@@ -10,7 +11,7 @@ export type AggregatedTransaction = Omit<
   swap_in: boolean;
   type: "send" | "swap";
   timestamp: string;
-  rewardTier: number;
+  rewardTier: Rarity;
   lootboxCount: number;
 };
 

diff --git a/web/app.fluidity.money/app/queries/useUserTransactions.ts b/web/app.fluidity.money/app/queries/useUserTransactions.ts
@@ -8,7 +8,9 @@ import {
   getTokenFromAddress,
   Token,
 } from "~/util/chainUtils/tokens";
+import { Rarity } from "@fluidity-money/surfing";
 import { MintAddress } from "~/types/MintAddress";
+import { translateRewardTierToRarity } from "./useLootBottles";
 
 const queryByAddress: Queryable = {
   arbitrum: gql`
@@ -359,7 +361,7 @@ export type UserTransaction = {
   currency: { symbol: string };
   application: string;
   lootboxCount: number;
-  rewardTier: number;
+  rewardTier: Rarity;
 };
 
 type HasuraUserTransaction = {
@@ -550,7 +552,7 @@ const parseHasuraUserTransactions = (
           },
           application: transfer.application,
           lootboxCount: transfer.lootboxCount,
-          rewardTier: transfer.rewardTier,
+          rewardTier: translateRewardTierToRarity(transfer.rewardTier),
         };
       }),
     },

diff --git a/web/app.fluidity.money/app/routes/$network/dashboard/rewards/index.tsx b/web/app.fluidity.money/app/routes/$network/dashboard/rewards/index.tsx
@@ -38,6 +38,7 @@ import {
   WalletIcon,
   TabButton,
   toDecimalPlaces,
+  LootBottle,
 } from "@fluidity-money/surfing";
 import { useContext, useEffect, useState, useMemo } from "react";
 import { ToolTipContent, useToolTip, UtilityToken } from "~/components";
@@ -434,6 +435,7 @@ export default function Rewards() {
       utilityTokens,
       application,
       lootboxCount,
+      rewardTier,
     } = data;
 
     const toolTip = useToolTip();
@@ -547,7 +549,11 @@ export default function Rewards() {
                     className="table-address"
                     href={`/${network}/dashboard/airdrop`}
                   >
-                    <Text>{ lootboxCount }</Text>
+                    <LootBottle
+                      size="lg"
+                      rarity={rewardTier}
+                      quantity={lootboxCount}
+                    />
                   </a>
                 ) : (
                   <Text>-</Text>

diff --git a/web/app.fluidity.money/app/routes/$network/query/userTransactions.tsx b/web/app.fluidity.money/app/routes/$network/query/userTransactions.tsx
@@ -12,6 +12,7 @@ import {
   useUserRewardsByAddress,
   useUserTransactionsAll,
   useUserTransactionsByAddress,
+  translateRewardTierToRarity
 } from "~/queries";
 import { captureException } from "@sentry/react";
 import { MintAddress } from "~/types/MintAddress";
@@ -24,6 +25,7 @@ import {
   useUserActionsAll,
   useUserActionsByAddress,
 } from "~/queries/useUserActionsAggregate";
+import { Rarity } from "@fluidity-money/surfing";
 import { chainType } from "~/util/chainUtils/chains";
 
 const FLUID_UTILITY = "FLUID";
@@ -38,7 +40,7 @@ type UserTransaction = {
   value: number;
   currency: string;
   application: string;
-  rewardTier: number;
+  rewardTier: Rarity;
   lootboxCount: number;
 };
 
@@ -377,7 +379,7 @@ export const loader: LoaderFunction = async ({ params, request }) => {
           currency,
           application,
           lootboxCount,
-          rewardTier,
+          rewardTier: translateRewardTierToRarity(Object.values(Rarity).indexOf(rewardTier)),
         };
       }
     );

diff --git a/web/app.fluidity.money/app/routes/$network/query/winningUserTransactions.tsx b/web/app.fluidity.money/app/routes/$network/query/winningUserTransactions.tsx
@@ -8,7 +8,9 @@ import {
   useUserRewardsAll,
   useUserRewardsByAddress,
   useUserTransactionsByTxHash,
+  translateRewardTierToRarity
 } from "~/queries";
+import { Rarity } from "@fluidity-money/surfing";
 import { captureException } from "@sentry/react";
 import { MintAddress } from "~/types/MintAddress";
 import { Winner } from "~/queries/useUserRewards";
@@ -26,7 +28,7 @@ type UserTransaction = {
   value: number;
   currency: string;
   application: string;
-  rewardTier: number;
+  rewardTier: Rarity;
   lootboxCount: number;
 };
 
@@ -227,7 +229,7 @@ export const loader: LoaderFunction = async ({ params, request }) => {
           currency,
           application,
           lootboxCount,
-          rewardTier,
+          rewardTier: translateRewardTierToRarity(Object.values(Rarity).indexOf(rewardTier)),
         };
       }
     );

diff --git a/web/app.fluidity.money/app/types/Transaction.ts b/web/app.fluidity.money/app/types/Transaction.ts
@@ -1,3 +1,5 @@
+import { Rarity } from "@fluidity-money/surfing";
+
 type Transaction = {
   sender: string;
   receiver: string;
@@ -14,7 +16,7 @@ type Transaction = {
   swapType?: "in" | "out";
   utilityTokens?: { [tokens: string]: number };
   application: string;
-  rewardTier: number;
+  rewardTier: Rarity;
   lootboxCount: number;
 };