From fe6e875b4cafca96a1629fc8bcd0bebfe50a0a96 Mon Sep 17 00:00:00 2001
From: Cali93 <armut.cumaali@gmail.com>
Date: Mon, 9 May 2022 23:45:06 +0200
Subject: [PATCH] hot fix for CodeEditor

---
 packages/dapp/package.json                    |  2 +-
 .../components/projects/CreateProjectForm.tsx | 23 +++++++++++------
 .../components/projects/EditProjectForm.tsx   | 21 ++++++++++------
 .../projects/pathways/PathwayForm.tsx         | 23 +++++++++++------
 .../components/projects/quests/QuestForm.tsx  | 23 +++++++++++------
 .../pages/projects/create-project/index.tsx   |  2 +-
 packages/server/package.json                  |  2 +-
 yarn.lock                                     | 25 ++++++++-----------
 8 files changed, 73 insertions(+), 48 deletions(-)

diff --git a/packages/dapp/package.json b/packages/dapp/package.json
index 4dd1a6b9..e99ea346 100644
--- a/packages/dapp/package.json
+++ b/packages/dapp/package.json
@@ -88,7 +88,7 @@
     "react-icons": "^4.3.1",
     "react-markdown": "^7.0.0",
     "react-parallax-tilt": "^1.5.73",
-    "siwe": "^2.0.1",
+    "siwe": "^1.1.6",
     "states-cities-db": "^1.4.1",
     "tiny-invariant": "^1.2.0",
     "uint8arrays": "^3.0.0",
diff --git a/packages/dapp/src/components/projects/CreateProjectForm.tsx b/packages/dapp/src/components/projects/CreateProjectForm.tsx
index 2e41accf..1265dd18 100644
--- a/packages/dapp/src/components/projects/CreateProjectForm.tsx
+++ b/packages/dapp/src/components/projects/CreateProjectForm.tsx
@@ -14,10 +14,11 @@ import {
   InputGroup,
   InputLeftAddon,
   Text,
+  Textarea,
 } from "@chakra-ui/react";
 import CodeEditorPreview from "components/custom/CodeEditorPreview";
-import useCustomColor from "core/hooks/useCustomColor";
-import dynamic from "next/dynamic";
+// import useCustomColor from "core/hooks/useCustomColor";
+// import dynamic from "next/dynamic";
 import { useEffect, useState } from "react";
 import { useFormContext } from "react-hook-form";
 
@@ -29,12 +30,12 @@ import ControlledSelect from "../Inputs/ControlledSelect";
 
 import LogoDropzone from "./LogoDropzone";
 
-const CodeEditor = dynamic(() => import("@uiw/react-textarea-code-editor"), {
-  ssr: false,
-});
+// const CodeEditor = dynamic(() => import("@uiw/react-textarea-code-editor"), {
+//   ssr: false,
+// });
 const CreateProjectForm = () => {
   const [code, setCode] = useState<string>();
-  const { codeEditorScheme } = useCustomColor();
+  // const { codeEditorScheme } = useCustomColor();
   const { data, loading, error } = useQuery(ALL_TAGS_QUERY);
   const {
     register,
@@ -106,7 +107,8 @@ const CreateProjectForm = () => {
 
       <FormControl isInvalid={errors.description}>
         <FormLabel htmlFor="description">Markdown Description</FormLabel>
-        <CodeEditor
+        {/* TODO: fix types for CodeEditor
+         <CodeEditor
           value={code}
           language="markdown"
           placeholder="Project description"
@@ -123,6 +125,13 @@ const CreateProjectForm = () => {
           }}
           className={codeEditorScheme}
           padding={15}
+        />
+         */}
+        <Textarea
+          placeholder="Project description"
+          {...register("description", {
+            required: REQUIRED_FIELD_LABEL,
+          })}
         />
         <FormErrorMessage>
           {errors.description && errors.description.message}
diff --git a/packages/dapp/src/components/projects/EditProjectForm.tsx b/packages/dapp/src/components/projects/EditProjectForm.tsx
index 9221aefc..a2e065bc 100644
--- a/packages/dapp/src/components/projects/EditProjectForm.tsx
+++ b/packages/dapp/src/components/projects/EditProjectForm.tsx
@@ -11,13 +11,14 @@ import {
   AlertIcon,
   AlertTitle,
   Spinner,
+  Textarea,
 } from "@chakra-ui/react";
 import { useFormContext } from "react-hook-form";
-import dynamic from "next/dynamic";
+// import dynamic from "next/dynamic";
+// import useCustomColor from "core/hooks/useCustomColor";
 import { useState, useEffect } from "react";
 
 import CodeEditorPreview from "components/custom/CodeEditorPreview";
-import useCustomColor from "core/hooks/useCustomColor";
 import { Tag } from "../../core/types";
 import { ALL_TAGS_QUERY } from "../../graphql/tags";
 import IconWithState from "../custom/IconWithState";
@@ -25,12 +26,12 @@ import ControlledSelect from "../Inputs/ControlledSelect";
 
 import LogoDropzone from "./LogoDropzone";
 
-const CodeEditor = dynamic(() => import("@uiw/react-textarea-code-editor"), {
-  ssr: false,
-});
+// const CodeEditor = dynamic(() => import("@uiw/react-textarea-code-editor"), {
+//   ssr: false,
+// });
 const EditProjectForm: React.FunctionComponent = () => {
   const [code, setCode] = useState<string>();
-  const { codeEditorScheme } = useCustomColor();
+  // const { codeEditorScheme } = useCustomColor();
   const {
     register,
     setValue,
@@ -83,7 +84,11 @@ const EditProjectForm: React.FunctionComponent = () => {
 
       <FormControl isInvalid={errors.description}>
         <FormLabel htmlFor="description">Description</FormLabel>
-        <CodeEditor
+        <Textarea
+          placeholder="Project description"
+          {...register("description")}
+        />
+        {/* <CodeEditor
           value={code}
           language="markdown"
           placeholder="Project description"
@@ -103,7 +108,7 @@ const EditProjectForm: React.FunctionComponent = () => {
           }}
           className={codeEditorScheme}
           padding={15}
-        />
+        /> */}
         <FormErrorMessage>
           {errors.description && errors.description.message}
         </FormErrorMessage>
diff --git a/packages/dapp/src/components/projects/pathways/PathwayForm.tsx b/packages/dapp/src/components/projects/pathways/PathwayForm.tsx
index b638d836..8a272b14 100644
--- a/packages/dapp/src/components/projects/pathways/PathwayForm.tsx
+++ b/packages/dapp/src/components/projects/pathways/PathwayForm.tsx
@@ -18,12 +18,13 @@ import {
   NumberInputStepper,
   Tag,
   Text,
+  Textarea,
   VStack,
 } from "@chakra-ui/react";
 import { useWeb3React } from "@web3-react/core";
 import CodeEditorPreview from "components/custom/CodeEditorPreview";
-import useCustomColor from "core/hooks/useCustomColor";
-import dynamic from "next/dynamic";
+// import useCustomColor from "core/hooks/useCustomColor";
+// import dynamic from "next/dynamic";
 import { useEffect, useMemo, useState } from "react";
 import { useFormContext } from "react-hook-form";
 import {
@@ -34,13 +35,13 @@ import useTokenList from "../../../core/hooks/useTokenList";
 import ImageDropzone from "../../custom/ImageDropzone";
 import ControlledSelect from "../../Inputs/ControlledSelect";
 
-const CodeEditor = dynamic(() => import("@uiw/react-textarea-code-editor"), {
-  ssr: false,
-});
+// const CodeEditor = dynamic(() => import("@uiw/react-textarea-code-editor"), {
+//   ssr: false,
+// });
 
 export default function PathwayForm({ isWithRewards, withRewards }: any) {
   const [code, setCode] = useState<string>();
-  const { codeEditorScheme } = useCustomColor();
+  // const { codeEditorScheme } = useCustomColor();
 
   const { chainId } = useWeb3React();
   const { tokens } = useTokenList();
@@ -161,7 +162,13 @@ export default function PathwayForm({ isWithRewards, withRewards }: any) {
 
       <FormControl isInvalid={errors.description}>
         <FormLabel htmlFor="description">Description</FormLabel>
-        <CodeEditor
+        <Textarea
+          placeholder="Pathway description"
+          {...register("description", {
+            required: REQUIRED_FIELD_LABEL,
+          })}
+        />
+        {/* <CodeEditor
           value={code}
           language="markdown"
           placeholder="Pathway description (markdown)"
@@ -178,7 +185,7 @@ export default function PathwayForm({ isWithRewards, withRewards }: any) {
           }}
           className={codeEditorScheme}
           padding={15}
-        />
+        /> */}
         <FormErrorMessage>
           {errors.description && errors.description.message}
         </FormErrorMessage>
diff --git a/packages/dapp/src/components/projects/quests/QuestForm.tsx b/packages/dapp/src/components/projects/quests/QuestForm.tsx
index 87c4a14c..cda12a06 100644
--- a/packages/dapp/src/components/projects/quests/QuestForm.tsx
+++ b/packages/dapp/src/components/projects/quests/QuestForm.tsx
@@ -23,12 +23,13 @@ import {
   useToast,
   VStack,
   Checkbox,
+  Textarea,
 } from "@chakra-ui/react";
 import { useWeb3React } from "@web3-react/core";
 import CodeEditorPreview from "components/custom/CodeEditorPreview";
-import useCustomColor from "core/hooks/useCustomColor";
 import { Contract, ethers } from "ethers";
-import dynamic from "next/dynamic";
+// import useCustomColor from "core/hooks/useCustomColor";
+// import dynamic from "next/dynamic";
 import { useRouter } from "next/router";
 import { ChangeEvent, useContext, useEffect, useMemo, useState } from "react";
 import { useFormContext } from "react-hook-form";
@@ -92,9 +93,9 @@ const questTypeOptions = [
   },
 ];
 
-const CodeEditor = dynamic(() => import("@uiw/react-textarea-code-editor"), {
-  ssr: false,
-});
+// const CodeEditor = dynamic(() => import("@uiw/react-textarea-code-editor"), {
+//   ssr: false,
+// });
 
 const CreateQuestForm: React.FunctionComponent = () => {
   const router = useRouter();
@@ -102,7 +103,7 @@ const CreateQuestForm: React.FunctionComponent = () => {
   const [code, setCode] = useState<string>();
   const [isWithRewards, setIsWithRewards] = useState<boolean>();
   const [submitStatus, setSubmitStatus] = useState<string>("Creating quest");
-  const { codeEditorScheme } = useCustomColor();
+  // const { codeEditorScheme } = useCustomColor();
   const { tokens } = useTokenList();
   const { library, chainId } = useWeb3React();
   const { self, account, contracts } = useContext(Web3Context);
@@ -498,7 +499,13 @@ const CreateQuestForm: React.FunctionComponent = () => {
 
       <FormControl isInvalid={errors.description}>
         <FormLabel htmlFor="description">Description</FormLabel>
-        <CodeEditor
+        <Textarea
+          placeholder="Quest description"
+          {...register("description", {
+            required: REQUIRED_FIELD_LABEL,
+          })}
+        />
+        {/* <CodeEditor
           value={code}
           language="markdown"
           placeholder="Quest description (markdown)"
@@ -515,7 +522,7 @@ const CreateQuestForm: React.FunctionComponent = () => {
           }}
           className={codeEditorScheme}
           padding={15}
-        />
+        /> */}
         <FormErrorMessage>
           {errors.description && errors.description.message}
         </FormErrorMessage>
diff --git a/packages/dapp/src/pages/projects/create-project/index.tsx b/packages/dapp/src/pages/projects/create-project/index.tsx
index f93fe603..fb4e04ee 100644
--- a/packages/dapp/src/pages/projects/create-project/index.tsx
+++ b/packages/dapp/src/pages/projects/create-project/index.tsx
@@ -296,7 +296,7 @@ function CreateProjectStepper() {
                 {activeStep === 2 && (
                   <Button
                     ml="0.5rem"
-                    // colorScheme="accent"
+                    // colorScheme="accentDark"
                     isLoading={methods.formState.isSubmitting}
                     type="submit"
                     px="1.25rem"
diff --git a/packages/server/package.json b/packages/server/package.json
index 43c0f2dd..c4fd9d0b 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -63,7 +63,7 @@
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
     "rxjs": "^7.2.0",
-    "siwe": "^2.0.1",
+    "siwe": "^1.1.6",
     "subscriptions-transport-ws": "^0.9.19",
     "swagger-ui-express": "^4.1.6",
     "uint8arrays": "^2.1.10",
diff --git a/yarn.lock b/yarn.lock
index 042f95fb..3b1aef09 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6494,14 +6494,12 @@
   dependencies:
     antlr4ts "^0.5.0-alpha.4"
 
-"@spruceid/siwe-parser@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@spruceid/siwe-parser/-/siwe-parser-2.0.0.tgz#fb316b9115e9116bac528c5cbfed18787119bede"
-  integrity sha512-zXlPBRKaT9ecxhhLQqn/StAWlXvQBlFDFnIAlM7ceMVx/1NVZZ65GdW9A28tYGbhpesYxNYpsqegGsBcrWuASg==
+"@spruceid/siwe-parser@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@spruceid/siwe-parser/-/siwe-parser-1.1.3.tgz#0eebe8bbd63c6de89cb44c06b6329b00b305df65"
+  integrity sha512-oQ8PcwDqjGWJvLmvAF2yzd6iniiWxK0Qtz+Dw+gLD/W5zOQJiKIUXwslHOm8VB8OOOKW9vfR3dnPBhHaZDvRsw==
   dependencies:
     apg-js "^4.1.1"
-    uri-js "^4.4.1"
-    valid-url "^1.0.9"
 
 "@stablelib/aead@^1.0.1":
   version "1.0.1"
@@ -31238,15 +31236,14 @@ sisteransi@^1.0.5:
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
   integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
-siwe@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/siwe/-/siwe-2.0.1.tgz#4c1c6762bf39a3100fee882c59a2114c525adc47"
-  integrity sha512-4zMQZSR9pp3BR7w8c8N/ofGI71QIVK2a1+cyBzkPNWr0/DV9APmRFdZtg0lkiEemGCFtFyTy/h6f90tG/GFH5w==
+siwe@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/siwe/-/siwe-1.1.6.tgz#b4b4fe7814654d5ea529171b2ede15f7ef7ef1ae"
+  integrity sha512-3WRdEil32Tc2vuNzqJ2/Z/MIvsvy0Nkzc2ov+QujmpHO7tM83dgcb47z0Pu236T4JQkOQCqQkq3AJ/rVIezniA==
   dependencies:
-    "@spruceid/siwe-parser" "2.0.0"
+    "@spruceid/siwe-parser" "^1.1.3"
     "@stablelib/random" "^1.0.1"
-    uri-js "^4.4.1"
-    valid-url "^1.0.9"
+    apg-js "^4.1.1"
 
 size-limit@^6.0.1:
   version "6.0.4"
@@ -34218,7 +34215,7 @@ upper-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-uri-js@^4.2.2, uri-js@^4.4.1:
+uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
   integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==