Merge pull request #554 from hats-finance/develop

[Feature] Submissions page on vault details + fixed max rewards
hats-finance · Oct 2, 2023 · 4058721 · 4058721
2 parents 1ece132 + 8aca204
commit 4058721
Show file tree

Hide file tree

Showing 75 changed files with 1,287 additions and 266 deletions.
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hats-finance/shared",
-  "version": "1.1.22",
+  "version": "1.1.28",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/shared/src/constants/index.ts b/packages/shared/src/constants/index.ts
@@ -0,0 +1 @@
+export * from "./mdAllowedElements";
diff --git a/packages/shared/src/constants/mdAllowedElements.ts b/packages/shared/src/constants/mdAllowedElements.ts
@@ -0,0 +1,49 @@
+export const allowedElementsMarkdown = [
+  "a",
+  "article",
+  "b",
+  "blockquote",
+  "br",
+  "caption",
+  "code",
+  "del",
+  "details",
+  "div",
+  "em",
+  "h1",
+  "h2",
+  "h3",
+  "h4",
+  "h5",
+  "h6",
+  "hr",
+  "i",
+  "img",
+  "ins",
+  "kbd",
+  "li",
+  "main",
+  "ol",
+  "p",
+  "pre",
+  "section",
+  "span",
+  "strike",
+  "strong",
+  "sub",
+  "summary",
+  "sup",
+  "table",
+  "tbody",
+  "td",
+  "th",
+  "thead",
+  "tr",
+  "u",
+  "ul",
+];
+
+export const allowedAttributesMarkdown = {
+  a: ["href", "name", "class"],
+  img: ["src", "alt", "class"],
+};
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
@@ -3,3 +3,4 @@ export * from "./severities";
 export * from "./abis";
 export * from "./config";
 export * from "./utils";
+export * from "./constants";
diff --git a/packages/shared/src/types/editor.ts b/packages/shared/src/types/editor.ts
@@ -73,6 +73,8 @@ export interface IBaseEditedVaultDescription {
     name: string;
     tokenIcon: string;
     type?: IVaultType;
+    isPrivateAudit?: boolean;
+    whitelist: { address: string }[];
     endtime?: number;
     starttime?: number;
     emails: IEditedCommunicationEmail[];

diff --git a/packages/shared/src/types/index.ts b/packages/shared/src/types/index.ts
@@ -2,3 +2,4 @@ export * from "./types";
 export * from "./editor";
 export * from "./payout";
 export * from "./safe";
+export * from "./submissions";
diff --git a/packages/shared/src/types/submissions.ts b/packages/shared/src/types/submissions.ts
@@ -0,0 +1,6 @@
+export type ISubmissionMessageObject = {
+  ref?: string;
+  isEncryptedByHats?: boolean;
+  decrypted: string | undefined;
+  encrypted: string;
+};
diff --git a/packages/shared/src/types/types.ts b/packages/shared/src/types/types.ts
@@ -1,3 +1,5 @@
+import { ISubmissionMessageObject } from "./submissions";
+
 export interface IVaultInfo {
   version: IVault["version"];
   address: string;
@@ -120,6 +122,8 @@ interface IBaseVaultDescription {
     name: string;
     tokenIcon: string;
     type?: IVaultType;
+    isPrivateAudit?: boolean;
+    whitelist: { address: string }[];
     endtime?: number;
     starttime?: number;
     oneLiner?: string;
@@ -274,7 +278,7 @@ export interface ISubmittedSubmission {
   subId: string;
   submissionIdx: number;
   submissionHash: string;
-  submissionData?: string;
+  submissionData?: ISubmissionMessageObject;
   submissionDecrypted?: string;
   linkedVault?: IVault;
   submissionDataStructure?: {

diff --git a/packages/shared/src/utils/vaults.utils.ts b/packages/shared/src/utils/vaults.utils.ts
@@ -5,7 +5,7 @@ import { isAddressAMultisigMember } from "./gnosis.utils";
 import { isValidIpfsHash } from "./ipfs.utils";
 import { fixObject } from "./vaultEditor.utils";
 
-export type IVaultInfoWithCommittee = IVaultInfo & { committee: string };
+export type IVaultInfoWithCommittee = IVaultInfo & { committee: string; registered: boolean };
 
 export const getAllVaultsInfoWithCommittee = async (): Promise<IVaultInfoWithCommittee[]> => {
   try {
@@ -14,6 +14,7 @@ export const getAllVaultsInfoWithCommittee = async (): Promise<IVaultInfoWithCom
         vaults {
           id
           pid
+          registered
           version
           committee
           master {
@@ -54,6 +55,7 @@ export const getAllVaultsInfoWithCommittee = async (): Promise<IVaultInfoWithCom
           pid: vault.pid,
           version: vault.version,
           committee: vault.committee,
+          registered: vault.registered,
         });
       }
     }
@@ -76,6 +78,7 @@ export const getVaultInfoWithCommittee = async (
         vaults(where: {id: $vaultId}) {
           id
           pid
+          registered
           version
           committee
           master {
@@ -109,6 +112,7 @@ export const getVaultInfoWithCommittee = async (
       pid: vault.pid,
       version: vault.version,
       committee: vault.committee,
+      registered: vault.registered,
     };
   } catch (error) {
     return undefined;

diff --git a/packages/web/package.json b/packages/web/package.json
@@ -37,7 +37,7 @@
     "downloadjs": "^1.4.7",
     "ethers": "5.7.2",
     "fs": "^0.0.1-security",
-    "graphql": "^16.5.0",
+    "graphql": "^16.8.1",
     "https-browserify": "^1.0.0",
     "humanize-duration": "^3.27.0",
     "i18next": "^21.8.4",
@@ -57,7 +57,7 @@
     "react-app-rewired": "^2.2.1",
     "react-confetti": "^6.1.0",
     "react-dom": "^18.1.0",
-    "react-hook-form": "^7.42.1",
+    "react-hook-form": "^7.46.2",
     "react-https-redirect": "^1.1.0",
     "react-i18next": "^11.16.9",
     "react-minimal-pie-chart": "^8.4.0",
@@ -115,7 +115,8 @@
     "react-content-loader": "^6.2.1",
     "react-helmet": "^6.1.0",
     "react-identicons": "^1.2.5",
+    "sanitize-markdown": "^2.6.7",
     "siwe": "^1.1.6",
     "uuid-by-string": "^4.0.0"
   }
-}
+}
diff --git a/packages/web/sitemap-builder.js b/packages/web/sitemap-builder.js
@@ -47,11 +47,13 @@ const buildSitemap = async () => {
     });
   });
 
-  const subgraphResults = (await Promise.all(subgraphPromises)
-    .then((responses) => responses.map((res) => res.data))
-    .catch((error) => {
-      console.error("Error fetching subgraph data:", error);
-    }))
+  const subgraphResults = (
+    await Promise.all(subgraphPromises)
+      .then((responses) => responses.map((res) => res.data))
+      .catch((error) => {
+        console.error("Error fetching subgraph data:", error);
+      })
+  )
     .filter((res) => res != null)
     .map((res) => res.data.vaults)
     .flat()
@@ -71,7 +73,8 @@ const buildSitemap = async () => {
   const descriptionsData = await Promise.all(descriptionsResults.map((res) => res.data));
   const descriptionsDataWithHash = descriptionsData.map((d) => ({ ...d, hash: descriptionHashes[descriptionsData.indexOf(d)] }));
   const descriptions = descriptionsDataWithHash.filter((d) => !(d instanceof Error));
-  const vaultsRoutes = descriptions.map((d) => {
+  const descriptionsNoPrivateAudits = descriptions.filter((d) => !d["project-metadata"]?.isPrivateAudit);
+  const vaultsRoutes = descriptionsNoPrivateAudits.map((d) => {
     const vaultId = subgraphResults.find((vault) => vault.descriptionHash === d.hash).id;
     const vaultSlug = slugify(d["project-metadata"]?.name ?? d["Project-metadata"]?.name ?? "");
     const isAudit =
@@ -93,15 +96,15 @@ const buildSitemap = async () => {
 
   const vaultsRoutesXml = vaultsRoutes.reduce(
     (acc, route) => `${acc}
-    ${appendPathAndGenerateUrl(route, 'rewards')}
-    ${appendPathAndGenerateUrl(route, 'deposits')}
-    ${appendPathAndGenerateUrl(route, 'scope')}`,
+    ${appendPathAndGenerateUrl(route, "rewards")}
+    ${appendPathAndGenerateUrl(route, "deposits")}
+    ${appendPathAndGenerateUrl(route, "scope")}`,
     ""
   );
 
   const routesXml = routes.reduce(
     (acc, route) => `${acc}
-    ${appendPathAndGenerateUrl(route, '')}`,
+    ${appendPathAndGenerateUrl(route, "")}`,
     ""
   );
 

diff --git a/packages/web/src/components/FormControls/FormInput/FormInput.tsx b/packages/web/src/components/FormControls/FormInput/FormInput.tsx
@@ -20,6 +20,7 @@ type FormInputProps = {
   copyable?: boolean;
   disabled?: boolean;
   removable?: boolean;
+  flexExpand?: boolean;
   colorable?: boolean;
   isDirty?: boolean;
   noMargin?: boolean;
@@ -35,6 +36,7 @@ function FormInputComponent(
     pastable = false,
     copyable = false,
     removable = false,
+    flexExpand = false,
     noErrorLabel = false,
     type = "text",
     colorable = false,
@@ -220,6 +222,7 @@ function FormInputComponent(
       colorable={colorable}
       readOnly={readOnly}
       className={className}
+      flexExpand={flexExpand}
     >
       <div className="main-container">
         {label !== undefined && (

diff --git a/packages/web/src/components/FormControls/FormInput/styles.ts b/packages/web/src/components/FormControls/FormInput/styles.ts
@@ -14,6 +14,7 @@ type StyledFormInputProps = {
   colorable?: boolean;
   readOnly?: boolean;
   disabled?: boolean;
+  flexExpand?: boolean;
   type?: FormInputType;
 };
 
@@ -31,11 +32,13 @@ export const StyledFormInput = styled.div<StyledFormInputProps>(
     disabled,
     colorable,
     readOnly,
+    flexExpand,
   }) => css`
     position: relative;
     overflow: hidden;
     margin-bottom: ${noMargin ? 0 : getSpacing(3)};
-    width: 100%;
+    width: ${flexExpand ? "unset" : "100%"};
+    flex: ${flexExpand ? 1 : "unset"};
 
     .main-container {
       position: relative;

diff --git a/packages/web/src/components/FormControls/FormMDEditor/FormMDEditor.tsx b/packages/web/src/components/FormControls/FormMDEditor/FormMDEditor.tsx
@@ -1,5 +1,5 @@
+import { allowedElementsMarkdown } from "@hats-finance/shared";
 import MDEditor, { PreviewType } from "@uiw/react-md-editor";
-import { disallowedElementsMarkdown } from "constants/constants";
 import { forwardRef } from "react";
 import { parseIsDirty } from "../utils";
 import { StyledFormMDEditor } from "./styles";
@@ -37,7 +37,7 @@ export const FormMDEditorComponent = (
     >
       <MDEditor
         value={value}
-        previewOptions={{ disallowedElements: disallowedElementsMarkdown }}
+        previewOptions={{ allowedElements: allowedElementsMarkdown }}
         onChange={(value) => (disabled ? undefined : onChange(value ?? ""))}
         minHeight={200}
         height={400}

diff --git a/packages/web/src/components/FormControls/FormSelectInput/FormSelectInput.tsx b/packages/web/src/components/FormControls/FormSelectInput/FormSelectInput.tsx
@@ -25,6 +25,7 @@ interface FormSelectInputProps {
   disabled?: boolean;
   noMargin?: boolean;
   readOnly?: boolean;
+  flexExpand?: boolean;
   isDirty?: boolean | boolean[];
   value: string | string[];
   onChange?: (data: string | string[]) => void;
@@ -43,6 +44,7 @@ export function FormSelectInputComponent(
     disabled = false,
     isDirty = false,
     readOnly = false,
+    flexExpand = false,
     noMargin = false,
     emptyState,
     error,
@@ -85,7 +87,7 @@ export function FormSelectInputComponent(
   };
 
   return (
-    <StyledFormSelectInput ref={menuRef} noMargin={noMargin}>
+    <StyledFormSelectInput ref={menuRef} noMargin={noMargin} flexExpand={flexExpand}>
       {label && <label className="input-label">{label}</label>}
 
       <SelectButton

diff --git a/packages/web/src/components/FormControls/FormSelectInput/styles.ts b/packages/web/src/components/FormControls/FormSelectInput/styles.ts
@@ -1,11 +1,12 @@
 import styled, { css } from "styled-components";
 import { getSpacing } from "styles";
 
-export const StyledFormSelectInput = styled.div<{ noMargin: boolean }>(
-  ({ noMargin }) => css`
+export const StyledFormSelectInput = styled.div<{ noMargin: boolean; flexExpand: boolean }>(
+  ({ noMargin, flexExpand }) => css`
     position: relative;
     margin-bottom: ${noMargin ? 0 : getSpacing(3)};
-    width: 100%;
+    width: ${flexExpand ? "unset" : "100%"};
+    flex: ${flexExpand ? 1 : "unset"};
 
     label.input-label {
       display: block;

diff --git a/packages/web/src/components/Sidebar/NavLinks/NavLinks.tsx b/packages/web/src/components/Sidebar/NavLinks/NavLinks.tsx
@@ -27,6 +27,7 @@ export default function NavLinks() {
   const { chain } = useNetwork();
   const { address } = useAccount();
 
+  const [isInvitedToPrivateAudits, setIsInvitedToPrivateAudits] = useState(false);
   const [isCommitteeAddress, setIsCommitteeAddress] = useState(false);
   const [showCommitteeToolsSubroutes, setshowCommitteeToolsSubroutes] = useState(false);
   const committeeToolsSubrouteRef = useRef<HTMLDivElement>(null);
@@ -37,6 +38,21 @@ export default function NavLinks() {
     setshowCommitteeToolsSubroutes(false);
   };
 
+  useEffect(() => {
+    if (!allVaultsOnEnv || !address) return setIsInvitedToPrivateAudits(false);
+
+    const isInvited =
+      allVaultsOnEnv.some(
+        (vault) =>
+          vault.description?.["project-metadata"].isPrivateAudit &&
+          vault.description?.["project-metadata"].whitelist.some(
+            (whiteAddress) => whiteAddress.address.toLowerCase() === address.toLowerCase()
+          )
+      ) ?? false;
+
+    setIsInvitedToPrivateAudits(isInvited);
+  }, [allVaultsOnEnv, address]);
+
   useEffect(() => {
     const verifyIfCommitteeAddress = async () => {
       try {
@@ -69,6 +85,16 @@ export default function NavLinks() {
         <p className="normal">{t("auditCompetitions")}</p>
         <p className="collapsed">{t("competitions")}</p>
       </StyledNavLink>
+      <StyledNavLink
+        hidden={!isInvitedToPrivateAudits}
+        className="audits"
+        to={`${HoneypotsRoutePaths.privateAudits}`}
+        onClick={handleClick}
+      >
+        <AuditsIcon />
+        <p className="normal">{t("privateAuditCompetitions")}</p>
+        <p className="collapsed">{t("privateCompetitions")}</p>
+      </StyledNavLink>
       {/* <StyledNavLink className="vulnerability" to={RoutePaths.vulnerability} onClick={handleClick}>
         <SubmissionsIcon />
         <p className="normal">{t("submitVulnerability")}</p>

diff --git a/packages/web/src/components/VaultCard/VaultCard.tsx b/packages/web/src/components/VaultCard/VaultCard.tsx
@@ -267,7 +267,7 @@ export const VaultCard = ({
                       ? millify(totalPaidOutOnAudit?.usd ?? 0)
                       : showIntended
                       ? millify(vault.amountsInfo?.competitionIntendedAmount?.deposited.usd ?? 0)
-                      : millify(vault.amountsInfo?.depositedAmount.usd ?? 0)}
+                      : millify(vault.amountsInfo?.maxRewardAmount.usd ?? 0)}
                   </h3>
                 </WithTooltip>
                 <div className="sub-value">