wip

TempleDAO · Jan 2, 2025 · a9d289c · a9d289c
1 parent 9348ac8
commit a9d289c
Show file tree

Hide file tree

Showing 14 changed files with 175 additions and 163 deletions.
diff --git a/apps/dapp/src/assets/images/gold-auctions.svg b/apps/dapp/src/assets/images/gold-auctions.svg
diff --git a/...ponents/Pages/Core/DappPages/SpiceBazaar/Earn/Auctions/AuctionsHistoryTable/DataTable.tsx b/...ponents/Pages/Core/DappPages/SpiceBazaar/Earn/Auctions/AuctionsHistoryTable/DataTable.tsx
@@ -278,15 +278,16 @@ const TableHeader = styled.th`
   z-index: 1;
 `;
 
-const DataRow = styled.tr``;
+const DataRow = styled.tr`
+  border-bottom: 1px solid ${({ theme }) => theme.palette.brand};
+`;
 
 const DataCell = styled.td`
   font-size: 13px;
   font-weight: 700;
   line-height: 20px;
   text-align: left;
   padding: 20px 0px 20px 0px;
-  border-bottom: 1px solid ${({ theme }) => theme.palette.brand};
   color: ${({ theme }) => theme.palette.brandLight};
 
   &:first-child {

diff --git a/...c/components/Pages/Core/DappPages/SpiceBazaar/Earn/Auctions/BidHistoryTable/DataTable.tsx b/...c/components/Pages/Core/DappPages/SpiceBazaar/Earn/Auctions/BidHistoryTable/DataTable.tsx
@@ -175,7 +175,9 @@ const TableHeader = styled.th`
   z-index: 1;
 `;
 
-const DataRow = styled.tr``;
+const DataRow = styled.tr`
+  border-bottom: 1px solid ${({ theme }) => theme.palette.brand};
+`;
 
 const DataCell = styled.td`
   font-size: 13px;
@@ -184,7 +186,6 @@ const DataCell = styled.td`
   text-align: left;
   padding: 20px 0px 20px 0px;
   width: 33.33%;
-  border-bottom: 1px solid ${({ theme }) => theme.palette.brand};
   color: ${({ theme }) => theme.palette.brandLight};
 
   a {

diff --git a/...p/src/components/Pages/Core/DappPages/SpiceBazaar/Earn/Auctions/BidHistoryTable/Table.tsx b/...p/src/components/Pages/Core/DappPages/SpiceBazaar/Earn/Auctions/BidHistoryTable/Table.tsx
@@ -1,9 +1,14 @@
 import styled from 'styled-components';
 import { DataTable } from './DataTable';
 import { useBidsHistory } from '../hooks/use-bids-history';
+import { DaiGoldAuctionInfo } from 'providers/SpiceBazaarProvider';
 
-export const BidHistory = () => {
-  const { data, loading, error, refetch } = useBidsHistory();
+export const BidHistory = ({
+  auctionInfo,
+}: {
+  auctionInfo: DaiGoldAuctionInfo;
+}) => {
+  const { data, loading, error, refetch } = useBidsHistory(auctionInfo);
 
   return (
     <BidHistoryContainer>

diff --git a/apps/dapp/src/components/Pages/Core/DappPages/SpiceBazaar/Earn/Auctions/BidUSDS.tsx b/apps/dapp/src/components/Pages/Core/DappPages/SpiceBazaar/Earn/Auctions/BidUSDS.tsx
@@ -12,6 +12,7 @@ import { formatToken } from 'utils/formatter';
 import { useEffect, useState } from 'react';
 import { useSpiceBazaar } from 'providers/SpiceBazaarProvider';
 import { formatBigNumber } from 'components/Vault/utils';
+import { formatNumberAbbreviated } from 'utils/formatter';
 import { ZERO } from 'utils/bigNumber';
 import { getTokenInfo } from 'components/Vault/utils';
 
@@ -78,6 +79,13 @@ export const BidUSDS = ({
     return (numericAmount / daiGoldAuctionInfo.data.priceRatio).toFixed(2);
   };
 
+  const exceededAmount =
+    Number(
+      calculateTGLDAmount(
+        (Number(inputValue) + Number(currentBidAmount)).toString()
+      )
+    ) > Number(daiGoldAuctionInfo?.data?.totalAuctionTokenAmount);
+
   return (
     <ContentContainer>
       <TitleContainer>
@@ -142,11 +150,18 @@ export const BidUSDS = ({
           <ReceiveContainer>
             <TempleGoldIcon />
             <ReceiveAmount>
-              {inputValue === ''
+              {inputValue === '' || exceededAmount
                 ? '0'
-                : calculateTGLDAmount(
-                    (Number(inputValue) + Number(currentBidAmount)).toString()
-                  )}{' '}
+                : (() => {
+                    const totalAmount =
+                      Number(inputValue) + Number(currentBidAmount);
+                    const calculatedAmount = calculateTGLDAmount(
+                      totalAmount.toString()
+                    );
+                    return Number(calculatedAmount) > 1e8
+                      ? formatNumberAbbreviated(Number(calculatedAmount)).string
+                      : calculatedAmount;
+                  })()}{' '}
               TGLD
             </ReceiveAmount>
           </ReceiveContainer>
@@ -160,6 +175,16 @@ export const BidUSDS = ({
             USDS per TGLD
           </ReceiveTextBottom>
         </ReceiveAmountContainer>
+        {exceededAmount && (
+          <WarningMessage>
+            <InfoCircle>
+              <p>i</p>
+            </InfoCircle>
+            <MessageText>
+              <Text>Amount exceeds TGLD auction limit.</Text>
+            </MessageText>
+          </WarningMessage>
+        )}
         <WarningMessage>
           <InfoCircle>
             <p>i</p>
@@ -176,7 +201,7 @@ export const BidUSDS = ({
         <TradeButton
           style={{ whiteSpace: 'nowrap', margin: '0px', alignSelf: 'center' }}
           onClick={() => handleBidClick(inputValue)}
-          disabled={!inputValue}
+          disabled={!inputValue || exceededAmount}
         >
           SUBMIT BID
         </TradeButton>

diff --git a/...p/src/components/Pages/Core/DappPages/SpiceBazaar/Earn/Auctions/hooks/use-bids-history.ts b/...p/src/components/Pages/Core/DappPages/SpiceBazaar/Earn/Auctions/hooks/use-bids-history.ts
@@ -1,6 +1,7 @@
 import { useState, useEffect, useCallback } from 'react';
 import { bidsHistoryGoldAuction, subgraphQuery } from 'utils/subgraph';
 import env from 'constants/env';
+import { DaiGoldAuctionInfo } from 'providers/SpiceBazaarProvider';
 
 export type Bid = {
   date: string;
@@ -17,7 +18,9 @@ type UseBidsHistoryReturn = {
   refetch: () => void;
 };
 
-export const useBidsHistory = (): UseBidsHistoryReturn => {
+export const useBidsHistory = (
+  auctionInfo: DaiGoldAuctionInfo
+): UseBidsHistoryReturn => {
   const [data, setData] = useState<Bid[] | null>(null);
   const [loading, setLoading] = useState<boolean>(false);
   const [error, setError] = useState<string | null>(null);
@@ -27,14 +30,18 @@ export const useBidsHistory = (): UseBidsHistoryReturn => {
     return `${hash.slice(0, 16)}...${hash.slice(-8)}`;
   };
 
+  const daiGoldAuction = env.contracts.spiceBazaar.daiGoldAuction.toLowerCase();
+  const epoch = auctionInfo.currentEpoch.toString();
+  const auctionId = `${daiGoldAuction}-${epoch}`;
+
   const fetchData = useCallback(async () => {
     setLoading(true);
     setError(null);
 
     try {
       const response = await subgraphQuery(
         env.subgraph.spiceBazaar,
-        bidsHistoryGoldAuction()
+        bidsHistoryGoldAuction(auctionId)
       );
       setData(
         response.stableGoldAuctionInstance.bidTransaction.map((r) => ({

diff --git a/apps/dapp/src/components/Pages/Core/DappPages/SpiceBazaar/Earn/Auctions/index.tsx b/apps/dapp/src/components/Pages/Core/DappPages/SpiceBazaar/Earn/Auctions/index.tsx
@@ -244,7 +244,7 @@ export const Auctions = () => {
                     <Chart auctionInfo={daiGoldAuctionInfo} />
                   </ChartContainer>
                   <TableContainer>
-                    <BidHistory />
+                    <BidHistory auctionInfo={daiGoldAuctionInfo} />
                   </TableContainer>
                 </>
               )}

diff --git a/apps/dapp/src/components/Pages/Core/DappPages/SpiceBazaar/Earn/StakeTemple/index.tsx b/apps/dapp/src/components/Pages/Core/DappPages/SpiceBazaar/Earn/StakeTemple/index.tsx
@@ -147,13 +147,18 @@ export const StakeTemple = () => {
                       &nbsp;TEMPLE
                     </Sum>
                     <Title>
-                      Your Stake (
-                      {(
-                        (stakePageMetricsData.yourStake /
-                          stakePageMetricsData.stakedTemple) *
-                        100
-                      ).toFixed(2)}
-                      % of total)
+                      Your Stake
+                      {stakePageMetricsData.yourStake > 0 && (
+                        <>
+                          (
+                          {(
+                            (stakePageMetricsData.yourStake /
+                              stakePageMetricsData.stakedTemple) *
+                            100
+                          ).toFixed(2)}
+                          % of total)
+                        </>
+                      )}
                     </Title>
                   </>
                 )}

diff --git a/...pp/src/components/Pages/Core/DappPages/SpiceBazaar/MyActivity/DataTables/BidDataTable.tsx b/...pp/src/components/Pages/Core/DappPages/SpiceBazaar/MyActivity/DataTables/BidDataTable.tsx
@@ -287,15 +287,16 @@ const TableHeader = styled.th<{ name: string }>`
   z-index: 1;
 `;
 
-const DataRow = styled.tr``;
+const DataRow = styled.tr`
+  border-bottom: 1px solid ${({ theme }) => theme.palette.brand};
+`;
 
 const DataCell = styled.td`
   font-size: 13px;
   font-weight: 700;
   line-height: 20px;
   text-align: left;
   padding: 20px 0px 20px 0px;
-  border-bottom: 1px solid ${({ theme }) => theme.palette.brand};
   color: ${({ theme }) => theme.palette.brandLight};
 
   &:first-child {

diff --git a/...mponents/Pages/Core/DappPages/SpiceBazaar/MyActivity/DataTables/TransactionsDataTable.tsx b/...mponents/Pages/Core/DappPages/SpiceBazaar/MyActivity/DataTables/TransactionsDataTable.tsx
@@ -199,7 +199,9 @@ const TableHeader = styled.th`
   z-index: 1;
 `;
 
-const DataRow = styled.tr``;
+const DataRow = styled.tr`
+  border-bottom: 1px solid ${({ theme }) => theme.palette.brand};
+`;
 
 const DataCell = styled.td`
   font-size: 13px;
@@ -208,7 +210,6 @@ const DataCell = styled.td`
   text-align: left;
   padding: 20px 0px 20px 0px;
   width: 33.33%;
-  border-bottom: 1px solid ${({ theme }) => theme.palette.brand};
   color: ${({ theme }) => theme.palette.brandLight};
 
   a {

diff --git a/apps/dapp/src/constants/env/preview.tsx b/apps/dapp/src/constants/env/preview.tsx
@@ -7,7 +7,7 @@ const ENABLE_SUBGRAPH_LOGS = ENV_VARS.VITE_ENABLE_SUBGRAPH_LOGS === 'true';
 
 const env: Environment = {
   alchemyId: 'AorwfDdHDsEjIX4HPwS70zkVjWqjv5vZ',
-  rpcUrl: 'https://rpc.ankr.com/eth',
+  rpcUrl: 'https://ethereum-sepolia-rpc.publicnode.com',
   backendUrl: 'https://backend-stage.templedao.link',
   tradeTokenListUrl:
     'https://sf294otxgnbicood.public.blob.vercel-storage.com/testnet-tokens-BCYU6hCLdzUdj1TvvTOcw5ux8Wxmhj.json',

diff --git a/apps/dapp/src/enums/ticker-symbol.ts b/apps/dapp/src/enums/ticker-symbol.ts
@@ -7,6 +7,7 @@ export enum TICKER_SYMBOL {
   ETH = 'ETH',
   USDC = 'USDC',
   USDT = 'USDT',
+  USDS = 'USDS',
   DAI = 'DAI',
   WETH = 'WETH',
   OHM = 'OHM',