Merge pull request #541 from dOrgTech/develop

Merge Develop to Master

craco.config.js

@@ -0,0 +1,27 @@
+const { ProvidePlugin } = require("webpack")
+
+module.exports = {
+  webpack: {
+    configure: {
+      ignoreWarnings: [/Failed to parse source map/],
+      resolve: {
+        fallback: {
+          assert: require.resolve("assert/"),
+          crypto: require.resolve("crypto-browserify/"),
+          http: require.resolve("stream-http/"),
+          https: require.resolve("https-browserify/"),
+          os: require.resolve("os-browserify/browser"),
+          stream: require.resolve("stream-browserify/"),
+          url: require.resolve("url/"),
+          util: require.resolve("util/"),
+          fs: false
+        }
+      }
+    },
+    plugins: [
+      new ProvidePlugin({
+        Buffer: ["buffer", "Buffer"]
+      })
+    ]
+  }
+}

package.json

@@ -4,64 +4,73 @@
   "license": "MIT",
   "scripts": {
     "start": "serve -s build",
-    "dev": "react-scripts start",
-    "build": "react-scripts build && echo '/* /index.html 200' | cat >build/_redirects ",
+    "dev": "craco start",
+    "build": "craco build && echo '/* /index.html 200' | cat >build/_redirects ",
     "analyze": "source-map-explorer 'build/static/js/*.js'",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject",
+    "test": "craco test",
+    "eject": "craco eject",
     "lint:ci": "eslint --color 'src/**/*.{js,jsx,ts,tsx}'",
     "lint:check": "eslint --quiet 'src/**/*.{js,jsx,ts,tsx}'",
     "lint:fix": "eslint --fix 'src/**/*.{js,jsx,ts,tsx}'",
     "prepare": "husky install"
   },
   "dependencies": {
+    "@craco/craco": "^7.1.0",
     "@hookform/resolvers": "^2.8.1",
     "@material-ui/core": "^4.11.3",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.57",
     "@microsoft/signalr": "^5.0.9",
-    "@taquito/beacon-wallet": "^16.0.1",
-    "@taquito/signer": "^16.0.1",
-    "@taquito/taquito": "^16.0.1",
+    "@taquito/beacon-wallet": "^16.1.2",
+    "@taquito/signer": "^16.1.2",
+    "@taquito/taquito": "^16.1.2",
     "@taquito/tezbridge-signer": "^14.2.0",
     "@taquito/tezbridge-wallet": "^14.2.0",
-    "@taquito/tzip12": "^16.0.1",
-    "@taquito/tzip16": "^16.0.1",
+    "@taquito/tzip12": "^16.1.2",
+    "@taquito/tzip16": "^16.1.2",
     "@types/mixpanel-browser": "^2.35.7",
     "@types/prismjs": "^1.26.0",
     "@types/react-router-hash-link": "^2.4.5",
+    "assert": "^2.0.0",
     "bignumber.js": "^9.0.1",
     "blockies-ts": "^1.0.0",
+    "crypto-browserify": "^3.12.0",
     "dayjs": "^1.10.4",
     "formik": "^2.2.6",
     "formik-material-ui": "^3.0.1",
     "formik-material-ui-lab": "^0.0.8",
     "graphql": "^15.5.1",
     "graphql-request": "^3.4.0",
     "hex-to-rgba": "^2.0.1",
+    "https-browserify": "^1.0.0",
     "jsonschema": "^1.4.0",
     "launchdarkly-react-client-sdk": "2.27.0",
     "mixpanel-browser": "^2.42.0",
     "notistack": "^1.0.3",
+    "os-browserify": "^0.3.0",
     "prism-themes": "^1.9.0",
     "prismjs": "^1.28.0",
-    "react": "^17.0.1",
+    "react": "^18.2.0",
     "react-customizable-progressbar": "^1.0.2",
-    "react-dom": "^17.0.2",
+    "react-dom": "^18.2.0",
     "react-fitty": "^1.0.1",
     "react-hook-form": "^7.15.4",
     "react-html-parser": "^2.0.2",
     "react-markdown": "^8.0.0",
     "react-query": "^3.13.0",
     "react-router-dom": "^5.2.0",
     "react-router-hash-link": "^2.4.3",
-    "react-scripts": "4.0.3",
+    "react-scripts": "^5.0.1",
     "react-simple-code-editor": "^0.11.2",
     "react-spring-bottom-sheet": "^3.4.0",
     "rehype-raw": "^6.1.1",
     "remark-breaks": "^3.0.2",
     "remark-gfm": "^3.0.1",
     "serve": "^11.3.2",
+    "stream-browserify": "^3.0.0",
+    "stream-http": "^3.2.0",
+    "url": "^0.11.0",
+    "util": "^0.12.5",
     "yup": "^0.32.9"
   },
   "devDependencies": {
@@ -83,7 +92,10 @@
     "lint-staged": "^13.0.3",
     "prettier": "^2.2.0",
     "source-map-explorer": "2.5.2",
-    "typescript": "^4.2.3"
+    "typescript": "^5.0.4"
+  },
+  "resolutions": {
+    "@types/react": "~17.0.3"
   },
   "eslintConfig": {
     "extends": [
@@ -112,4 +124,4 @@
       "yarn lint:check"
     ]
   }
-}
+}

src/App.tsx

@@ -113,11 +113,17 @@ const App: React.FC = () => {
                     <TZKTSubscriptionsProvider>
                       <DAOExplorerRouter />
                     </TZKTSubscriptionsProvider>
-                    {/* <WarningFooter
-                      text={
-                        "The Homebase contract can't transfer FA1.2 tokens. Please make sure any and all tokens you send to the DAO treasury are implementing the FA2 standard."
-                      }
-                    /> */}
+
+                    {window.location.href.indexOf("KT1PY9PXm8NMAgSEZg7bUtFjmV2Sj64bKuVV") !== -1 ? (
+                      <>
+                        {/* Special case for this DAO which was created before FA1.2 fix was created for the smart contract */}
+                        <WarningFooter
+                          text={
+                            "The Homebase contract can't transfer FA1.2 tokens. Please make sure any and all tokens you send to the DAO treasury are implementing the FA2 standard."
+                          }
+                        />
+                      </>
+                    ) : null}
                     <Footer></Footer>
                   </Route>
                   <Route path="/faq">

src/models/Token.ts

@@ -24,8 +24,8 @@ export const SUPPORTED_MIME_TYPES = [
 ] as const
 export const SUPPORTED_MEDIA_TYPES = ["image", "audio", "video"] as const
 
-export type NFTMimeType = typeof SUPPORTED_MIME_TYPES[number] | "unknown"
-export type NFTMediaType = typeof SUPPORTED_MEDIA_TYPES[number] | "unknown"
+export type NFTMimeType = (typeof SUPPORTED_MIME_TYPES)[number] | "unknown"
+export type NFTMediaType = (typeof SUPPORTED_MEDIA_TYPES)[number] | "unknown"
 
 interface NFTParams extends TokenParams {
   description: string

src/modules/common/WarningFooter.tsx

@@ -1,5 +1,4 @@
-import { Box, Grid, IconButton, Typography } from "@material-ui/core"
-import { styled } from "@material-ui/styles"
+import { Box, Grid, IconButton, Typography, styled } from "@material-ui/core"
 import React, { useEffect, useState } from "react"
 import { ReactComponent as WarningIcon } from "assets/logos/warning.svg"
 import CloseIcon from "@material-ui/icons/Close"
@@ -31,7 +30,9 @@ const ContainerText = styled(Typography)({
 export const WarningFooter: React.FC<{ text: string }> = ({ text }) => {
   const [open, setOpen] = useState(true)
 
-  const isWarningClosed = localStorage.getItem("warning-closed")
+  // use this to make the warning come only once
+  // const isWarningClosed = localStorage.getItem("warning-closed")
+  const isWarningClosed = null
 
   const closeButton = () => {
     localStorage.setItem("warning-closed", "true")