Change fetch Node info data for POST methods

Проверка кода, ренейминг

src/App.jsx

@@ -27,7 +27,7 @@ import Onboarding3 from "./pages/Onboarding3";
 import Onboarding4 from "./pages/Onboarding4";
 import SharedData from "./pages/SharedData";
 import ResetPassword from "./pages/ResetPassword";
-import Signin from "./pages/Signin";
+import SignIn from "./pages/SignIn";
 
 function App() {
 
@@ -62,7 +62,7 @@ function App() {
         <Route path="/component/badge" element={<BadgePage />} />
         <Route path="/component/accordion" element={<AccordionPage />} />
         <Route path="/reset-password" element={<ResetPassword />} />
-        <Route path="/signin" element={<Signin />} />
+        <Route path="/signIn" element={<SignIn />} />
       </Routes>
     </>
   );

src/pages/Onboarding1.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-
 import OnboardingImage from '../images/onboarding-image.jpg';
 import OnboardingDecoration from '../images/auth-decoration.png';
 import Logo from "../images/logo.png";
@@ -8,9 +7,9 @@ import {observer} from "mobx-react-lite";
 import {passphrase} from "@liskhq/lisk-client";
 import {registrationStore} from "../store/store";
 
-const Onboarding1 = observer(()=>{
-  let phrase = passphrase.Mnemonic.generateMnemonic()
-  registrationStore.savePassPhrase(phrase)
+const Onboarding1 = observer(() => {
+  let phrase = passphrase.Mnemonic.generateMnemonic();
+  registrationStore.savePassPhrase(phrase);
 
   return (
     <main className="bg-white">
@@ -31,7 +30,7 @@ const Onboarding1 = observer(()=>{
                   <img alt='logo' src={Logo} width="89" height="32"/>
                 </Link>
                 <div className="text-sm">
-                  Have an account? <Link className="font-medium text-indigo-500 hover:text-indigo-600" to="/signin">Sign In</Link>
+                  Have an account? <Link className="font-medium text-indigo-500 hover:text-indigo-600" to="/signIn">Sign In</Link>
                 </div>
               </div>
 

src/pages/Onboarding2.jsx

@@ -2,43 +2,45 @@ import React, {useState} from 'react';
 import { Link } from 'react-router-dom';
 import { observer } from "mobx-react-lite";
 import { registrationStore } from "../store/store";
-
 import OnboardingImage from '../images/onboarding-image.jpg';
 import OnboardingDecoration from '../images/auth-decoration.png';
 import Logo from "../images/logo.png";
 
-const Onboarding2 = observer(()=>{
+const Onboarding2 = observer(() => {
   const [dataRegistration, setDataRegistration] = useState(
       {
-        first_name: '',
-        second_name: '',
+        firstname: '',
+        secondname: '',
         gender: '',
         birthdate: '',
       }
-  )
-  const [fillingForm, setFillingForm] = useState(false)
+  );
+  const [fillingForm, setFillingForm] = useState(false);
 
-  const saveValueChange = (event)=>{
+  const saveValueChange = (event) => {
     const newValue=event.target.value;
     setDataRegistration({
       ...dataRegistration,
-      [event.target.id]: newValue
+      [event.target.id]: newValue,
     })
-    if(!Object.keys(dataRegistration).find(item=>!dataRegistration[item])) {
-      setFillingForm(true)
-    }
+  };
+
+  const checkFillingForm = () => {
+    if (!Object.keys(dataRegistration).find(item => !dataRegistration[item])) {
+      setFillingForm(true);
     }
+  };
 
   const saveStoreRegistration = ()=>{
-    if(fillingForm) {
-      registrationStore.saveDataRegistration(Object.keys(dataRegistration).map(item=>{
+    if (fillingForm) {
+      registrationStore.saveDataRegistration(Object.keys(dataRegistration).map(item => {
         return{
           key: `${item}`,
           value: dataRegistration[item]
         }
       }))
     }
-  }
+  };
 
   return (
     <main className="bg-white">
@@ -59,7 +61,7 @@ const Onboarding2 = observer(()=>{
                   <img alt='logo' src={Logo} width="89" height="32"/>
                 </Link>
                 <div className="text-sm">
-                  Have an account? <Link className="font-medium text-indigo-500 hover:text-indigo-600" to="/signin">Sign In</Link>
+                  Have an account? <Link className="font-medium text-indigo-500 hover:text-indigo-600" to="/signIn">Sign In</Link>
                 </div>
               </div>
 
@@ -95,15 +97,15 @@ const Onboarding2 = observer(()=>{
                   <div className="space-y-4 mb-8">
                     <div>
                       <label className="block text-sm font-medium mb-1" htmlFor="first_name">First name <span className="text-rose-500">*</span></label>
-                      <input id="first_name" onChange={(event)=>saveValueChange(event)} className="form-input w-full" type="text" />
+                      <input onBlur={checkFillingForm} id="firstname" onChange={(event)=>saveValueChange(event)} className="form-input w-full" type="text" />
                     </div>
                     <div>
                       <label className="block text-sm font-medium mb-1" htmlFor="second_name">Last name <span className="text-rose-500">*</span></label>
-                      <input id="second_name" onChange={(event)=>saveValueChange(event)} className="form-input w-full" type="text" />
+                      <input onBlur={checkFillingForm} id="secondname" onChange={(event)=>saveValueChange(event)} className="form-input w-full" type="text" />
                     </div>
                     <div>
                       <label className="block text-sm font-medium mb-1" htmlFor="gender">Gender <span className="text-rose-500">*</span></label>
-                      <select id="gender" onChange={(event)=>saveValueChange(event)} className="form-select w-full">
+                      <select onBlur={checkFillingForm} id="gender" onChange={(event)=>saveValueChange(event)} className="form-select w-full">
                         <option className="hidden"></option>
                         <option>male</option>
                         <option>feemale</option>
@@ -111,7 +113,7 @@ const Onboarding2 = observer(()=>{
                     </div>
                     <div>
                       <label className="block text-sm font-medium mb-1" htmlFor="birthdate">Date of birth <span className="text-rose-500">*</span></label>
-                      <input id="birthdate" onChange={(event)=>saveValueChange(event)} className="form-input w-full" type="date" autoComplete="on" />
+                      <input onBlur={checkFillingForm} id="birthdate" onChange={(event)=>saveValueChange(event)} className="form-input w-full" type="date" autoComplete="on" />
                     </div>
                   </div>
                   <div className="flex items-center justify-between mt-6">
@@ -121,7 +123,7 @@ const Onboarding2 = observer(()=>{
                         <span className="text-sm ml-2">Email me about product news.</span>
                       </label>
                     </div>
-                    <button onClick={()=>saveStoreRegistration()} className="btn bg-indigo-500 hover:bg-indigo-600 text-white ml-3 whitespace-nowrap">
+                    <button onClick={saveStoreRegistration} className="btn bg-indigo-500 hover:bg-indigo-600 text-white ml-3 whitespace-nowrap">
                       <Link id="signup" to={fillingForm && "/onboarding-3"} >Sign Up</Link>
                     </button>
                   </div>
@@ -129,7 +131,7 @@ const Onboarding2 = observer(()=>{
                 {/* Footer */}
                 <div className="pt-5 mt-6 border-t border-slate-200">
                   <div className="text-sm">
-                    Have an account? <Link className="font-medium text-indigo-500 hover:text-indigo-600" to="/signin">Sign In</Link>
+                    Have an account? <Link className="font-medium text-indigo-500 hover:text-indigo-600" to="/signIn">Sign In</Link>
                   </div>
                 </div>
               </div>

src/pages/Onboarding3.jsx

@@ -6,31 +6,30 @@ import {registrationStore} from "../store/store";
 import { passphrase } from "@liskhq/lisk-client";
 
 function Onboarding3() {
-  const [passPhrase, setPassPhrase] = useState(convertPhraseToArray(registrationStore.passPhrase))
+  const [passPhrase, setPassPhrase] = useState(convertPhraseToArray(registrationStore.passPhrase));
   function generatePassPhrase() {
-    let phrase = passphrase.Mnemonic.generateMnemonic()
-    registrationStore.savePassPhrase(phrase)
-    setPassPhrase(convertPhraseToArray(registrationStore.passPhrase))
-  }
+    let phrase = passphrase.Mnemonic.generateMnemonic();
+    registrationStore.savePassPhrase(phrase);
+    setPassPhrase(convertPhraseToArray(registrationStore.passPhrase));
+  };
 
   function savePassPhraseInStore (copiedPhrase) {
-    let phrasePaste = convertPhraseToArray(copiedPhrase.trim())
-    if(phrasePaste.length===12) {
-      registrationStore.savePassPhrase(copiedPhrase.trim())
-      setPassPhrase(phrasePaste)
+    let phrasePaste = convertPhraseToArray(copiedPhrase.trim());
+    if (phrasePaste.length === 12) {
+      registrationStore.savePassPhrase(copiedPhrase.trim());
+      setPassPhrase(phrasePaste);
     } else {
       return false
     }
-  }
+  };
 
   function pastePassPhrase() {
-    navigator.clipboard.readText().then(res=>savePassPhraseInStore(res))
-  }
+    navigator.clipboard.readText().then(res => savePassPhraseInStore(res))
+  };
 
   function convertPhraseToArray(phrase) {
-    return phrase.split(' ').map((item, index) => ({str:item, id:index }))
-  }
-
+    return phrase.split(' ').map((item, index) => ({str:item, id:index}))
+  };
 
   return (
     <main className="bg-white">
@@ -51,7 +50,7 @@ function Onboarding3() {
                   <img alt='logo' src={Logo} width="89" height="32"/>
                 </Link>
                 <div className="text-sm">
-                  Have an account? <Link className="font-medium text-indigo-500 hover:text-indigo-600" to="/signin">Sign In</Link>
+                  Have an account? <Link className="font-medium text-indigo-500 hover:text-indigo-600" to="/signIn">Sign In</Link>
                 </div>
               </div>
 
@@ -93,14 +92,14 @@ function Onboarding3() {
                     ))}
                   </div>
                   <div className="flex pl-7 gap-x-5">
-                    <button onClick={()=>pastePassPhrase()} className="btn pl-9 pr-16 border-slate-200 hover:border-slate-300 text-slate-600">
+                    <button onClick={pastePassPhrase} className="btn pl-9 pr-16 border-slate-200 hover:border-slate-300 text-slate-600">
                       <svg className="w-4 h-4 fill-current text-slate-400 shrink-0 mb-0.5" viewBox="0 0 16 16">
                         <path
                             d="M11.7.3c-.4-.4-1-.4-1.4 0l-10 10c-.2.2-.3.4-.3.7v4c0 .6.4 1 1 1h4c.3 0 .5-.1.7-.3l10-10c.4-.4.4-1 0-1.4l-4-4zM4.6 14H2v-2.6l6-6L10.6 8l-6 6zM12 6.6L9.4 4 11 2.4 13.6 5 12 6.6z"></path>
                       </svg>
                       <span className="ml-2">Paste</span>
                     </button>
-                    <button onClick={()=>generatePassPhrase()} className="btn pr-11 pl-7 border-slate-200 hover:border-slate-300 text-rose-500">
+                    <button onClick={generatePassPhrase} className="btn pr-11 pl-7 border-slate-200 hover:border-slate-300 text-rose-500">
                       <svg className="mb-0.5" width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
                         <path d="M14.5744 5.66943L13.1504 7.09343C13.4284 7.44043 13.6564 7.75743 13.8194 8.00043C13.0594 9.13043 10.9694 11.8204 8.25836 11.9854L6.44336 13.8004C6.93936 13.9244 7.45736 14.0004 8.00036 14.0004C12.7074 14.0004 15.7444 8.71643 15.8714 8.49243C16.0424 8.18843 16.0434 7.81643 15.8724 7.51243C15.8254 7.42743 15.3724 6.63143 14.5744 5.66943Z" fill="#F43F5E"/>
                         <path fillRule="evenodd" clipRule="evenodd" d="M1.00038 16.0002C0.744375 16.0002 0.488375 15.9022 0.293375 15.7072C-0.0976249 15.3162 -0.0976249 14.6842 0.292375 14.2942L2.82138 11.7653C1.17238 10.2913 0.198375 8.61425 0.128375 8.48925C-0.0416249 8.18625 -0.0426249 7.81725 0.126375 7.51425C0.251375 7.28925 3.24537 2.00025 8.00037 2.00025C9.33138 2.00025 10.5154 2.43125 11.5484 3.03825L14.2934 0.29325C14.6844 -0.09775 15.3164 -0.09775 15.7074 0.29325C16.0984 0.68425 16.0984 1.31625 15.7074 1.70725L1.70738 15.7072C1.51238 15.9022 1.25638 16.0002 1.00038 16.0002ZM8.00037 4.00025C5.14637 4.00025 2.95837 6.83525 2.18138 7.99925C2.55938 8.56225 3.28538 9.51025 4.24038 10.3463L6.07438 8.51225C6.02938 8.34825 6.00037 8.17825 6.00037 8.00025C6.00037 6.89525 6.89537 6.00025 8.00037 6.00025C8.17838 6.00025 8.34838 6.02925 8.51237 6.07425L10.0784 4.50825C9.43738 4.20125 8.74237 4.00025 8.00037 4.00025Z" fill="#F43F5E"/>

src/pages/Onboarding4.jsx

@@ -5,25 +5,25 @@ import Logo from "../images/logo.png";
 import {observer} from "mobx-react-lite";
 import { registrationStore } from "../store/store";
 
-const Onboarding4 = observer(()=>{
+const Onboarding4 = observer(() => {
 
-  const [checkBoxesSelected, setCheckBoxesSelected] = useState([])
+  const [checkBoxesSelected, setCheckBoxesSelected] = useState([]);
 
-  function createAccount () {
-    if(checkBoxesSelected.length===2) {
-      registrationStore.pushAccountData()
-    }
+  function createAccount() {
+    if(checkBoxesSelected.length === 2) {
+      registrationStore.pushAccountData();
     }
+  };
 
   function saveCheckBoxesValues(e) {
-    const { id, checked } = e.target
-    setCheckBoxesSelected([...checkBoxesSelected, id])
+    const { id, checked } = e.target;
+    setCheckBoxesSelected([...checkBoxesSelected, id]);
     if (!checked) {
-      setCheckBoxesSelected(checkBoxesSelected.filter(item=>item!==id))
-    }
+      setCheckBoxesSelected(checkBoxesSelected.filter(item => item !== id));
     }
+  };
 
-  const firstNameAccount = registrationStore.accountData.length && registrationStore.accountData.find(item=>item.key==="first_name").value
+  const firstNameAccount = registrationStore.accountData.length && registrationStore.accountData.find(item => item.key === "firstname").value;
 
   return (
     <main className="bg-white">
@@ -44,7 +44,7 @@ const Onboarding4 = observer(()=>{
                   <img alt='logo' src={Logo} width="89" height="32"/>
                 </Link>
                 <div className="text-sm">
-                  Have an account? <Link className="font-medium text-indigo-500 hover:text-indigo-600" to="/signin">Sign In</Link>
+                  Have an account? <Link className="font-medium text-indigo-500 hover:text-indigo-600" to="/signIn">Sign In</Link>
                 </div>
               </div>
 
@@ -81,7 +81,7 @@ const Onboarding4 = observer(()=>{
                     <path className="text-emerald-500" d="m28.5 41-8-8 3-3 5 5 12-12 3 3z" />
                   </svg>
                   <h1 className="text-3xl text-slate-800 font-bold mb-8">{firstNameAccount ? `Nice to meet you, ${firstNameAccount} 🙌` : 'Please, go back step 2'}</h1>
-                  <button onClick={()=>createAccount()} className="btn px-6 bg-indigo-500 hover:bg-indigo-600 text-white">
+                  <button onClick={createAccount} className="btn px-6 bg-indigo-500 hover:bg-indigo-600 text-white">
                     <Link id="link-dashboard" to={checkBoxesSelected.length===2 && "/dashboard"}>Go To Profile -&gt;</Link>
                   </button>
                 </div>

src/pages/ResetPassword.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-
 import AuthImage from '../images/auth-image.jpg';
 import AuthDecoration from '../images/auth-decoration.png';
 

src/pages/SharedData.jsx

@@ -4,7 +4,7 @@ import {generateSvgAvatar} from "../images/GenerateOnboardingSvg/GenerateSvg";
 import User06 from "../images/user-28-06.jpg";
 import User08 from "../images/user-28-08.jpg";
 import User09 from "../images/user-28-09.jpg";
-import SharedDataRoadMap from "../partials/shareddata/SharedDataRoadmap";
+import SharedDataRoadMap from "../partials/sharedData/SharedDataRoadmap";
 
 function SharedData() {
 

src/pages/SignIn.jsx

@@ -1,13 +1,12 @@
 import React, { useEffect } from 'react';
 import { Link } from 'react-router-dom';
-
 import AuthImage from '../images/auth-image.jpg';
 import AuthDecoration from '../images/auth-decoration.png';
 
-function Signin() {
+function SignIn() {
   useEffect(() => {
     localStorage.setItem('svgKey', '')
-  }, [])
+  }, []);
   return (
     <main className="bg-white">
 
@@ -97,4 +96,4 @@ function Signin() {
   );
 }
 
-export default Signin;
+export default SignIn;

src/pages/digitalId/ProfileId.jsx

@@ -1,16 +1,15 @@
 import React, { useState } from 'react';
-import { userDataStore } from '../../store/userDataStore';
 import { registrationStore } from "../../store/store";
 import Sidebar from '../../partials/Sidebar';
 import { observer } from 'mobx-react-lite';
 import Header from '../../partials/Header';
-import ProfileTable from '../../partials/digitalId/ProfileTable';
+import ProfileTable from '../../partials/profile/ProfileTable';
 import Image from '../../images/transactions-image-04.svg';
 
 const defaultValues = {
   label: '',
   value: '',
-  seed: String(Math.floor(Math.random() * 90000000000000000000), 10) 
+  seed: String(Math.floor(Math.random() * 90000000000000000000), 10),
 };
 
 const initialPropertyValues = ['First name', 'Second name', 'Birthdate', 'Gender', 'National doctype', 'National doc ID', 'National doc issue date', 'National doc expiry date'];
@@ -32,12 +31,12 @@ const Profile = observer (() => {
     if (!addedValues.label) {
       setPropertyValues(initialPropertyValues);
     }
-  }
+  };
 
   const changeAddedValues = (value, field) => {
     setAddedValues((prevState) => ({
       ...prevState,
-      [field]: value
+      [field]: value,
     }))
   };
 
@@ -65,11 +64,11 @@ const Profile = observer (() => {
 
   const handleSelectedItems = (selectedItems) => {
     setSelectedItems([...selectedItems]);
-    setUpdatedValues(userDataStore.decryptedData.filter(({ key }) => selectedItems.includes(key))
+    setUpdatedValues(registrationStore.decryptedUserData.filter(({ key }) => selectedItems.includes(key))
       .map(elem => (
         (!elem.seed) ? {
         ...elem,
-        seed: String(Math.floor(Math.random() * 90000000000000000000), 10) 
+        seed: String(Math.floor(Math.random() * 90000000000000000000), 10),
       }: elem)));
     if (selectedItems.length > 0) {
       setButtonPanelOpen(false);
@@ -90,10 +89,10 @@ const Profile = observer (() => {
   const openAddPanel = () => {
     setAddPanelOpen(true);
     setButtonPanelOpen(false);
-  }
+  };
 
   const sendAddedData = () => {
-    const checkingAddedData = !userDataStore.decryptedData
+    const checkingAddedData = !registrationStore.decryptedUserData
       .some((element) => element.label === addedValues.label) && (addedValues.seed.length === 20);
     if (checkingAddedData) {
       setAddPanelOpen(false);
@@ -101,22 +100,22 @@ const Profile = observer (() => {
       setAddedValues(defaultValues);
       addDataParameters();
     }
-  }
+  };
 
   const sendUpdatedData = () => {
     setUpdatePanelOpen(false);
     changeDataParameters();
     setChangePanelOpen(true);
-  }
+  };
 
   const deleteDataParameters = () => {
-    const changeData = userDataStore.decryptedData.filter(item=>!selectedItems.includes(item.key))
+    const changeData = registrationStore.decryptedUserData.filter(item=>!selectedItems.includes(item.key))
     registrationStore.pushAccountData(changeData);
-  }
+  };
 
   const changeInitialArray = () => {
     let newArr = [];
-    userDataStore.decryptedData.map(elem => {
+    registrationStore.decryptedUserData.map(elem => {
       updatedValues.forEach(item => {
         if (elem.label === item.label) {
           newArr.push({
@@ -131,44 +130,44 @@ const Profile = observer (() => {
       }
     })
     return newArr;
-  }
+  };
 
   const changeDataParameters = () => {
     const updatedData = changeInitialArray();
     registrationStore.pushAccountData(updatedData);
-  }
+  };
 
   const addDataParameters = () => {
     addedValues.key = addedValues.label.toLowerCase().split(' ').join('_');
-    registrationStore.pushAccountData(userDataStore.decryptedData.concat(addedValues));
-  }
+    registrationStore.pushAccountData(registrationStore.decryptedUserData.concat(addedValues));
+  };
 
   const cancelAddPanel = () => {
     setAddedValues(defaultValues);
     setAddPanelOpen(false);
     setButtonPanelOpen(true);
-  }
+  };
 
   const cancelUpdatePanel = () => {
     setUpdatePanelOpen(false);
     setChangePanelOpen(true);
-  }
+  };
 
   const openRemovePanel = () => {
     setRemovePanelOpen(true);
     setChangePanelOpen(false);
-  }
+  };
 
   const openUpdatePanel = () => {
     setUpdatePanelOpen(true);
     setChangePanelOpen(false);
-  }
+  };
 
   const applyDataDeletion = () => {
     setRemovePanelOpen(false);
     setButtonPanelOpen(true);
     deleteDataParameters()
-  }
+  };
 
   const handleInput = (text, field) => {
     changeAddedValues(text, field);
@@ -212,7 +211,7 @@ const Profile = observer (() => {
                   </ul>
                 </div>
                 {/* Table */}
-                <ProfileTable selectedItems={handleSelectedItems} userData={userDataStore.decryptedData}/>
+                <ProfileTable selectedItems={handleSelectedItems} userData={registrationStore.decryptedUserData}/>
               </div>
               {/* Left sidebar */}
               <div>
@@ -383,7 +382,7 @@ const Profile = observer (() => {
                   <div className={`${!removePanelOpen && 'hidden'} bg-white px-5 pt-4 pb-[190px] shadow-lg rounded-sm border border-slate-200 lg:w-72 xl:w-80 mb-12`}>
                     <h2 className="grow text-base font-semibold text-slate-800 truncate mb-2">Summary</h2>
                     <div className="flex flex-col">
-                      {userDataStore.decryptedData.filter(({ key }) => selectedItems.includes(key)).map(item => (
+                      {registrationStore.decryptedUserData.filter(({ key }) => selectedItems.includes(key)).map(item => (
                         <span key={item.label} className="text-sm font-normal text-slate-600 py-3 border-b border-slate-200">{item.label}</span>
                       ))}
                     </div>

src/pages/digitalId/Validate.jsx

@@ -1,15 +1,14 @@
 import React, { useState } from 'react';
 import {observer} from "mobx-react-lite";
-
-import {transactionsStore} from "../../store/transactionsStore";
 import Sidebar from '../../partials/Sidebar';
 import Header from '../../partials/Header';
 import ValidateTable from "../../partials/validate/ValidateTable";
 import ValidatePanel from "../../partials/validate/ValidatePanel";
-import ValidateRoadMap from "../../partials/validationlog/ValidateRoadMap";
+import ValidateRoadMap from "../../partials/validationLog/ValidateRoadMap";
 import {Link} from "react-router-dom";
+import {registrationStore} from "../../store/store";
 
-const Validate = observer(()=>{
+const Validate = observer(() => {
   const [sidebarOpen, setSidebarOpen] = useState(false);
   const [validatePanelOpen, setValidatePanelOpen] = useState(true);
 
@@ -58,7 +57,7 @@ const Validate = observer(()=>{
               <div className="pb-8 border-b border-zinc-200 mt-[50px]">
                 <h1 className="text-2xl md:text-3xl text-slate-800 font-bold">Digital ID validation log ✨</h1>
               </div>
-              {transactionsStore.transactionsData.map(item => {
+              {registrationStore.transactionsInfo.map(item => {
                 return <ValidateRoadMap season={item} key={item.id}/>
               })}
             </div>

src/pages/digitalId/ValidationLog.jsx

@@ -1,12 +1,11 @@
 import React, {useState} from 'react';
-
-import ValidateRoadMap from "../../partials/validationlog/ValidateRoadMap";
-import {transactionsStore} from "../../store/transactionsStore";
+import ValidateRoadMap from "../../partials/validationLog/ValidateRoadMap";
 import {observer} from "mobx-react-lite";
 import Sidebar from '../../partials/Sidebar';
 import Header from '../../partials/Header';
+import {registrationStore} from "../../store/store";
 
-const ValidationLog = observer(()=>{
+const ValidationLog = observer(() => {
   const [sidebarOpen, setSidebarOpen] = useState(false);
 
   return (
@@ -28,7 +27,7 @@ const ValidationLog = observer(()=>{
               <div className="max-w-3xl m-auto mt-6">
                 <div className="xl:-translate-x-16 max-w-fit">
                   {/* PostsID */}
-                  {transactionsStore.transactionsData.map(item=>{
+                  {registrationStore.transactionsInfo.map(item => {
                     return <ValidateRoadMap season={item} key={item.id}/>
                   })}
                 </div>

src/pages/digitalId/Verify.jsx

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import Sidebar from '../../partials/Sidebar';
 import Header from '../../partials/Header';
-import { sharedDataStore } from '../../store/sharedDataStore';
+import {registrationStore} from "../../store/store";
 import { observer } from 'mobx-react-lite';
 
 const Verify = observer(() => {
@@ -42,7 +42,7 @@ const Verify = observer(() => {
             </div>
             {/* Block */}
             <div className="flex flex-col gap-y-4">
-              {sharedDataStore.sharedData.map((item, index) => (
+              {registrationStore.sharedData.map((item, index) => (
                 <div key={index} className="w-[1095px] pl-5 pr-[13px] pb-8 bg-white border border-slate-200 rounded shadow-[0_4px_6px_-1px_rgba(5,23,42,0.08)]">
                   {/* Header */}
                   <div className="flex justify-end items-center h-[42px]">

src/partials/profile/ProfileTable.jsx

@@ -14,7 +14,7 @@ function ProfileTable({
     status: 'Stored',
     transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
     avatars: null
-  }
+  };
 
   useEffect(() => {
     selectedItems(isCheck);
@@ -35,10 +35,10 @@ function ProfileTable({
     social:["Telephone", "Twitter", "Facebook", "Instagram", "Youtube", "Wechat", "Tiktok", "Linkedin", "Vk", "Github", "Telegram", "Qq", "Snapchat", "Reddit"]
   }
 
-  const generalData = userData.filter(elem => data.general.includes(elem.label)),
-        nationalityData = userData.filter(elem => data.nationality.includes(elem.label)),
-        sosialData = userData.filter(elem => data.social.includes(elem.label)),
-        otherData = userData.filter((elem) =>
+  const generalData = userData.filter(elem => data.general.includes(elem.label));
+  const nationalityData = userData.filter(elem => data.nationality.includes(elem.label));
+  const sosialData = userData.filter(elem => data.social.includes(elem.label));
+  const otherData = userData.filter((elem) =>
           !data.general.includes(elem.label) && !data.nationality.includes(elem.label) && !data.social.includes(elem.label));
 
   return (

src/partials/sharedData/SharedDataRoadmap.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import ValidationUsersImg from "../validationlog/ValidationUsersImg";
+import ValidationUsersImg from "../validationLog/ValidationUsersImg";
 
 function SharedDataRoadMap({ data }) {
 

src/shared/labelMap.js

@@ -0,0 +1,27 @@
+export const labelMap = {
+  firstname: 'First name',
+  secondname: 'Second name',
+  gender: "Gender",
+  birthdate: "Birthdate",
+  placeofbirth: "Place of birth",
+  nationality: "Nationality",
+  nationalid: "National ID",
+  nationaldoctype: "National doctype",
+  nationaldocid: "National doc ID",
+  nationaldocissuedate: "National doc issue date",
+  nationaldocexpirydate: "National doc expiry date",
+  telephone: "Telephone",
+  twitter: "Twitter",
+  facebook: "Facebook",
+  instagram: "Instagram",
+  youtube: "Youtube",
+  wechat: "Wechat",
+  tiktok: "Tiktok",
+  linkedin: "Linkedin",
+  vk: "Vk",
+  github: "Github",
+  telegram: "Telegram",
+  qq: "Qq",
+  snapchat: "Snapchat",
+  reddit: "Reddit",
+};

src/store/sharedDataStore.js

@@ -1,66 +0,0 @@
-import { makeAutoObservable, reaction } from "mobx";
-import { fetchWrapper } from "../shared/fetchWrapper";
-import { registrationStore } from './store';
-
-const labelMap = {
-  firstname: 'First name',
-  secondname: 'Second name',
-  gender: "Gender",
-  birthdate: "Birthdate",
-  placeofbirth: "Place of birth",
-  nationality: "Nationality",
-  nationalid: "National ID",
-  nationaldoctype: "National doctype",
-  nationaldocid: "National doc ID",
-  nationaldocissuedate: "National doc issue date",
-  nationaldocexpirydate: "National doc expiry date",
-  telephone: "Telephone",
-  twitter: "Twitter",
-  facebook: "Facebook",
-  instagram: "Instagram",
-  youtube: "Youtube",
-  wechat: "Wechat",
-  tiktok: "Tiktok",
-  linkedin: "Linkedin",
-  vk: "Vk",
-  github: "Github",
-  telegram: "Telegram",
-  qq: "Qq",
-  snapchat: "Snapchat",
-  reddit: "Reddit"
-};
-
-class SharedDataStore{
-  _keysArray = [];
-  _sharedData = [];
-
-  constructor() {
-    makeAutoObservable(this);
-
-    reaction(() => ({data: registrationStore.keysArray}), ({data}) => {
-      this._keysArray = data;
-      this.fetchSharedData();
-    })
-  }
-
-  fetchSharedData() {
-    this._keysArray.forEach((elem) => fetchWrapper.get(`http://3.125.47.101/api/data/shared/${elem}`).then((res) => this.changeSharedData(res)))
-  };
-
-  changeSharedData(incomingData) {
-    this._sharedData.push({
-      data: incomingData.data,
-    })
-  }
-
-  get sharedData() {
-    return this._sharedData.map(elem => ({
-      data: elem.data.map(item => ({
-        label: labelMap[item.label],
-        value: item.value,
-      }))
-  }));
-  };
-}
-
-export const sharedDataStore = new SharedDataStore();

src/store/store.js

@@ -1,7 +1,14 @@
-import { reaction, makeAutoObservable } from "mobx";
+import { reaction, makeAutoObservable, onBecomeObserved, onBecomeUnobserved} from "mobx";
 import {cryptography} from "@liskhq/lisk-client";
 import {getNodeInfo} from '../api/node';
 import {fetchWrapper} from '../shared/fetchWrapper';
+import {labelMap} from "../shared/labelMap";
+import User08 from "../images/user-28-08.jpg";
+import User06 from "../images/user-28-06.jpg";
+import User05 from "../images/user-28-05.jpg";
+import User09 from "../images/user-28-09.jpg";
+
+const usersImages = [User08,User06,User05,User09];
 
 class Store {
   _accountData = []
@@ -10,31 +17,37 @@ class Store {
 
   _nodeInfo = {}
 
-  _userData = {}
+  _userData = []
 
   _keysArray = []
 
-  _transactionsInfo = {}
+  _sharedData = []
+
+  _transactionsInfo = []
 
   constructor() {
-    makeAutoObservable(this);
+    makeAutoObservable(this,{});
 
     this.fetchNodeInfo()
 
-    reaction(() => this.tokenKey, () => this.getData())
-    reaction(() => this.tokenKey, () => this.fetchTransactionsInfo())
+    reaction(() => this.keysArray, () => this.fetchSharedData())
+    onBecomeObserved(this, "decryptedUserData", () => this.fetchNewAccountData())
+    onBecomeObserved(this, "sharedData", ()=>this.fetchKeysArray())
+    onBecomeUnobserved(this, "sharedData", ()=>this.unobservedSharedData())
+    onBecomeObserved(this, "transactionsInfo", ()=>this.fetchTransactionsInfo())
+    onBecomeUnobserved(this, "transactionsInfo", ()=>this.unobservedTransactionsInfo())
   };
 
-  getData() {
-    this.fetchNewAccountData();
-    this.fetchKeysArray();
-  }
-
   fetchNewAccountData() {
+    getNodeInfo()
+        .then((info)=>{
+          this.fetchNodeInfoSuccess(info)
           fetchWrapper.getAuth('data/private', {
             networkIdentifier: this.nodeInfo.networkIdentifier,
             lastBlockID: this.nodeInfo.lastBlockID
           }).then((res) => this.userDataFetchChange(res))
+        })
+        .catch((err) => this.fetchNodeInfoFailed(err))
   }
 
   pushAccountData(data=this.accountData) {
@@ -46,41 +59,40 @@ class Store {
   }
 
   fetchKeysArray() {
+    getNodeInfo()
+        .then((info)=>{
+          this.fetchNodeInfoSuccess(info)
           fetchWrapper.getAuth('data/shared/', {
             networkIdentifier: this.nodeInfo.networkIdentifier,
             lastBlockID: this.nodeInfo.lastBlockID
           }).then((res) => this.keysArrayFetchChange(res))
+        })
+        .catch((err) => this.fetchNodeInfoFailed(err))
   }
 
   fetchTransactionsInfo() {
-    fetchWrapper.getAuth(`http://3.125.47.101/api/account/transactions/${this.accountMadeTransaction}?moduleID=1001&assetID=11`, {
+    fetchWrapper.get(`account/transactions/${this.accountMadeTransaction}?moduleID=1001&assetID=11`, {
       networkIdentifier: this.nodeInfo.networkIdentifier,
       lastBlockID: this.nodeInfo.lastBlockID
     }).then((res)=>this.saveInfoTransactions(res))
   }
 
-  get accountMadeTransaction() {
-    return "b444b7ff3118cf2a30cbd54cfcdb8fd5d805017a"
+  fetchSharedData() {
+    this._keysArray.forEach((elem) => fetchWrapper.get(`data/shared/${elem}`).then((res) => this.changeSharedData(res)))
+  };
+
+  unobservedTransactionsInfo() {
+    this._transactionsInfo=[]
   }
 
-  userDataFetchChange(res) {
-    this._userData = res;
+  unobservedSharedData() {
+    this._sharedData=[]
   }
 
-  keysArrayFetchChange(res) {
-    this._keysArray = res.data;
-  }
-
-  get keysArray() {
-    return this._keysArray;
-  }
-
-  get userData() {
-    return this._userData;
-  }
-
-  get transactionsInfo() {
-    return this._transactionsInfo
+  changeSharedData(incomingData) {
+    this._sharedData.push({
+      data: incomingData.data,
+    })
   }
 
   savePassPhrase(phrase) {
@@ -91,16 +103,24 @@ class Store {
     this._accountData = data;
   };
 
-  saveInfoTransactions(transaction) {
-    this._transactionsInfo = transaction
-  }
-
   fetchNodeInfo() {
     getNodeInfo()
-      .then((info) => this.fetchNodeInfoSuccess(info))
+        .then((info)=>this.fetchNodeInfoSuccess(info))
         .catch((err) => this.fetchNodeInfoFailed(err))
   }
 
+  saveInfoTransactions(transaction) {
+    this._transactionsInfo = transaction.data
+  }
+
+  userDataFetchChange(res) {
+    this._userData = res.data;
+  }
+
+  keysArrayFetchChange(res) {
+    this._keysArray = res.data;
+  }
+
   fetchNodeInfoSuccess(info) {
     this._nodeInfo = info.data;
   }
@@ -109,13 +129,45 @@ class Store {
     console.log(err)
   }
 
-  get passPhrase() {
-    return 'rocket north inform swift improve fringe sweet crew client canyon bean autumn'
+  get sharedData() {
+    return this._sharedData.map(elem => ({
+      data: elem.data.map(item => ({
+        label: labelMap[item.label],
+        value: item.value,
+      }))
+    }));
+  };
+
+  get transactionsInfo() {
+    return this._transactionsInfo.map(item=>{
+      return {
+        id: item.id,
+        users_images: usersImages.map(image=>{
+          return {
+            image: image,
+            size: 24
+          }
+        }),
+        transaction: item.asset.features.map(asset=>{
+          return {
+            transaction_id: item.id,
+            address: this.accountMadeTransaction,
+            value: asset.value,
+            label: labelMap[asset.label],
+          }
+        })
+      }
+    })
   }
 
-  get accountData() {
-    return this._accountData
-  };
+  get decryptedUserData(){
+    return this._userData.map((elem) => ({
+      ...elem,
+      key: elem.label,
+      label: labelMap[elem.label],
+      value: cryptography.decryptMessageWithPassphrase(elem.value, elem.value_nonce, registrationStore.passPhrase, registrationStore.pubKey).split(':')[1]
+    }))
+  }
 
   encryptAccountData(data) {
     return data.map((item) => {
@@ -128,6 +180,22 @@ class Store {
     })
   }
 
+  get accountMadeTransaction() {
+    return "b444b7ff3118cf2a30cbd54cfcdb8fd5d805017a"
+  }
+
+  get keysArray() {
+    return this._keysArray;
+  }
+
+  get passPhrase() {
+    return 'rocket north inform swift improve fringe sweet crew client canyon bean autumn'
+  }
+
+  get accountData() {
+    return this._accountData
+  };
+
   get nodeInfo() {
     return this._nodeInfo;
   }

src/store/transactionsStore.js

@@ -1,51 +0,0 @@
-import {makeAutoObservable, reaction} from "mobx";
-import {registrationStore} from "./store";
-import User05 from "../../src/images/user-28-05.jpg";
-import User08 from "../../src/images/user-28-08.jpg";
-import User09 from "../../src/images/user-28-09.jpg";
-import User06 from "../../src/images/user-28-06.jpg";
-
-const labelMap = {
-  firstname: 'First name',
-  secondname: 'Second name',
-  gender: "Gender",
-  birthdate: "Birthdate"
-};
-
-const usersImages = [User08,User06,User05,User09];
-
-class TransactionsStore {
-  _transactionsData = [];
-
-  constructor() {
-    makeAutoObservable(this)
-
-    reaction(() => ({data: registrationStore.transactionsInfo}), ({data}) => {
-      this._transactionsData = data.data;
-    })
-  }
-
-  get transactionsData() {
-    return this._transactionsData.map(item=>{
-      return {
-        id: item.id,
-        users_images: usersImages.map(image=>{
-          return {
-            image: image,
-            size: 24
-          }
-        }),
-        transaction: item.asset.features.map(asset=>{
-          return {
-            transaction_id: item.id,
-            address: registrationStore.accountMadeTransaction,
-            value: asset.value,
-            label: labelMap[asset.label],
-          }
-        })
-      }
-    })
-  }
-}
-
-export const transactionsStore = new TransactionsStore()

src/store/userDataStore.js

@@ -1,53 +0,0 @@
-import { cryptography } from "@liskhq/lisk-client";
-import { makeAutoObservable, reaction } from "mobx";
-import { registrationStore } from './store';
-
-const labelMap = {
-  first_name: 'First name',
-  second_name: 'Second name',
-  gender: "Gender",
-  birthdate: "Birthdate",
-  place_of_birth: "Place of birth",
-  nationality: "Nationality",
-  national_id: "National ID",
-  national_doctype: "National doctype",
-  national_doc_id: "National doc ID",
-  national_doc_issue_date: "National doc issue date",
-  national_doc_expiry_date: "National doc expiry date",
-  telephone: "Telephone",
-  twitter: "Twitter",
-  facebook: "Facebook",
-  instagram: "Instagram",
-  youtube: "Youtube",
-  wechat: "Wechat",
-  tiktok: "Tiktok",
-  linkedin: "Linkedin",
-  vk: "Vk",
-  github: "Github",
-  telegram: "Telegram",
-  qq: "Qq",
-  snapchat: "Snapchat",
-  reddit: "Reddit"
-};
-
-class UserDataStore{
-  _data = [];
-
-  constructor() {
-    makeAutoObservable(this);
-
-    reaction(() => ({data: registrationStore.userData}), ({data}) => {
-      this._data = data.data;
-    })
-  }
-  get decryptedData(){
-    return this._data.map((elem) => ({
-      ...elem,
-      key: elem.label,
-      label: labelMap[elem.label],
-      value: cryptography.decryptMessageWithPassphrase(elem.value, elem.value_nonce, registrationStore.passPhrase, registrationStore.pubKey).split(':')[1]
-    }))
-  }
-}
-
-export const userDataStore = new UserDataStore();