Refactoring method saveDataRegistration in store

Создана форма изменения параметров профиля, добавлен функционал для изменения и добавления параметров

Dockerfile

@@ -0,0 +1,15 @@
+FROM  node:16-alpine AS builder
+
+WORKDIR /front
+
+COPY . .
+
+RUN npm install
+RUN npm run build
+
+FROM nginx:1.21.6-alpine as runner
+
+COPY ./deploy/nginx.conf /etc/nginx/nginx.conf
+COPY --from=builder /front/build /var/www/html
+
+EXPOSE 8080

deploy/nginx.conf

@@ -0,0 +1,33 @@
+worker_processes  1;
+error_log /var/log/nginx/error.log warn;
+pid       /var/run/nginx.pid;
+events {
+    worker_connections 1024;
+}
+http {
+    include      mime.types;
+    default_type application/octet-stream;
+    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+    access_log /var/log/nginx/access.log main;
+    sendfile on;
+    keepalive_timeout 65;
+    gzip_static   on;
+    server {
+        listen      8080;
+        server_name localhost;
+        charset utf-8;
+        location / {
+            root /var/www/html;
+            try_files $uri /index.html;
+            etag on;
+            expires max;
+            add_header Cache-Control public;
+            location = /index.html {
+                expires 0;
+                add_header Cache-Control "no-cache, public, must-revalidate, proxy-revalidate";
+            }
+        }
+    }
+}

src/pages/Onboarding1.jsx

@@ -1,4 +1,4 @@
-import React, {useEffect} from 'react';
+import React from 'react';
 import { Link } from 'react-router-dom';
 
 import OnboardingImage from '../images/onboarding-image.jpg';
@@ -11,9 +11,6 @@ import {registrationStore} from "../store/store";
 const Onboarding1 = observer(()=>{
   let phrase = passphrase.Mnemonic.generateMnemonic()
   registrationStore.savePassPhrase(phrase)
-  useEffect(()=>{
-
-  },[])
 
   return (
     <main className="bg-white">

src/pages/Onboarding2.jsx

@@ -1,4 +1,4 @@
-import React, {useEffect, useState} from 'react';
+import React, {useState} from 'react';
 import { Link } from 'react-router-dom';
 import { observer } from "mobx-react-lite";
 import { registrationStore } from "../store/store";
@@ -24,31 +24,22 @@ const Onboarding2 = observer(()=>{
       ...dataRegistration,
       [event.target.id]: newValue
     })
+    if(!Object.keys(dataRegistration).find(item=>!dataRegistration[item])) {
+      setFillingForm(true)
+    }
   }
 
   const saveStoreRegistration = ()=>{
-    Object.keys(dataRegistration).forEach(item=>{
-      let element=document.getElementById(item)
-      if(dataRegistration[item]) {
-        element.style.borderColor=""
-      } else {
-        element.style.borderColor="red"
-      }
-    })
-    if(Object.keys(dataRegistration).find(item=>!dataRegistration[item])) {
-      return
-    } else {
-      setFillingForm(true)
+    if(fillingForm) {
+      registrationStore.saveDataRegistration(Object.keys(dataRegistration).map(item=>{
+        return{
+          key: `${item}`,
+          value: dataRegistration[item]
+        }
+      }))
     }
-    registrationStore.saveDataRegistration(dataRegistration)
   }
 
-  useEffect(()=>{
-    if(fillingForm===true) {
-      document.getElementById("signup").click()
-    }
-  },[fillingForm])
-
   return (
     <main className="bg-white">
 

src/pages/Onboarding3.jsx

@@ -6,19 +6,18 @@ import {registrationStore} from "../store/store";
 import { passphrase } from "@liskhq/lisk-client";
 
 function Onboarding3() {
-  const [passPhrase, setPassPhrase] = useState(registrationStore.passPhrase.replace(/\s+/g, ' ').split(' ').map((item, index) => ({str:item, id:index })))
+  const [passPhrase, setPassPhrase] = useState(convertPhraseToArray(registrationStore.passPhrase))
   function generatePassPhrase() {
     let phrase = passphrase.Mnemonic.generateMnemonic()
     registrationStore.savePassPhrase(phrase)
-    let newPassPhrase = registrationStore.passPhrase.split(' ').map((item, index) => ({str:item, id:index }))
-    setPassPhrase(newPassPhrase)
+    setPassPhrase(convertPhraseToArray(registrationStore.passPhrase))
   }
 
   function savePassPhraseInStore (copiedPhrase) {
-    let phrasePaste = copiedPhrase.trim().replace(/\s+/g, ' ').split(' ')
+    let phrasePaste = convertPhraseToArray(copiedPhrase.trim())
     if(phrasePaste.length===12) {
-      registrationStore.savePassPhrase(copiedPhrase)
-      setPassPhrase(phrasePaste.map((item, index) => ({str:item, id:index })))
+      registrationStore.savePassPhrase(copiedPhrase.trim())
+      setPassPhrase(phrasePaste)
     } else {
       return false
     }
@@ -28,6 +27,10 @@ function Onboarding3() {
     navigator.clipboard.readText().then(res=>savePassPhraseInStore(res))
   }
 
+  function convertPhraseToArray(phrase) {
+    return phrase.split(' ').map((item, index) => ({str:item, id:index }))
+  }
+
 
   return (
     <main className="bg-white">

src/pages/Onboarding4.jsx

@@ -1,4 +1,4 @@
-import React, {useEffect, useState} from 'react';
+import React, {useState} from 'react';
 import { Link } from 'react-router-dom';
 import {generateSvgAvatar} from "../images/GenerateOnboardingSvg/GenerateSvg";
 import Logo from "../images/logo.png";
@@ -7,24 +7,23 @@ import { registrationStore } from "../store/store";
 
 const Onboarding4 = observer(()=>{
 
-  const [checkBoxesSelected, setCheckBoxesSelected] = useState(false)
+  const [checkBoxesSelected, setCheckBoxesSelected] = useState([])
 
   function createAccount () {
-    let checkBoxes=[...document.getElementsByClassName("form-checkbox")]
-    if(checkBoxes.find(item=>item.checked===false)) {
-      return
-    } else {
-      registrationStore.fetchCreateNewAccount()
-      setCheckBoxesSelected(true)
-
+    if(checkBoxesSelected.length===2) {
+      registrationStore.pushAccountData()
     }
   }
 
-  useEffect(()=>{
-    if(checkBoxesSelected===true) {
-      document.getElementById("link-dashboard").click()
+  function saveCheckBoxesValues(e) {
+    const { id, checked } = e.target
+    setCheckBoxesSelected([...checkBoxesSelected, id])
+    if (!checked) {
+      setCheckBoxesSelected(checkBoxesSelected.filter(item=>item!==id))
     }
-  },[checkBoxesSelected])
+  }
+
+  const firstNameAccount = registrationStore.accountData.length && registrationStore.accountData.find(item=>item.key==="first_name").value
 
   return (
     <main className="bg-white">
@@ -81,20 +80,20 @@ const Onboarding4 = observer(()=>{
                     <circle className="text-emerald-100" cx="32" cy="32" r="32" />
                     <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">{registrationStore.accountData.first_name ? `Nice to meet you, ${registrationStore.accountData.first_name} 🙌` : 'Please, go back step 2'}</h1>
+                  <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">
-                    <Link id="link-dashboard" to={checkBoxesSelected && "/dashboard"}>Go To Profile -&gt;</Link>
+                    <Link id="link-dashboard" to={checkBoxesSelected.length===2 && "/dashboard"}>Go To Profile -&gt;</Link>
                   </button>
                 </div>
 
                 <div className="flex items-center justify-between">
                   <div className="mr-1">
                     <label className="flex items-center">
-                      <input type="checkbox" className="form-checkbox" />
+                      <input id="checkbox-1" onChange={(e)=>saveCheckBoxesValues(e)} type="checkbox" className="form-checkbox" />
                       <span className="text-sm ml-2">I understand that Idntty cannot recover pass phrase</span>
                     </label>
                     <label className="flex items-center">
-                      <input type="checkbox" className="form-checkbox" />
+                      <input id="checkbox-2" onChange={(e)=>saveCheckBoxesValues(e)} type="checkbox" className="form-checkbox" />
                       <div className="text-sm ml-2">
                         I <Link className="text-indigo-500 hover:text-indigo-600 underline" to="/">store my pharse</Link> very carefuly
                       </div>

src/pages/digitalId/ProfileId.jsx

@@ -1,62 +1,89 @@
 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 Image from '../../images/transactions-image-04.svg';
-import ProfileIcon from '../../images/profile-icon.svg';
-import Avatar01 from '../../images/avatar-01.jpg';
-import Avatar02 from '../../images/avatar-02.jpg';
-import Avatar03 from '../../images/avatar-03.jpg';
 
-function Profile () {
+const Profile = observer (() => {
   const [sidebarOpen, setSidebarOpen] = useState(false);
   const [buttonPanelOpen, setButtonPanelOpen] = useState(true);
   const [removePanelOpen, setRemovePanelOpen] = useState(false);
   const [changePanelOpen, setChangePanelOpen] = useState(false);
   const [toggle, setToggle] = useState(true);
   const [addPanelOpen, setAddPanelOpen] = useState(false);
+  const [updatePanelOpen, setUpdatePanelOpen] = useState(false);
   const [selectedItems, setSelectedItems] = useState([]);
   
   const defaultValues = {
-    property: '',
+    label: '',
     value: '',
     seed: Math.floor(Math.random() * 90000000000000000000) 
   };
 
-  const initialPropertyValues = ['First name', 'Second name', 'Birthdate', 'Gender', 'Residence', 'Document type', 'Document ID', 'Issue date', 'Expiry date']; 
+  const initialPropertyValues = ['First name', 'Second name', 'Birthdate', 'Gender', 'National doctype', 'National doc id', 'National doc issue date', 'National doc expiry date'];
   const [propertyValues, setPropertyValues] = useState([]);
-  const [currentValues, setCurrentValues] = useState(defaultValues);
+  const [updatedValues, setUpdatedValues] = useState([defaultValues]);
+  const [addedValues, setAddedValues] = useState(defaultValues);
 
   const openHint = () => {
-    if (!currentValues.property) {
+    if (!addedValues.label) {
       setPropertyValues(initialPropertyValues);
     }
   }
 
-  const changeCurrentValues = (value, field) => {
-    setCurrentValues((prevState)=> ({
+  const changeAddedValues = (value, field) => {
+    setAddedValues((prevState) => (
+      field !== 'seed' ? {
       ...prevState,
-      [field]: value.charAt(0).toUpperCase()+value.slice(1),
+      [field]: value
+    } : {
+      ...prevState,
+      [field]: +value,
     }))
-  }
+  };
+
+  const changeUpdatedValues = (value, field, key) => {
+    setUpdatedValues((prevState) => 
+      prevState.map((elem) => (
+        (elem.key === key && field !== 'seed') ? {
+          ...elem,
+          [field]: value,
+        } : 
+        (elem.key === key) ? {
+          ...elem,
+          [field]: +value,
+        } : elem
+      ))
+    )
+  };
 
   const closeHint = (element) => {
-    changeCurrentValues(element, 'property');
+    changeAddedValues(element, 'label');
     setPropertyValues([]);
   }
 
   const handleSelectedItems = (selectedItems) => {
     setSelectedItems([...selectedItems]);
+    setUpdatedValues(userDataStore.decryptedData.filter(({ key }) => selectedItems.includes(key))
+      .map(elem => (
+        (!elem.seed) ? {
+        ...elem,
+        seed: Math.floor(Math.random() * 90000000000000000000)
+      }: elem)));
     if (selectedItems.length > 0) {
       setButtonPanelOpen(false);
       setAddPanelOpen(false);
       setChangePanelOpen(true);
     }
-    if (removePanelOpen === true) {
+    if (removePanelOpen === true || updatePanelOpen === true) {
       setChangePanelOpen(false);
     }
     if (selectedItems.length === 0) {
       setRemovePanelOpen(false);
+      setUpdatePanelOpen(false);
       setButtonPanelOpen(true);
       setChangePanelOpen(false);
     }
@@ -67,32 +94,84 @@ function Profile () {
     setButtonPanelOpen(false);
   }
 
-  const sendValues = () => {
-    if (!userData.some((element) => element.property === currentValues.property) && (currentValues.seed.toString().length === 20)) {
+  const sendAddedData = () => {
+    if (!userDataStore.decryptedData.some((element) => element.label === addedValues.label) && (addedValues.seed.toString().length === 20)) {
       setAddPanelOpen(false);
       setButtonPanelOpen(true);
-      setCurrentValues(defaultValues);
+      setAddedValues(defaultValues);
+      addDataParameters();
     }
   }
 
+  const sendUpdatedData = () => {
+    setUpdatePanelOpen(false);
+    changeDataParameters();
+    setChangePanelOpen(true);
+  }
+
+  const deleteDataParameters = () => {
+    const changeData = userDataStore.decryptedData.filter(item=>!selectedItems.includes(item.key))
+    registrationStore.pushAccountData(changeData);
+  }
+
+  const changeInitialArray = () => {
+    let newArr = [];
+    userDataStore.decryptedData.map(elem => {
+      updatedValues.forEach(item => {
+        if (elem.label === item.label) {
+          newArr.push({
+            ...elem,
+            'value': item.value, 
+            'seed': item.seed,
+          })
+        }
+      })
+      if (!newArr.find(element => element.label === elem.label)) {
+        newArr.push(elem);
+      }
+    })
+    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));
+  }
+
   const cancelAddPanel = () => {
-    setCurrentValues(defaultValues);
+    setAddedValues(defaultValues);
     setAddPanelOpen(false);
     setButtonPanelOpen(true);
   }
 
+  const cancelUpdatePanel = () => {
+    setUpdatePanelOpen(false);
+    setChangePanelOpen(true);
+  }
+
   const openRemovePanel = () => {
     setRemovePanelOpen(true);
     setChangePanelOpen(false);
   }
 
-  const applyRemovePanel = () => {
+  const openUpdatePanel = () => {
+    setUpdatePanelOpen(true);
+    setChangePanelOpen(false);
+  }
+
+  const applyDataDeletion = () => {
     setRemovePanelOpen(false);
     setButtonPanelOpen(true);
+    deleteDataParameters()
   }
 
   const handleInput = (text, field) => {
-    changeCurrentValues(text, field);
+    changeAddedValues(text, field);
     setPropertyValues(initialPropertyValues);
     if (text) {
       let reg = new RegExp(`^${text}`, 'img');
@@ -100,141 +179,6 @@ function Profile () {
     }
   };
 
-  const userData = [
-    {
-      id: '0',
-      category: 'General',
-      validated: true,
-      blockchained: true,
-      image: ProfileIcon,
-      value: 'Dominik',
-      property: 'First name',
-      status: 'Completed',
-      transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
-      avatars: [Avatar01, Avatar02, Avatar03]
-    },
-    {
-      id: '1',
-      category: 'General',
-      validated: true,
-      blockchained: true,
-      image: ProfileIcon,
-      value: 'Lamakani',
-      property: 'Second name',
-      status: 'Progress',
-      transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
-      avatars: null
-    },
-    {
-      id: '2',
-      category: 'General',
-      validated: true,
-      blockchained: true,
-      image: ProfileIcon,
-      value: '05.10.1983',
-      property: 'Birthdate',
-      status: 'Incorrect',
-      transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
-      avatars: null
-    },
-    {
-      id: '3',
-      category: 'General',
-      validated: true,
-      blockchained: true,
-      image: ProfileIcon,
-      value: 'Male',
-      property: 'Gender',
-      status: 'Stored',
-      transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
-      avatars: null
-    },
-    {
-      id: '4',
-      category: 'Nationality',
-      validated: true,
-      blockchained: true,
-      image: ProfileIcon,
-      value: 'United Kindom',
-      property: 'Residence',
-      status: 'Completed',
-      transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
-      avatars: [Avatar01, Avatar02, Avatar03]
-    },
-    {
-      id: '5',
-      category: 'Nationality',
-      validated: true,
-      blockchained: true,
-      image: ProfileIcon,
-      value: 'Passport',
-      property: 'Document type',
-      status: 'Progress',
-      transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
-      avatars: [Avatar01, Avatar02, Avatar03]
-    },
-    {
-      id: '6',
-      category: 'Nationality',
-      validated: true,
-      blockchained: true,
-      image: ProfileIcon,
-      value: 'A123B3143',
-      property: 'Document ID',
-      status: 'Incorrect',
-      transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
-      avatars: null
-    },
-    {
-      id: '7',
-      category: 'Nationality',
-      validated: true,
-      blockchained: true,
-      image: ProfileIcon,
-      value: '05.10.2012',
-      property: 'Issue date',
-      status: 'Stored',
-      transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
-      avatars: null
-    },
-    {
-      id: '8',
-      category: 'Nationality',
-      validated: true,
-      blockchained: true,
-      image: ProfileIcon,
-      value: '05.10.2032',
-      property: 'Expiry date',
-      status: 'Stored',
-      transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
-      avatars: null
-    },
-    {
-      id: '9',
-      category: 'Social',
-      validated: true,
-      blockchained: true,
-      image: ProfileIcon,
-      value: '@lamakani',
-      property: 'Telegram',
-      status: 'Completed',
-      transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
-      avatars: null
-    },
-    {
-      id: '10',
-      category: 'Social',
-      validated: true,
-      blockchained: true,
-      image: ProfileIcon,
-      value: '@lamakani',
-      property: 'Telegram',
-      status: 'Progress',
-      transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
-      avatars: [Avatar01, Avatar02, Avatar03]
-    },
-  ]
-
   return (
     <div className="flex h-screen overflow-hidden">
       {/* Sidebar */}
@@ -268,7 +212,7 @@ function Profile () {
                   </ul>
                 </div>
                 {/* Table */}
-                <ProfileTable selectedItems={handleSelectedItems} userData={userData}/>
+                <ProfileTable selectedItems={handleSelectedItems} userData={userDataStore.decryptedData}/>
               </div>
               {/* Left sidebar */}
               <div>
@@ -294,12 +238,12 @@ function Profile () {
                         <label className="block text-sm font-medium mb-1" htmlFor="mandatory">Property <span className="text-rose-500">*</span></label>
                         <input
                           autoComplete='off'
-                          id="property"
+                          id="label"
                           className="form-input w-full"
                           type="text"
                           required
-                          onInput={(e) => handleInput(e.target.value, 'property')}
-                          value={currentValues.property}
+                          onInput={(e) => handleInput(e.target.value, 'label')}
+                          value={addedValues.label}
                           onClick={openHint}
                         />
                         <div className={`flex flex-col gap-y-2 py-2 pl-2 border border-t-0 border-slate-200 rounded ${(propertyValues.length > 0) || 'hidden'}`}>
@@ -319,8 +263,8 @@ function Profile () {
                           type="text"
                           required
                           onClick={() => setPropertyValues([])}
-                          onChange={(e) => changeCurrentValues(e.target.value, 'value')}
-                          value={currentValues.value}
+                          onChange={(e) => changeAddedValues(e.target.value, 'value')}
+                          value={addedValues.value}
                         />
                       </div>
                       <div>
@@ -329,11 +273,11 @@ function Profile () {
                           autoComplete='off'
                           id="seed"
                           className="form-input w-full"
-                          type="text"
+                          type="number"
                           required
                           onClick={() => setPropertyValues([])}
-                          onChange={(e) => changeCurrentValues(e.target.value, 'seed')}
-                          value={currentValues.seed}
+                          onChange={(e) => changeAddedValues(e.target.value, 'seed')}
+                          value={addedValues.seed}
                         />
                       </div>
                     </div>
@@ -358,7 +302,79 @@ function Profile () {
                       </button>
                       <button
                         className="btn-sm bg-indigo-500 hover:bg-indigo-600 text-white"
-                        onClick={sendValues}
+                        onClick={sendAddedData}
+                      >
+                        Send
+                      </button>
+                    </div>
+                  </div>
+                  {/* Update panel */}
+                  <div className={`${!updatePanelOpen && 'hidden'} bg-white p-5 shadow-lg rounded-sm border border-slate-200 lg:w-72 xl:w-80 mb-11`}>
+                    {updatedValues.map((item, index) => ( 
+                      <div key={index} className="flex flex-col gap-y-3">
+                        <div>
+                          <label className="block text-sm font-medium mb-1" htmlFor="mandatory">Property <span className="text-rose-500">*</span></label>
+                          <input
+                            id={`${item.key}:label`}
+                            className="form-input w-full"
+                            type="text"
+                            required
+                            onChange={(e) => changeUpdatedValues(e.target.value, 'label', item.key)}
+                            value={item.label}
+                            disabled='disabled'
+                          />
+                        </div>
+                        <div>
+                          <label className="block text-sm font-medium mb-1" htmlFor="mandatory">Value <span className="text-rose-500">*</span></label>
+                          <input
+                            autoComplete='off'
+                            id={`${item.key}:value`}
+                            className="form-input w-full"
+                            type="text"
+                            required
+                            onChange={(e) => changeUpdatedValues(e.target.value, 'value', item.key)}
+                            value={item.value}
+                          />
+                        </div>
+                        <div>
+                          <label className="block text-sm font-medium mb-1" htmlFor="mandatory">Seed <span className="text-rose-500">*</span></label>
+                          <input
+                            autoComplete='off'
+                            id={`${item.key}:seed`}
+                            className="form-input w-full"
+                            type="number"
+                            required
+                            onChange={(e) => changeUpdatedValues(e.target.value, 'seed', item.key)}
+                            value={item.seed}
+                          />
+                        </div>
+                        {(updatedValues[index+1]) ? (
+                        <div className="mt-2 mb-3.5 items-center border-b border-slate-200"></div>
+                        ) : null}
+                      </div>
+                    ))}
+                    <div className="flex flex-row justify-between pt-[16px] pb-[23px] items-center border-b border-slate-200">
+                      <span className="block text-sm font-medium">Store data on blockchain</span>
+                      <div className="flex items-center">
+                        <div className="form-switch">
+                          <input type="checkbox" id="blockcheined" className="sr-only" checked={toggle} onChange={() => setToggle(!toggle)} />
+                            <label className="bg-slate-400" htmlFor="switch-1">
+                            <span className="bg-white shadow-sm" aria-hidden="true"></span>
+                          </label>
+                        </div>
+                      </div>
+                    </div>
+                    {/* Buttons */}
+                    <div className="flex flex-row justify-end gap-x-2 pt-[18px] pb-[14px] items-end">
+                      <button
+                        className="btn-sm bg-white border-slate-200 hover:bg-slate-50 text-slate-600"
+                        onClick={cancelUpdatePanel}
+                      >
+                        Cansel
+                      </button>
+                      <button
+                        className="btn-sm bg-indigo-500 hover:bg-indigo-600 text-white"
+                        onClick={sendUpdatedData}
                       >
                         Send
                       </button>
@@ -368,8 +384,8 @@ function Profile () {
                   <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">
-                      {userData.filter(({ id }) => selectedItems.includes(id)).map(item => (
-                        <span key={item.id} className="text-sm font-normal text-slate-600 py-3 border-b border-slate-200">{item.property}</span>
+                      {userDataStore.decryptedData.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>
                     <div className="flex flex-row justify-between pt-[16px] pb-7 items-center">
@@ -386,7 +402,7 @@ function Profile () {
                     <div className="flex flex-row justify-end gap-x-2 pt-[20px] pb-[16px] items-end">
                       <button
                         className="btn w-full bg-indigo-500 hover:bg-indigo-600 text-white px-[100px] justify-start"
-                        onClick={applyRemovePanel}
+                        onClick={applyDataDeletion}
                         >
                         <svg className="w-4 h-4 fill-current shrink-0" viewBox="0 0 16 16">
                           <path d="m2.457 8.516.969-.99 2.516 2.481 5.324-5.304.985.989-6.309 6.284z" />
@@ -449,7 +465,10 @@ function Profile () {
                       </svg>
                       <span className="ml-2">Remove</span>
                     </button>
-                    <button className="btn w-full border-slate-200 hover:border-slate-300 text-slate-600 px-[100px] justify-start">
+                    <button
+                      className="btn w-full border-slate-200 hover:border-slate-300 text-slate-600 px-[100px] justify-start"
+                      onClick={openUpdatePanel}
+                      >
                       <svg className="w-4 h-4 fill-rose-500 shrink-0" viewBox="0 0 16 16">
                         <path d="M14.682 2.318A4.485 4.485 0 0 0 11.5 1 4.377 4.377 0 0 0 8 2.707 4.383 4.383 0 0 0 4.5 1a4.5 4.5 0 0 0-3.182 7.682L8 15l6.682-6.318a4.5 4.5 0 0 0 0-6.364Zm-1.4 4.933L8 12.247l-5.285-5A2.5 2.5 0 0 1 4.5 3c1.437 0 2.312.681 3.5 2.625C9.187 3.681 10.062 3 11.5 3a2.5 2.5 0 0 1 1.785 4.251h-.003Z" />
                       </svg>
@@ -470,6 +489,6 @@ function Profile () {
       </div>
     </div>
   )
-}
+})
 
-export default Profile;
+export default Profile

src/partials/digitalId/ProfileTable.jsx

@@ -1,5 +1,6 @@
 import React, {useState, useEffect} from 'react';
 import ProfileTableItem from './ProfileTableItem';
+import ProfileIcon from '../../images/profile-icon.svg';
 
 function ProfileTable({
   selectedItems,
@@ -8,6 +9,13 @@ function ProfileTable({
 
   const [isCheck, setIsCheck] = useState([]);
 
+  const defaultData = {
+    image: ProfileIcon,
+    status: 'Stored',
+    transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
+    avatars: null
+  }
+
   useEffect(() => {
     selectedItems(isCheck);
   // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -21,85 +29,123 @@ function ProfileTable({
     }
   };
 
+  const data = {
+    general:["First name","Second name", "Gender", "Birthdate", "Place of birth"],
+    nationality:["Nationality", "National ID", "National doctype", "National doc ID", "National doc issue date", "National doc expiry date"],
+    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) =>
+          !data.general.includes(elem.label) && !data.nationality.includes(elem.label) && !data.social.includes(elem.label));
+
   return (
     <>
     {/* General */}
-      <h2 className="grow text-base font-semibold text-slate-800 truncate mb-2.5 mt-8">General 🖋️</h2>
-      <div className="overflow-x-auto w-[828px]">
-        <table className="w-[828px] table-auto w-full">
-          <tbody className="divide-slate-200 divide-y">
-            {userData.filter(data => data.category === 'General')
-              .map(data => {
+      <div className={`${generalData.length > 0 || 'hidden'}`}>
+        <h2 className="grow text-base font-semibold text-slate-800 truncate mb-2.5 mt-8">General 🖋️</h2>
+        <div className="overflow-x-auto w-[828px]">
+          <table className="w-[828px] table-auto w-full">
+            <tbody className="divide-slate-200 divide-y">
+              {generalData.map((data) => {
                 return (
                   <ProfileTableItem
-                    key={data.id}
-                    id={data.id}
-                    image={data.image}
-                    value={data.value}
-                    property={data.property}
-                    status={data.status}
-                    transactions={data.transactions}
-                    avatars={data.avatars}
+                    key={data.label}
+                    id={data.key}
+                    image={defaultData.image}
+                    value={data.value.charAt(0).toUpperCase()+data.value.slice(1)}
+                    property={data.label}
+                    status={defaultData.status}
+                    transactions={defaultData.transactions}
+                    avatars={defaultData.avatars}
                     handleClick={handleClick}
-                    isChecked={isCheck.includes(data.id)}
+                    isChecked={isCheck.includes(data.key)}
                   />
                 )
-              })
-            }
-          </tbody>
-        </table>
+              })}
+            </tbody>
+          </table>
+        </div>
       </div>
       {/* Nationality */}
-      <h2 className="grow text-base font-semibold text-slate-800 truncate mb-2.5 mt-8">Nationality 🖋️</h2>
-      <div className="overflow-x-auto w-[828px]">
-        <table className="w-[828px] table-auto w-full">
-          <tbody className="text-sm divide-slate-200 divide-y ">
-            {userData.filter(data => data.category === 'Nationality')
-              .map(data => {
+      <div className={`${nationalityData.length > 0 || 'hidden'}`}>
+        <h2 className="grow text-base font-semibold text-slate-800 truncate mb-2.5 mt-8">Nationality 🖋️</h2>
+        <div className="overflow-x-auto w-[828px]">
+          <table className="w-[828px] table-auto w-full">
+            <tbody className="text-sm divide-slate-200 divide-y ">
+              {nationalityData.map(data => {
                 return (
                   <ProfileTableItem
-                    key={data.id}
-                    id={data.id}
-                    image={data.image}
-                    value={data.value}
-                    property={data.property}
-                    status={data.status}
-                    transactions={data.transactions}
-                    avatars={data.avatars}
+                    key={data.label}
+                    id={data.key}
+                    image={defaultData.image}
+                    value={data.value.charAt(0).toUpperCase()+data.value.slice(1)}
+                    property={data.label}
+                    status={defaultData.status}
+                    transactions={defaultData.transactions}
+                    avatars={defaultData.avatars}
                     handleClick={handleClick}
-                    isChecked={isCheck.includes(data.id)}
+                    isChecked={isCheck.includes(data.key)}
                   />
                 )
-              })
-            }
-          </tbody>
-        </table>
+              })}
+            </tbody>
+          </table>
+        </div>
       </div>
       {/* Social */}
-      <h2 className="grow text-base font-semibold text-slate-800 truncate mb-2.5 mt-8">Social 🖋️</h2>
-      <div className="overflow-x-auto w-[828px]">
-        <table className="w-[828px] table-auto w-full">
-          <tbody className="text-sm divide-slate-200 divide-y ">
-            {userData.filter(data => data.category === 'Social')
-              .map(data => {
-                return (
-                  <ProfileTableItem
-                    key={data.id}
-                    id={data.id}
-                    image={data.image}
-                    value={data.value}
-                    property={data.property}
-                    status={data.status}
-                    transactions={data.transactions}
-                    avatars={data.avatars}
-                    handleClick={handleClick}
-                    isChecked={isCheck.includes(data.id)}
-                  />
-                )
-              })
-            }
-          </tbody>
-        </table>
+      <div className={`${sosialData.length > 0 || 'hidden'}`}>
+        <h2 className="grow text-base font-semibold text-slate-800 truncate mb-2.5 mt-8">Social 🖋️</h2>
+        <div className="overflow-x-auto w-[828px]">
+          <table className="w-[828px] table-auto w-full">
+            <tbody className="text-sm divide-slate-200 divide-y ">
+            {sosialData.map(data => {
+              return (
+                <ProfileTableItem
+                  key={data.label}
+                  id={data.key}
+                  image={defaultData.image}
+                  value={data.value.charAt(0).toUpperCase()+data.value.slice(1)}
+                  property={data.label}
+                  status={defaultData.status}
+                  transactions={defaultData.transactions}
+                  avatars={defaultData.avatars}
+                  handleClick={handleClick}
+                  isChecked={isCheck.includes(data.key)}
+                />
+              )
+            })}
+            </tbody>
+          </table>
+        </div>
+      </div>
+      {/* Other */}
+      <div className={`${otherData.length > 0 || 'hidden'}`}>
+        <h2 className="grow text-base font-semibold text-slate-800 truncate mb-2.5 mt-8">Other 🖋️</h2>
+        <div className="overflow-x-auto w-[828px]">
+          <table className="w-[828px] table-auto w-full">
+            <tbody className="text-sm divide-slate-200 divide-y ">
+            {otherData.map(data => {
+              return (
+                <ProfileTableItem
+                  key={data.key}
+                  id={data.key}
+                  image={defaultData.image}
+                  value={data.value}
+                  property={data.label}
+                  status={defaultData.status}
+                  transactions={defaultData.transactions}
+                  avatars={defaultData.avatars}
+                  handleClick={handleClick}
+                  isChecked={isCheck.includes(data.key)}
+                />
+              )
+            })}
+            </tbody>
+          </table>
+        </div>
       </div>
     </>
   )

src/store/store.js

@@ -4,29 +4,43 @@ import {getNodeInfo} from '../api/node';
 import {fetchWrapper} from '../shared/fetchWrapper';
 
 class Store {
-  _accountData = {}
+  _accountData = []
 
   _passPhrase='rocket north inform swift improve fringe sweet crew client canyon bean autumn'
 
   _nodeInfo = {}
 
+  _userData = {}
+
   constructor() {
     makeAutoObservable(this);
 
     this.fetchNodeInfo()
 
-    reaction(() => this.tokenKey, () => fetchWrapper.getAuth('http://3.125.47.101/api/data/account', {
-      networkIdentifier: this.nodeInfo.networkIdentifier,
-      lastBlockID: this.nodeInfo.lastBlockID
-    }))
+    reaction(() => this.tokenKey, () => this.fetchNewAccountData())
   };
 
-  fetchCreateNewAccount() {
-    fetchWrapper.postAuth('http://3.125.47.101/api/data/account', {
+  fetchNewAccountData() {
+    fetchWrapper.getAuth('http://3.125.47.101/api/data/private', {
       networkIdentifier: this.nodeInfo.networkIdentifier,
       lastBlockID: this.nodeInfo.lastBlockID
-    }, [...this.encryptAccountData])
-        .catch(()=>{})
+    }).then((res) => this.userDataFetchChange(res))
+  }
+
+  pushAccountData(data=this.accountData) {
+    fetchWrapper.postAuth('http://3.125.47.101/api/data/private', {
+      networkIdentifier: this.nodeInfo.networkIdentifier,
+      lastBlockID: this.nodeInfo.lastBlockID
+    }, [...this.encryptAccountData(data)])
+        .then(()=>this.fetchNewAccountData())
+  }
+
+  userDataFetchChange(res) {
+    this._userData = res;
+  }
+
+  get userData() {
+    return this._userData
   }
 
   savePassPhrase(phrase) {
@@ -59,11 +73,11 @@ class Store {
     return this._accountData
   };
 
-  get encryptAccountData() {
-    return Object.keys(this.accountData).map((label) => {
-      let value = cryptography.encryptMessageWithPassphrase(cryptography.getRandomBytes(32).toString('hex') + ":" + this.accountData[label], this.passPhrase, this.pubKey);
+  encryptAccountData(data) {
+    return data.map((item) => {
+      let value = cryptography.encryptMessageWithPassphrase(cryptography.getRandomBytes(32).toString('hex') + ":" + item.value, this.passPhrase, this.pubKey);
       return {
-        "label": label,
+        "label": item.key,
         "value": value.encryptedMessage,
         "value_nonce": value.nonce,
       }

src/store/userDataStore.js

@@ -0,0 +1,53 @@
+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();