From 069bdd65cdbe7e5f0464bcc4d85112bd603304f2 Mon Sep 17 00:00:00 2001
From: Vadym Shevchenko <vshevchenko.mne@gmail.com>
Date: Fri, 30 Aug 2024 12:20:58 +0300
Subject: [PATCH 1/4] Added external verification of messages by link

---
 .../sections/Signatures/MessageContent.tsx    | 32 +++++++++++++++++--
 components/sections/Signatures/SigTab.tsx     |  6 ++--
 i18n.js                                       |  1 +
 pages/signatures.tsx                          |  2 +-
 pages/signatures/[data].tsx                   | 30 +++++++++++++++++
 5 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 pages/signatures/[data].tsx

diff --git a/components/sections/Signatures/MessageContent.tsx b/components/sections/Signatures/MessageContent.tsx
index 9e57fbd..f4beda5 100644
--- a/components/sections/Signatures/MessageContent.tsx
+++ b/components/sections/Signatures/MessageContent.tsx
@@ -11,13 +11,14 @@ interface IMessageContent {
   signature: string
 }
 
-const MessageContent = () => {
+const MessageContent = ({iMessageContent}) => {
   const { t } = useTranslation('signatures')
   const methods = useForm<IMessageContent>({ mode: 'onBlur' })
   const [verusSignature, setVerusSignature] = useState<Record<
     string,
     string
   > | null>(null)
+  const [filledVerusSignature, setFilledVerusSignature] = useState(iMessageContent.filled)
   const [sigResult, setSigResult] = useState<any>()
 
   const onSubmit: SubmitHandler<IMessageContent> = async (values) => {
@@ -52,12 +53,13 @@ const MessageContent = () => {
 
   const _handleReset = () => {
     setVerusSignature(null)
+    setFilledVerusSignature(false)
     setSigResult(null)
     methods.reset()
   }
   return (
     <>
-      {!verusSignature && (
+      {!verusSignature && !filledVerusSignature && (
         <StyledFormArea>
           <FormProvider {...methods}>
             <Form SubmitHandler={methods.handleSubmit(onSubmit)}>
@@ -80,6 +82,32 @@ const MessageContent = () => {
           </FormProvider>
         </StyledFormArea>
       )}
+      {!verusSignature && filledVerusSignature && (
+        <StyledFormArea>
+          <FormProvider {...methods}>
+            <Form SubmitHandler={methods.handleSubmit(onSubmit)}>
+              <TextArea
+                name="message"
+                label={t('tab.message.input')}
+                validate={{ required: t('tab.message.validate') }}
+                value={iMessageContent.message}
+              />
+              <Input
+                name="verusId"
+                label={t('formField.verusID.input')}
+                validate={{ required: t('formField.verusID.validate') }}
+                value={iMessageContent.verusId}
+              />
+              <Input
+                name="signature"
+                label={t('formField.signature.input')}
+                validate={{ required: t('formField.signature.validate') }}
+                value={iMessageContent.signature}
+              />
+            </Form>
+          </FormProvider>
+        </StyledFormArea>
+      )}
       {verusSignature && (
         <VerifyResult
           sigResult={sigResult}
diff --git a/components/sections/Signatures/SigTab.tsx b/components/sections/Signatures/SigTab.tsx
index ee6031b..be44329 100644
--- a/components/sections/Signatures/SigTab.tsx
+++ b/components/sections/Signatures/SigTab.tsx
@@ -18,7 +18,7 @@ const StyledContainer = styled.div`
   max-width: 900px;
 `
 
-const SigTab = () => {
+const SigTab = ({iMessageContent}) => {
   const { t } = useTranslation('signatures')
   const [activeEventKey, setActiveEventKey] = useState(0)
   const TabItems = [t('tab.message.tab'), t('tab.file.tab'), t('tab.hash.tab')]
@@ -28,7 +28,7 @@ const SigTab = () => {
       {!useMediaQuery('(min-width: 768px)') && (
         <Accordion>
           <AccordionContent eventKey={0} title={t('tab.message.tab')}>
-            <MessageContent />
+            <MessageContent iMessageContent={iMessageContent}/>
           </AccordionContent>
           <AccordionContent eventKey={1} title={t('tab.file.tab')}>
             <FileContent />
@@ -45,7 +45,7 @@ const SigTab = () => {
           onToggle={setActiveEventKey}
         >
           <TabPanel eventKey={0}>
-            <MessageContent />
+            <MessageContent iMessageContent={iMessageContent}/>
           </TabPanel>
           <TabPanel eventKey={1}>
             <FileContent />
diff --git a/i18n.js b/i18n.js
index ea7a0e6..fa61f78 100644
--- a/i18n.js
+++ b/i18n.js
@@ -21,5 +21,6 @@ module.exports = {
     'rgx:/mobile': ['walletMobile'],
     'rgx:/verusid-lookup': ['verusid'],
     '/signatures': ['signatures'],
+    '/signatures/[data]': ['signatures'],
   },
 }
diff --git a/pages/signatures.tsx b/pages/signatures.tsx
index a21a29b..fcac49c 100644
--- a/pages/signatures.tsx
+++ b/pages/signatures.tsx
@@ -18,7 +18,7 @@ const Signatures = () => {
         >
           <DefaultHeader align="center">{t('heading')}</DefaultHeader>
         </Section>
-        <SigTab />
+        <SigTab iMessageContent={{ filled: false }} />
       </MainLayout>
     </>
   )
diff --git a/pages/signatures/[data].tsx b/pages/signatures/[data].tsx
new file mode 100644
index 0000000..4256a1d
--- /dev/null
+++ b/pages/signatures/[data].tsx
@@ -0,0 +1,30 @@
+import { NextSeo } from 'next-seo'
+import useTranslation from 'next-translate/useTranslation'
+import { MainLayout, Section } from '@/components/layouts'
+import { DefaultHeader } from '@/components/elements'
+import { SigTab } from '@/components/sections/Signatures'
+import { useRouter } from 'next/router'
+
+const SignaturesExt = () => {
+  const { t } = useTranslation('signatures')
+  const title = t('seo:page.signatures.title')
+  const description = t('seo:page.signatures.description')
+  const {query} = useRouter()
+  const message = JSON.parse(Buffer.from(query.data, 'base64').toString())
+  return (
+    <>
+      <NextSeo title={title} description={description} />
+      <MainLayout>
+        <Section
+          width={900}
+          styles="margin-bottom: 75px !important; margin-top:75px;"
+        >
+          <DefaultHeader align="center">{t('heading')}</DefaultHeader>
+        </Section>
+        <SigTab iMessageContent={message}/>
+      </MainLayout>
+    </>
+  )
+}
+
+export default SignaturesExt

From 3b5d171d403c6b339647e00e06d8f16eac0be3dc Mon Sep 17 00:00:00 2001
From: Vadym Shevchenko <vshevchenko.mne@gmail.com>
Date: Fri, 30 Aug 2024 12:38:42 +0300
Subject: [PATCH 2/4] fixed lint errors

---
 pages/signatures/[data].tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pages/signatures/[data].tsx b/pages/signatures/[data].tsx
index 4256a1d..87c40a4 100644
--- a/pages/signatures/[data].tsx
+++ b/pages/signatures/[data].tsx
@@ -10,7 +10,12 @@ const SignaturesExt = () => {
   const title = t('seo:page.signatures.title')
   const description = t('seo:page.signatures.description')
   const {query} = useRouter()
-  const message = JSON.parse(Buffer.from(query.data, 'base64').toString())
+  let message = {filled: false}
+  if (query) {
+    if (query.data) {
+      message = JSON.parse(Buffer.from(query.data, 'base64').toString())
+    }
+  }
   return (
     <>
       <NextSeo title={title} description={description} />
@@ -21,7 +26,7 @@ const SignaturesExt = () => {
         >
           <DefaultHeader align="center">{t('heading')}</DefaultHeader>
         </Section>
-        <SigTab iMessageContent={message}/>
+        <SigTab iMessageContent={message} />
       </MainLayout>
     </>
   )

From 3de272f9280e28d6ac3e1fd2af2f6596a602fd79 Mon Sep 17 00:00:00 2001
From: Vadym Shevchenko <vshevchenko.mne@gmail.com>
Date: Fri, 30 Aug 2024 12:48:08 +0300
Subject: [PATCH 3/4] fixed lint errors

---
 components/sections/Signatures/MessageContent.tsx | 5 +++--
 components/sections/Signatures/SigTab.tsx         | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/sections/Signatures/MessageContent.tsx b/components/sections/Signatures/MessageContent.tsx
index f4beda5..ae96cce 100644
--- a/components/sections/Signatures/MessageContent.tsx
+++ b/components/sections/Signatures/MessageContent.tsx
@@ -5,13 +5,14 @@ import { TextArea, Input, Form } from '@/components/elements/FormFields'
 import { StyledFormArea } from './FormArea.style'
 import VerifyResult from './VerifyResult'
 
-interface IMessageContent {
+export interface IMessageContent {
   message: string
   verusId: string
   signature: string
+  filled: boolean
 }
 
-const MessageContent = ({iMessageContent}) => {
+const MessageContent = ({ iMessageContent }: { iMessageContent: IMessageContent }) => {
   const { t } = useTranslation('signatures')
   const methods = useForm<IMessageContent>({ mode: 'onBlur' })
   const [verusSignature, setVerusSignature] = useState<Record<
diff --git a/components/sections/Signatures/SigTab.tsx b/components/sections/Signatures/SigTab.tsx
index be44329..23c30e3 100644
--- a/components/sections/Signatures/SigTab.tsx
+++ b/components/sections/Signatures/SigTab.tsx
@@ -11,6 +11,8 @@ import {
 import MessageContent from './MessageContent'
 import HashContent from './HashContent'
 import FileContent from './FileContent'
+import { IMessageContent } from './MessageContent'
+
 
 const StyledContainer = styled.div`
   padding: ${(props) => props.theme.spaces.xs};
@@ -18,7 +20,7 @@ const StyledContainer = styled.div`
   max-width: 900px;
 `
 
-const SigTab = ({iMessageContent}) => {
+const SigTab = ({ iMessageContent }: { iMessageContent: IMessageContent }) => {
   const { t } = useTranslation('signatures')
   const [activeEventKey, setActiveEventKey] = useState(0)
   const TabItems = [t('tab.message.tab'), t('tab.file.tab'), t('tab.hash.tab')]

From 5557647e3431433ead7d24cb63b7097a4a66067b Mon Sep 17 00:00:00 2001
From: Vadym Shevchenko <vshevchenko.mne@gmail.com>
Date: Fri, 30 Aug 2024 12:54:15 +0300
Subject: [PATCH 4/4] fixed lint errors

---
 pages/signatures.tsx        | 7 ++++++-
 pages/signatures/[data].tsx | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pages/signatures.tsx b/pages/signatures.tsx
index fcac49c..cebb163 100644
--- a/pages/signatures.tsx
+++ b/pages/signatures.tsx
@@ -18,7 +18,12 @@ const Signatures = () => {
         >
           <DefaultHeader align="center">{t('heading')}</DefaultHeader>
         </Section>
-        <SigTab iMessageContent={{ filled: false }} />
+        <SigTab iMessageContent={{
+          message: '',
+          verusId: '',
+          signature: '',
+          filled: false
+        }} />
       </MainLayout>
     </>
   )
diff --git a/pages/signatures/[data].tsx b/pages/signatures/[data].tsx
index 87c40a4..48ef7ba 100644
--- a/pages/signatures/[data].tsx
+++ b/pages/signatures/[data].tsx
@@ -10,10 +10,10 @@ const SignaturesExt = () => {
   const title = t('seo:page.signatures.title')
   const description = t('seo:page.signatures.description')
   const {query} = useRouter()
-  let message = {filled: false}
+  let messageData = { message: '', verusId: '', signature: '', filled: false }
   if (query) {
-    if (query.data) {
-      message = JSON.parse(Buffer.from(query.data, 'base64').toString())
+    if (typeof query.data === 'string') {
+      messageData = JSON.parse(Buffer.from(query.data, 'base64').toString())
     }
   }
   return (
@@ -26,7 +26,7 @@ const SignaturesExt = () => {
         >
           <DefaultHeader align="center">{t('heading')}</DefaultHeader>
         </Section>
-        <SigTab iMessageContent={message} />
+        <SigTab iMessageContent={messageData} />
       </MainLayout>
     </>
   )