Merge pull request #771 from hats-finance/develop

dev -> prod
hats-finance · Oct 11, 2024 · a89a2ad · a89a2ad
2 parents 8822cf0 + f66e3f6
commit a89a2ad
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/packages/web/src/components/VaultSeverityRewardCard/VaultSeverityRewardCard.tsx b/packages/web/src/components/VaultSeverityRewardCard/VaultSeverityRewardCard.tsx
@@ -137,11 +137,11 @@ export function VaultSeverityRewardCard({ vault, severity, severityIndex, noNft
         </>
       )}
 
-      {!noNft && (
+      {/* {!noNft && (
         <div className="severity-nft">
           <VaultNftRewardCard vault={vault} severity={severity} type="tiny" />
         </div>
-      )}
+      )} */}
     </StyledVaultSeverityRewardCard>
   );
 }
diff --git a/packages/web/src/hooks/subgraph/submissions/useSubmissions.tsx b/packages/web/src/hooks/subgraph/submissions/useSubmissions.tsx
@@ -47,7 +47,7 @@ export function SubmissionsProvider({ children }: PropsWithChildren<{}>) {
     const loadSubmissionData = async (submission: ISubmittedSubmission): Promise<ISubmissionMessageObject | undefined> => {
       if (isValidIpfsHash(submission.submissionHash)) {
         try {
-          const dataResponse = await axios.get(ipfsTransformUri(submission.submissionHash));
+          const dataResponse = await axios.get(ipfsTransformUri(submission.submissionHash), { timeout: 4000 });
           const object = dataResponse.data;
           return object;
         } catch (error) {

diff --git a/packages/web/src/hooks/subgraph/vaults/useVaults.tsx b/packages/web/src/hooks/subgraph/vaults/useVaults.tsx
@@ -9,6 +9,7 @@ import {
   IWithdrawSafetyPeriod,
   fixObject,
 } from "@hats.finance/shared";
+import axios from "axios";
 import { OFAC_Sanctioned_Digital_Currency_Addresses } from "data/OFACSanctionedAddresses";
 import { PROTECTED_TOKENS } from "data/vaults";
 import { tokenPriceFunctions } from "helpers/getContractPrices";
@@ -218,9 +219,9 @@ export function VaultsProvider({ children }: PropsWithChildren<{}>) {
     const loadVaultDescription = async (vault: IVault): Promise<IVaultDescription | undefined> => {
       if (isValidIpfsHash(vault.descriptionHash)) {
         try {
-          const dataResponse = await fetch(ipfsTransformUri(vault.descriptionHash)!);
-          if (dataResponse.status === 200) {
-            const object = await dataResponse.json();
+          const response = await axios.get(ipfsTransformUri(vault.descriptionHash)!, { timeout: 4000 });
+          if (response.status === 200) {
+            const object = response.data;
             return overrideDescription(vault.id, fixObject(object));
           }
           return undefined;

diff --git a/...PayoutsTool/components/PayoutAllocation/SinglePayoutAllocation/SinglePayoutAllocation.tsx b/...PayoutsTool/components/PayoutAllocation/SinglePayoutAllocation/SinglePayoutAllocation.tsx
@@ -47,7 +47,7 @@ export const SinglePayoutAllocation = ({
 
       <div className="mb-5">{t("Payouts.resultDescription")}</div>
       <div className="result-container">
-        <VaultNftRewardCard vault={vault} severity={selectedSeverity} />
+        {/* <VaultNftRewardCard vault={vault} severity={selectedSeverity} /> */}
         <FormInput
           value={`≈ ${totalAmount?.tokens.formatted} ~ ${totalAmount?.usd.formatted}`}
           label={t("Payouts.totalPayoutSum")}

diff --git a/...src/pages/Honeypots/VaultDetailsPage/Sections/VaultRewardsSection/VaultRewardsSection.tsx b/...src/pages/Honeypots/VaultDetailsPage/Sections/VaultRewardsSection/VaultRewardsSection.tsx
@@ -94,10 +94,11 @@ export const VaultRewardsSection = ({ vault }: VaultRewardsSectionProps) => {
         </div>
       </div>
 
-      <h2 className="mt-5">{t("nftRewards")}</h2>
+      {/* NFT rewards */}
+      {/* <h2 className="mt-5">{t("nftRewards")}</h2>
       <div className="nft-rewards-container mt-4">
         <VaultNftRewards vault={vault} />
-      </div>
+      </div> */}
     </StyledRewardsSection>
   );
 };