Refactoring method saveDataRegistration in store

Merge branch 'master' into DID-6
Refactoring in Onboarding steps
2022-07-11 11:15:53 +03:00 · 2022-07-08 21:24:04 +03:00 · 2022-07-08 21:20:09 +03:00 · 2022-07-08 16:32:18 +03:00 · 2022-07-07 10:19:31 +03:00 · 2022-07-06 20:22:48 +03:00
31 changed files with 13157 additions and 1476 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 # dependencies
 /node_modules
 .idea
--- a/15
+++ b/15
@@ -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
--- a/README.md
+++ b/README.md
@@ -1,26 +0,0 @@
 # Mosaic React
 React landing page template designed by Cruip.
 ## Project setup
 ```
 npm install
 ```
 ### Compiles and hot-reloads for development
 ```
 npm run dev
 ```
 ### Compiles and minifies for production
 ```
 npm run build
 ```
 ### Customize configuration
 See [Configuration Reference](https://vitejs.dev/guide/).
 ## Support notes
 We are shipping our templates with a very basic React configuration to let you quickly get into the development process, but we don't discourage you from using any other configuration or framework built on the top of React. So, please note that any request dealing with React (e.g. extra features, customisations, et cetera) is to be considered out of the support scope.
 For more information about what support covers, please see our (FAQs)[https://cruip.com/faq/].
--- a/deploy/nginx.conf
+++ b/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";
            }
        }
    }
 }
--- a/index.html
+++ b/index.html
@@ -1,21 +0,0 @@
 <!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
    <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Vite App</title>
  </head>
  <body class="font-inter antialiased bg-slate-100 text-slate-600">
    <noscript>You need to enable JavaScript to run this app.</noscript>
    <script>
        if (localStorage.getItem('sidebar-expanded') == 'true') {
            document.querySelector('body').classList.add('sidebar-expanded');
        } else {
            document.querySelector('body').classList.remove('sidebar-expanded');
        }
    </script>   
    <div id="root"></div>
    <script type="module" src="/src/main.jsx"></script>
  </body>
 </html>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -2,27 +2,60 @@
  "name": "mosaic-react",
  "version": "0.1.0",
  "scripts": {
-    "dev": "vite",
+    "dev": "webpack-dev-server",
-    "build": "vite build",
+    "build": "webpack"
    "preview": "vite preview"
  },
  "dependencies": {
    "@liskhq/lisk-client": "^5.2.2",
    "@tailwindcss/forms": "^0.4.0",
    "autoprefixer": "^10.4.5",
    "buffer": "^6.0.3",
    "chart.js": "^3.5.0",
    "chartjs-adapter-moment": "^1.0.0",
    "crypto-browserify": "^3.12.0",
    "file-loader": "^6.2.0",
    "html-webpack-plugin": "^5.5.0",
    "mobx": "^6.6.0",
    "mobx-react-lite": "^3.4.0",
    "moment": "^2.29.1",
    "net": "^1.0.2",
    "os-browserify": "^0.3.0",
    "path-browserify": "^1.0.1",
    "postcss-loader": "^7.0.0",
    "process": "^0.11.10",
    "querystring-es3": "^0.2.1",
    "react": "^17.0.2",
    "react-dom": "^17.0.2",
    "react-flatpickr": "^3.10.7",
    "react-router-dom": "^6.2.1",
-    "react-transition-group": "^4.4.1"
+    "react-transition-group": "^4.4.1",
    "stream-browserify": "^3.0.0",
    "url": "^0.11.0",
    "util": "^0.12.4"
  },
  "devDependencies": {
-    "@vitejs/plugin-react": "^1.0.7",
+    "@babel/core": "^7.18.5",
-    "autoprefixer": "^10.4.2",
+    "@babel/preset-env": "^7.18.2",
    "@babel/preset-react": "^7.17.12",
    "babel-loader": "^8.2.5",
    "css-loader": "^6.7.1",
    "html-loader": "^3.1.2",
    "postcss": "^8.4.5",
-    "sass": "^1.49.0",
+    "sass": "^1.52.3",
    "sass-loader": "^13.0.0",
    "style-loader": "^3.3.1",
    "tailwindcss": "^3.0.18",
-    "vite": "^2.7.2"
+    "webpack": "^5.73.0",
    "webpack-cli": "^4.10.0",
    "webpack-dev-server": "^4.9.2"
  },
  "babel": {
    "presets": [
      "@babel/env",
      "@babel/react"
    ]
  },
  "browser": {
    "fs": false
  }
 }
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,7 +1,7 @@
-import tailwind from 'tailwindcss'
+const tailwind = require('tailwindcss')
-import autoprefixer from 'autoprefixer'
+const autoprefixer = require('autoprefixer')
-import tailwindConfig from './src/css/tailwind.config.js'
+const tailwindConfig = require('./src/tailwind.config.js')
-export default {
+module.exports = {
  plugins: [tailwind(tailwindConfig), autoprefixer],
 }
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/index.html
+++ b/public/index.html
@@ -0,0 +1,11 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
  <meta charset="UTF-8">
  <title>React App</title>
 </head>
 <body>
 <div id="root"></div>
 </body>
 </html>
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
 import {
  Routes,
  Route,
-  useLocation
+  useLocation,
 } from 'react-router-dom';
 import './css/style.scss';
--- a/src/api/node.js
+++ b/src/api/node.js
@@ -0,0 +1,3 @@
 import {fetchWrapper} from '../shared/fetchWrapper';
 export const getNodeInfo = (headers) => fetchWrapper.get('node/info/', headers)
--- a/src/components/DropdownProfile.jsx
+++ b/src/components/DropdownProfile.jsx
@@ -1,12 +1,14 @@
 import React, { useState, useRef, useEffect } from 'react';
 import {observer} from "mobx-react-lite";
 import { Link } from 'react-router-dom';
 import Transition from '../utils/Transition';
-
+import {registrationStore} from "../store/store";
 import {generateSvgAvatar} from "../images/GenerateOnboardingSvg/GenerateSvg";
 import UserAvatar from '../images/user-avatar-32.png';
-function DropdownProfile({
+ const DropdownProfile = observer(({
  align
-}) {
+})=>{
  const [dropdownOpen, setDropdownOpen] = useState(false);
@@ -43,7 +45,7 @@ function DropdownProfile({
        onClick={() => setDropdownOpen(!dropdownOpen)}
        aria-expanded={dropdownOpen}
      >
-        <img className="w-8 h-8 rounded-full" src={localStorage.getItem('svgAvatar') || UserAvatar} width="32" height="32" alt="User" />
+        <img className="w-8 h-8 rounded-full" src={generateSvgAvatar(registrationStore.pubKey) || UserAvatar} width="32" height="32" alt="User" />
        <div className="flex items-center truncate">
          <span className="truncate ml-2 text-sm font-medium group-hover:text-slate-800">Acme Inc.</span>
          <svg className="w-3 h-3 shrink-0 ml-1 fill-current text-slate-400" viewBox="0 0 12 12">
@@ -95,6 +97,6 @@ function DropdownProfile({
      </Transition>
    </div>
  )
-}
+})
 export default DropdownProfile;
--- a/src/css/style.scss
+++ b/src/css/style.scss
@@ -3,7 +3,6 @@
@tailwind base;
@tailwind components;
 // Additional styles
@import 'additional-styles/utility-patterns.scss';
@import 'additional-styles/range-slider.scss';
@import 'additional-styles/toggle-switch.scss';
--- a/src/images/GenerateOnboardingSvg/GenerateSvg.js
+++ b/src/images/GenerateOnboardingSvg/GenerateSvg.js
@@ -35,13 +35,10 @@ function createBlob(options) {
    return path + "z";
 }
-export var generateSvgAvatar = (function () {
+export var generateSvgAvatar = ( function () {
-    return function (seed, raw) {
+    return function (publicKey, seed, raw) {
-        let pubKey = localStorage.getItem('svgKey') || Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16);
+        let pubKey = publicKey || Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16) + Math.floor(Math.random()*65535*65535).toString(16);
        //pubKey = "73f47d4929d7b2b6598ca4999d52567f9bb5aef3e353e0a66b468096db6e4e88"
        if (!localStorage.getItem('svgKey')) {
            localStorage.setItem('svgKey', `${pubKey}`)
        }
        let particles = [];
        let gradients = ['#000000'];
        let defs = [];
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -1,8 +1,11 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import { BrowserRouter as Router } from 'react-router-dom'
+import {Buffer} from "buffer";
 import { HashRouter as Router } from 'react-router-dom'
 import App from './App'
 globalThis.Buffer = Buffer
 ReactDOM.render(
  <React.StrictMode>
    <Router>
--- a/src/pages/Dashboard.jsx
+++ b/src/pages/Dashboard.jsx
@@ -1,4 +1,4 @@
-import React, {useEffect, useState} from 'react';
+import React, {useState} from 'react';
 import Sidebar from '../partials/Sidebar';
 import Header from '../partials/Header';
@@ -19,9 +19,6 @@ import DashboardCard10 from '../partials/dashboard/DashboardCard10';
 import DashboardCard11 from '../partials/dashboard/DashboardCard11';
 function Dashboard() {
  useEffect(() => {
    localStorage.setItem('svgKey', '')
  }, [])
  const [sidebarOpen, setSidebarOpen] = useState(false);
  return (
--- a/src/pages/Onboarding1.jsx
+++ b/src/pages/Onboarding1.jsx
@@ -4,8 +4,14 @@ 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";
 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)
 function Onboarding1() {
  return (
    <main className="bg-white">
@@ -127,6 +133,6 @@ function Onboarding1() {
    </main>
  );
-}
+})
 export default Onboarding1;
--- a/src/pages/Onboarding2.jsx
+++ b/src/pages/Onboarding2.jsx
@@ -1,11 +1,45 @@
-import React from 'react';
+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";
-function Onboarding2() {
+const Onboarding2 = observer(()=>{
  const [dataRegistration, setDataRegistration] = useState(
      {
        first_name: '',
        second_name: '',
        gender: '',
        birthdate: '',
      }
  )
  const [fillingForm, setFillingForm] = useState(false)
  const saveValueChange = (event)=>{
    const newValue=event.target.value;
    setDataRegistration({
      ...dataRegistration,
      [event.target.id]: newValue
    })
    if(!Object.keys(dataRegistration).find(item=>!dataRegistration[item])) {
      setFillingForm(true)
    }
  }
  const saveStoreRegistration = ()=>{
    if(fillingForm) {
      registrationStore.saveDataRegistration(Object.keys(dataRegistration).map(item=>{
        return{
          key: `${item}`,
          value: dataRegistration[item]
        }
      }))
    }
  }
  return (
    <main className="bg-white">
@@ -60,23 +94,24 @@ function Onboarding2() {
                <form>
                  <div className="space-y-4 mb-8">
                    <div>
-                      <label className="block text-sm font-medium mb-1" htmlFor="email">First name <span className="text-rose-500">*</span></label>
+                      <label className="block text-sm font-medium mb-1" htmlFor="first_name">First name <span className="text-rose-500">*</span></label>
-                      <input id="email" className="form-input w-full" type="email" />
+                      <input id="first_name" onChange={(event)=>saveValueChange(event)} className="form-input w-full" type="text" />
                    </div>
                    <div>
-                      <label className="block text-sm font-medium mb-1" htmlFor="name">Last name <span className="text-rose-500">*</span></label>
+                      <label className="block text-sm font-medium mb-1" htmlFor="second_name">Last name <span className="text-rose-500">*</span></label>
-                      <input id="name" className="form-input w-full" type="text" />
+                      <input id="second_name" onChange={(event)=>saveValueChange(event)} className="form-input w-full" type="text" />
                    </div>
                    <div>
-                      <label className="block text-sm font-medium mb-1" htmlFor="role">Gender <span className="text-rose-500">*</span></label>
+                      <label className="block text-sm font-medium mb-1" htmlFor="gender">Gender <span className="text-rose-500">*</span></label>
-                      <select id="role" className="form-select w-full">
+                      <select id="gender" onChange={(event)=>saveValueChange(event)} className="form-select w-full">
                        <option className="hidden"></option>
                        <option>male</option>
                        <option>feemale</option>
                      </select>
                    </div>
                    <div>
-                      <label className="block text-sm font-medium mb-1" htmlFor="password">Date of birth <span className="text-rose-500">*</span></label>
+                      <label className="block text-sm font-medium mb-1" htmlFor="birthdate">Date of birth <span className="text-rose-500">*</span></label>
-                      <input id="password" className="form-input w-full" type="password" autoComplete="on" />
+                      <input 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">
@@ -86,8 +121,8 @@ function Onboarding2() {
                        <span className="text-sm ml-2">Email me about product news.</span>
                      </label>
                    </div>
-                    <button 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 to="/onboarding-3">Sign Up</Link>
+                      <Link id="signup" to={fillingForm && "/onboarding-3"} >Sign Up</Link>
                    </button>
                  </div>
                </form>
@@ -114,6 +149,6 @@ function Onboarding2() {
    </main>
  );
-}
+});
 export default Onboarding2;
--- a/src/pages/Onboarding3.jsx
+++ b/src/pages/Onboarding3.jsx
@@ -1,17 +1,37 @@
-import React, {useEffect} 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";
 import {registrationStore} from "../store/store";
 import { passphrase } from "@liskhq/lisk-client";
 function Onboarding3() {
-
+  const [passPhrase, setPassPhrase] = useState(convertPhraseToArray(registrationStore.passPhrase))
-  useEffect(()=>{
+  function generatePassPhrase() {
-    return ()=>{
+    let phrase = passphrase.Mnemonic.generateMnemonic()
-      localStorage.setItem('svgAvatar', generateSvgAvatar())
+    registrationStore.savePassPhrase(phrase)
    setPassPhrase(convertPhraseToArray(registrationStore.passPhrase))
  }
  }, [])
-  const arrayBadges = ['judge', 'jelly', 'wasp', 'true', 'clog', 'forward', 'talent', 'ozone', 'belive', 'fresh', 'bulk', 'hobby']
+  function savePassPhraseInStore (copiedPhrase) {
    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))
  }
  function convertPhraseToArray(phrase) {
    return phrase.split(' ').map((item, index) => ({str:item, id:index }))
  }
  return (
    <main className="bg-white">
@@ -66,21 +86,21 @@ function Onboarding3() {
                  <h1 className="text-3xl text-slate-800 font-bold mb-12">Company information ✨</h1>
                  {/* htmlForm */}
                  <div className="grid grid-cols-4 gap-y-2.5 gap-[18px] mb-14">
-                    {arrayBadges.map(tag => (
+                    {passPhrase.map(tag => (
-                      <button key={tag} className="min-w-93px w-24 min-h-26px h-26px bg-slate-100 text-slate-500 cursor-pointer hover:bg-blue-100 hover:text-blue-600 rounded-full text-center px-2.5">
+                      <button key={tag.id} className="min-w-93px w-24 min-h-26px h-26px bg-slate-100 text-slate-500 cursor-pointer hover:bg-blue-100 hover:text-blue-600 rounded-full text-center px-2.5">
-                        <span className="text-sm font-medium">{tag}</span>
+                        <span className="text-sm font-medium">{tag.str}</span>
                      </button>
                    ))}
                  </div>
                  <div className="flex pl-7 gap-x-5">
-                    <button 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 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"/>
@@ -106,7 +126,7 @@ function Onboarding3() {
        {/* Image */}
        <div className="flex flex-col items-center h-full w-full hidden md:block absolute top-0 bottom-0 right-0 md:w-1/2" aria-hidden="true">
          <div className="flex mt-40 flex-col items-center gap-2.5">
-            <img className="object-cover object-center" src={generateSvgAvatar()} width="493px" height="493px" alt="Onboarding" />
+            <img className="object-cover object-center" src={generateSvgAvatar(registrationStore.pubKey)} width="493px" height="493px" alt="Onboarding" />
            <span className="text-sm">Your generated Digital ID</span>
          </div>
        </div>
--- a/src/pages/Onboarding4.jsx
+++ b/src/pages/Onboarding4.jsx
@@ -1,15 +1,29 @@
-import React, {useEffect} 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";
 import {observer} from "mobx-react-lite";
 import { registrationStore } from "../store/store";
-function Onboarding4() {
+const Onboarding4 = observer(()=>{
-  useEffect(()=>{
+  const [checkBoxesSelected, setCheckBoxesSelected] = useState([])
-    return ()=>{
+
-      localStorage.setItem('svgAvatar', generateSvgAvatar())
+  function createAccount () {
    if(checkBoxesSelected.length===2) {
      registrationStore.pushAccountData()
    }
-  }, [])
+  }
  function saveCheckBoxesValues(e) {
    const { id, checked } = e.target
    setCheckBoxesSelected([...checkBoxesSelected, id])
    if (!checked) {
      setCheckBoxesSelected(checkBoxesSelected.filter(item=>item!==id))
    }
  }
  const firstNameAccount = registrationStore.accountData.length && registrationStore.accountData.find(item=>item.key==="first_name").value
  return (
    <main className="bg-white">
@@ -66,20 +80,20 @@ function Onboarding4() {
                    <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">Nice to meet you, Ivan 🙌</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 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 to="/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>
@@ -97,7 +111,7 @@ function Onboarding4() {
        {/* Image */}
        <div className="flex flex-col items-center h-full w-full hidden md:block absolute top-0 bottom-0 right-0 md:w-1/2" aria-hidden="true">
          <div className="flex mt-40 flex-col items-center gap-2.5">
-            <img className="object-cover object-center" src={generateSvgAvatar()} width="493px" height="493px" alt="Onboarding" />
+            <img className="object-cover object-center" src={generateSvgAvatar(registrationStore.pubKey)} width="493px" height="493px" alt="Onboarding" />
            <span className="text-sm">Your generated Digital ID</span>
          </div>
        </div>
@@ -106,6 +120,6 @@ function Onboarding4() {
    </main>
  );
-}
+});
 export default Onboarding4;
--- a/src/pages/digitalId/ProfileId.jsx
+++ b/src/pages/digitalId/ProfileId.jsx
@@ -1,34 +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 = {
    label: '',
    value: '',
    seed: Math.floor(Math.random() * 90000000000000000000) 
  };
  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 [updatedValues, setUpdatedValues] = useState([defaultValues]);
  const [addedValues, setAddedValues] = useState(defaultValues);
  const openHint = () => {
    if (!addedValues.label) {
      setPropertyValues(initialPropertyValues);
    }
  }
  const changeAddedValues = (value, field) => {
    setAddedValues((prevState) => (
      field !== 'seed' ? {
      ...prevState,
      [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) => {
    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);
    }
@@ -39,9 +94,64 @@ function Profile () {
    setButtonPanelOpen(false);
  }
-  const cancelAddPanel = () => {
+  const sendAddedData = () => {
    if (!userDataStore.decryptedData.some((element) => element.label === addedValues.label) && (addedValues.seed.toString().length === 20)) {
      setAddPanelOpen(false);
      setButtonPanelOpen(true);
      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 = () => {
    setAddedValues(defaultValues);
    setAddPanelOpen(false);
    setButtonPanelOpen(true);
  }
  const cancelUpdatePanel = () => {
    setUpdatePanelOpen(false);
    setChangePanelOpen(true);
  }
  const openRemovePanel = () => {
@@ -49,145 +159,25 @@ function Profile () {
    setChangePanelOpen(false);
  }
-  const applyRemovePanel = () => {
+  const openUpdatePanel = () => {
-    setRemovePanelOpen(false);
+    setUpdatePanelOpen(true);
-    setButtonPanelOpen(true);
+    setChangePanelOpen(false);
  }
-  const userData = [
+  const applyDataDeletion = () => {
-    {
+    setRemovePanelOpen(false);
-      id: '0',
+    setButtonPanelOpen(true);
-      category: 'General',
+    deleteDataParameters()
-      validated: true,
+  }
-      blockchained: true,
+
-      image: ProfileIcon,
+  const handleInput = (text, field) => {
-      value: 'Dominik',
+    changeAddedValues(text, field);
-      property: 'First name',
+    setPropertyValues(initialPropertyValues);
-      status: 'Completed',
+    if (text) {
-      transactions: ['0x7234ABC342342352345', '0x5745DEF342342352345'],
+      let reg = new RegExp(`^${text}`, 'img');
-      avatars: [Avatar01, Avatar02, Avatar03]
+      setPropertyValues((prevState) => prevState.filter((element) => element.match(reg)));
-    },
+    }
-    {
+  };
      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">
@@ -222,7 +212,7 @@ function Profile () {
                  </ul>
                </div>
                {/* Table */}
-                <ProfileTable selectedItems={handleSelectedItems} userData={userData}/>
+                <ProfileTable selectedItems={handleSelectedItems} userData={userDataStore.decryptedData}/>
              </div>
              {/* Left sidebar */}
              <div>
@@ -246,22 +236,56 @@ function Profile () {
                    <div 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="property" className="form-input w-full" type="text" required />
+                        <input
                          autoComplete='off'
                          id="label"
                          className="form-input w-full"
                          type="text"
                          required
                          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'}`}>
                          <ul>
                            {propertyValues.map((element, index) => (
                              <li key={index} onClick={() => closeHint(element)}>{element}</li>
                            ))}
                          </ul>
                        </div>
                      </div>
                      <div>
                        <label className="block text-sm font-medium mb-1" htmlFor="mandatory">Value <span className="text-rose-500">*</span></label>
-                        <input id="value" className="form-input w-full" type="text" required />
+                        <input
                          autoComplete='off'
                          id="value"
                          className="form-input w-full"
                          type="text"
                          required
                          onClick={() => setPropertyValues([])}
                          onChange={(e) => changeAddedValues(e.target.value, 'value')}
                          value={addedValues.value}
                        />
                      </div>
                      <div>
                        <label className="block text-sm font-medium mb-1" htmlFor="mandatory">Seed <span className="text-rose-500">*</span></label>
-                        <input id="seed" className="form-input w-full" type="text" required />
+                        <input
                          autoComplete='off'
                          id="seed"
                          className="form-input w-full"
                          type="number"
                          required
                          onClick={() => setPropertyValues([])}
                          onChange={(e) => changeAddedValues(e.target.value, 'seed')}
                          value={addedValues.seed}
                        />
                      </div>
                    </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="switch-1" className="sr-only" checked={toggle} onChange={() => setToggle(!toggle)} />
+                          <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>
@@ -278,7 +302,79 @@ function Profile () {
                      </button>
                      <button
                        className="btn-sm bg-indigo-500 hover:bg-indigo-600 text-white"
-                        onClick={cancelAddPanel}
+                        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>
@@ -288,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 => (
+                      {userDataStore.decryptedData.filter(({ key }) => selectedItems.includes(key)).map(item => (
-                        <span key={item.id} className="text-sm font-normal text-slate-600 py-3 border-b border-slate-200">{item.property}</span>
+                        <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">
@@ -306,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" />
@@ -369,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>
@@ -390,6 +489,6 @@ function Profile () {
      </div>
    </div>
  )
-}
+})
-export default Profile;
+export default Profile
--- a/src/pages/digitalId/Verify.jsx
+++ b/src/pages/digitalId/Verify.jsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import Sidebar from '../../partials/Sidebar';
 import Header from '../../partials/Header';
-function Verify () {
+const Verify = (() => {
  const [sidebarOpen, setSidebarOpen] = useState(false);
  const [descriptionOpen, setDescriptionOpen] = useState(false);
@@ -165,6 +165,6 @@ function Verify () {
      </div>
    </div>
  )
-}
+})
 export default Verify;
--- a/src/partials/digitalId/ProfileTable.jsx
+++ b/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,86 +29,124 @@ 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 */}
      <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">
-            {userData.filter(data => data.category === 'General')
+              {generalData.map((data) => {
              .map(data => {
                return (
                  <ProfileTableItem
-                    key={data.id}
+                    key={data.label}
-                    id={data.id}
+                    id={data.key}
-                    image={data.image}
+                    image={defaultData.image}
-                    value={data.value}
+                    value={data.value.charAt(0).toUpperCase()+data.value.slice(1)}
-                    property={data.property}
+                    property={data.label}
-                    status={data.status}
+                    status={defaultData.status}
-                    transactions={data.transactions}
+                    transactions={defaultData.transactions}
-                    avatars={data.avatars}
+                    avatars={defaultData.avatars}
                    handleClick={handleClick}
-                    isChecked={isCheck.includes(data.id)}
+                    isChecked={isCheck.includes(data.key)}
                  />
                )
-              })
+              })}
            }
            </tbody>
          </table>
        </div>
      </div>
      {/* Nationality */}
      <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 ">
-            {userData.filter(data => data.category === 'Nationality')
+              {nationalityData.map(data => {
              .map(data => {
                return (
                  <ProfileTableItem
-                    key={data.id}
+                    key={data.label}
-                    id={data.id}
+                    id={data.key}
-                    image={data.image}
+                    image={defaultData.image}
-                    value={data.value}
+                    value={data.value.charAt(0).toUpperCase()+data.value.slice(1)}
-                    property={data.property}
+                    property={data.label}
-                    status={data.status}
+                    status={defaultData.status}
-                    transactions={data.transactions}
+                    transactions={defaultData.transactions}
-                    avatars={data.avatars}
+                    avatars={defaultData.avatars}
                    handleClick={handleClick}
-                    isChecked={isCheck.includes(data.id)}
+                    isChecked={isCheck.includes(data.key)}
                  />
                )
-              })
+              })}
            }
            </tbody>
          </table>
        </div>
      </div>
      {/* Social */}
      <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 ">
-            {userData.filter(data => data.category === 'Social')
+            {sosialData.map(data => {
              .map(data => {
              return (
                <ProfileTableItem
-                    key={data.id}
+                  key={data.label}
-                    id={data.id}
+                  id={data.key}
-                    image={data.image}
+                  image={defaultData.image}
-                    value={data.value}
+                  value={data.value.charAt(0).toUpperCase()+data.value.slice(1)}
-                    property={data.property}
+                  property={data.label}
-                    status={data.status}
+                  status={defaultData.status}
-                    transactions={data.transactions}
+                  transactions={defaultData.transactions}
-                    avatars={data.avatars}
+                  avatars={defaultData.avatars}
                  handleClick={handleClick}
-                    isChecked={isCheck.includes(data.id)}
+                  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>
    </>
  )
 }
--- a/src/shared/fetchWrapper.js
+++ b/src/shared/fetchWrapper.js
@@ -0,0 +1,103 @@
 import {registrationStore} from '../store/store';
 function prepareUrl(url) {
  if (url.startsWith('http')) return url;
  return `http://3.125.47.101/api/${url}`;
 }
 function handleRequest(method, url, headers, attempts, token, body) {
  return new Promise((resolve, reject) => {
    (function internalRequest() {
      return request(method, url, headers, token, body)
        .then(resolve)
        .catch(err => --attempts > 0 ? internalRequest() : reject(err))
    })()
  })
    .then((res) => res.json())
    .catch(() => [])
 };
 /**
 * Request
 * @param {string} method - method name
 * @param {string} url - endpoint url.
 * @param {string} token - auth token
 * @param {object} body - request body.
 * @param {object} headers - request headers
 */
 function request(method, url, headers = {}, token, body) {
  let controller = new AbortController;
  let requestOptions = {};
  if (method === 'GET' || method === 'DELETE'){
    requestOptions = {
      method: method,
      headers: {
        Authorization: `IDNTTY ${token}`,
        ...headers
      },
      signal: controller.signal,
    }
  };
  if (method === 'POST' || method === 'PUT'){
    requestOptions = {
      method: method,
      headers: {
        Authorization: `IDNTTY ${token}`,
        Accept: 'application/json',
        'Content-Type': 'application/json',
        ...headers
      },
      body: JSON.stringify(body),
      signal: controller.signal,
    }
  };
  if (!token) {
    requestOptions.headers.Authorization = null;
  }
  setTimeout(() => controller.abort(), 3000);
  return fetch(prepareUrl(url), requestOptions);
 };
 function get(url, headers, attempts = 1) {
  return handleRequest('GET', url, headers, attempts, null);
 }
 function getAuth(url, headers, attempts = 1) {
  return handleRequest('GET', url, headers, attempts, registrationStore.tokenKey);
 }
 function del(url, headers, attempts = 1) {
  return handleRequest('DELETE', url, headers, attempts, null);
 }
 function delAuth(url, headers, attempts = 1) {
  return handleRequest('DELETE', url, headers, attempts, registrationStore.tokenKey);
 }
 function post(url, headers, body, attempts = 1) {
  return handleRequest('POST', url, headers, attempts, null, body);
 }
 function postAuth(url, headers, body, attempts = 1) {
  return handleRequest('POST', url, headers, attempts, registrationStore.tokenKey, body);
 }
 function put(url, headers, body, attempts = 1) {
  return handleRequest('PUT', url, headers, attempts, null, body);
 }
 function putAuth(url, headers, body, attempts = 1) {
  return handleRequest('PUT', url, headers, attempts, registrationStore.tokenKey, body);
 }
 export const fetchWrapper = {
  get,
  del,
  post,
  put,
  getAuth,
  delAuth,
  postAuth,
  putAuth,
  baseUrl: ''
 };
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -0,0 +1,113 @@
 import { reaction, makeAutoObservable } from "mobx";
 import {cryptography} from "@liskhq/lisk-client";
 import {getNodeInfo} from '../api/node';
 import {fetchWrapper} from '../shared/fetchWrapper';
 class Store {
  _accountData = []
  _passPhrase='rocket north inform swift improve fringe sweet crew client canyon bean autumn'
  _nodeInfo = {}
  _userData = {}
  constructor() {
    makeAutoObservable(this);
    this.fetchNodeInfo()
    reaction(() => this.tokenKey, () => this.fetchNewAccountData())
  };
  fetchNewAccountData() {
    fetchWrapper.getAuth('http://3.125.47.101/api/data/private', {
      networkIdentifier: this.nodeInfo.networkIdentifier,
      lastBlockID: this.nodeInfo.lastBlockID
    }).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) {
    this._passPhrase = phrase
  }
  saveDataRegistration(data) {
    this._accountData = data;
  };
  fetchNodeInfo() {
    getNodeInfo()
      .then((info) => this.fetchNodeInfoSuccess(info))
      .catch((err) => this.fetchNodeInfoFailed(err))
  }
  fetchNodeInfoSuccess(info) {
    this._nodeInfo = info.data;
  }
  fetchNodeInfoFailed(err) {
    console.log(err)
  }
  get passPhrase() {
    return 'rocket north inform swift improve fringe sweet crew client canyon bean autumn'
  }
  get accountData() {
    return this._accountData
  };
  encryptAccountData(data) {
    return data.map((item) => {
      let value = cryptography.encryptMessageWithPassphrase(cryptography.getRandomBytes(32).toString('hex') + ":" + item.value, this.passPhrase, this.pubKey);
      return {
        "label": item.key,
        "value": value.encryptedMessage,
        "value_nonce": value.nonce,
      }
    })
  }
  get nodeInfo() {
    return this._nodeInfo;
  }
  get addressAndPubKey() {
    return cryptography.getAddressAndPublicKeyFromPassphrase(this.passPhrase);
  }
  get pubKey() {
    return this.addressAndPubKey.publicKey.toString('hex');
  }
  get address() {
    return cryptography.bufferToHex(this.addressAndPubKey.address)
  }
  get tokenKey() {
    const stringToSign = this.nodeInfo.networkIdentifier + this.nodeInfo.lastBlockID;
    if(!stringToSign)
      return '';
    const sign = cryptography.signDataWithPassphrase(Buffer.from(stringToSign, 'hex'), this.passPhrase).toString('hex')
    return this.pubKey + ':' +sign
  }
 };
 export const registrationStore = new Store();
--- a/src/store/userDataStore.js
+++ b/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();
--- a/src/css/tailwind.config.js
+++ b/src/css/tailwind.config.js
--- a/src/utils/Utils.js
+++ b/src/utils/Utils.js
@@ -2,7 +2,7 @@ import resolveConfig from 'tailwindcss/resolveConfig';
 export const tailwindConfig = () => {
  // Tailwind config
-  return resolveConfig('./src/css/tailwind.config.js')
+  return resolveConfig('./src/tailwind.config.js')
 }
 export const hexToRGB = (h) => {
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,29 +0,0 @@
 import { defineConfig } from 'vite'
 import postcss from './postcss.config.js'
 import react from '@vitejs/plugin-react'
 // https://vitejs.dev/config/
 export default defineConfig({
  define: {
    'process.env': process.env
  },
  css: {
    postcss,
  },
  plugins: [react()],
  resolve: {
    alias: [
      {
        find: /^~.+/,
        replacement: (val) => {
          return val.replace(/^~/, "");
        },
      },
    ],
  },
  build: {
    commonjsOptions: {
      transformMixedEsModules: true,
    }
  } 
 })
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -0,0 +1,91 @@
 const path = require("path");
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const webpack = require('webpack');
 const plugins = [
  new HtmlWebpackPlugin({
    favicon: './public/favicon.ico',
    template: './public/index.html',
  }),
  new webpack.ProvidePlugin({
    Buffer: ['buffer', 'Buffer'],
  }),
  new webpack.ProvidePlugin({
    process: 'process/browser',
  }),
  require('tailwindcss')
 ];
 module.exports = {
  entry: './src/main.jsx',
  mode: 'development',
  devtool: 'eval-source-map',
  plugins,
  output: {
    clean: true,
    path: path.resolve(__dirname, 'build'),
    assetModuleFilename: 'assets/[hash][ext]',
    filename: 'main.[hash:8].js',
  },
  devServer: {
    open: true,
    static: {
      directory: path.join(__dirname, 'public'),
    },
    compress: true,
    port: 'auto',
    hot: true,
    client: {
      progress: true,
    },
  },
  module: {
    rules: [
      { test: /\.(html)$/, use: ['html-loader'] },
      {
        test: /\.m?jsx?$/,
        exclude: /(node_modules|bower_components)/,
        use: {
          loader: 'babel-loader',
        },
      },
      {
        test: /\.scss$/,
        use: [
          {
            loader: 'style-loader'
          },
          {
            loader: 'css-loader'
          },
          {
            loader: 'postcss-loader'
          },
          {
            loader: 'sass-loader'
          }
        ]
      },
      {
        test: /\.(png|svg|jpg|gif)$/,
        use: ["file-loader"]
      }
    ]
  },
  resolve: {
    extensions: ['.js', '.jsx'],
    fallback: {
      "path": require.resolve("path-browserify"),
      "os": require.resolve("os-browserify/browser"),
      "querystring": require.resolve("querystring-es3"),
      "crypto": require.resolve("crypto-browserify"),
      "util": require.resolve("util/"),
      "stream": require.resolve("stream-browserify"),
      "url": require.resolve("url/"),
      "buffer": require.resolve("buffer/"),
      "fs": false
    }
  },
 };
Author	SHA1	Message	Date
DwCay	0fb5764a70	Refactoring method saveDataRegistration in store	2022-07-11 11:15:53 +03:00
DuCay	138047fa10	Merge branch 'master' into DID-6	2022-07-08 21:24:04 +03:00
DwCay	a271da7bf9	Refactoring in Onboarding steps	2022-07-08 21:20:09 +03:00
Kirill Andrusyak	79784cbcee	Merge pull request #32 from franze6/DID-7 Создана форма изменения параметров профиля, добавлен функционал для изменения и добавления параметров	2022-07-08 16:32:18 +03:00
Daria Golova	596c44aac3	changed strange IIFE function	2022-07-07 10:19:31 +03:00
Daria Golova	5d17137815	made sending data	2022-07-06 20:22:48 +03:00
Daria Golova	18bf373508	changed the names of the methods	2022-07-06 19:38:09 +03:00
Daria Golova	944c9989e9	fix seed	2022-07-06 19:33:27 +03:00
Daria Golova	202989f374	agreed on form to change and add	2022-07-06 19:33:27 +03:00
Daria Golova	f21d10f830	added prop key, made update form	2022-07-06 19:33:27 +03:00
DuCay	c8604a56ac	Merge pull request #31 from franze6/DID-6 Changing data in store to array	2022-07-06 19:27:56 +03:00
DwCay	2d0ae35cc8	Changing data in store to array	2022-07-06 19:27:26 +03:00
DuCay	76f942b90f	Merge pull request #30 from franze6/DID-6 Change methods in store	2022-07-06 18:52:22 +03:00
DwCay	f0e0d9479d	Change methods in store	2022-07-06 18:51:57 +03:00
DuCay	3403289e0a	Merge pull request #29 from franze6/DID-6 New naming for store	2022-07-06 12:59:44 +03:00
DwCay	25fddec6e8	New naming for store	2022-07-06 12:58:53 +03:00
DuCay	1d0cb45024	Merge pull request #28 from franze6/DID-6 Fix naming in store	2022-07-06 12:46:06 +03:00
DwCay	222850dfd9	Fix naming in store	2022-07-06 12:44:53 +03:00
Kirill Andrusyak	8f225752cf	Merge pull request #27 from franze6/DID-6 Add method for delete property account	2022-07-06 12:28:46 +03:00
kandrusyak	038657751a	add deploy files	2022-07-05 15:18:36 +03:00
kandrusyak	29d7d6fdb8	change endpoint url	2022-07-05 15:12:22 +03:00
DwCay	e44dfee284	Add method for delete property account	2022-07-04 18:02:34 +03:00
Kirill Andrusyak	0f455f126d	Merge pull request #26 from franze6/DID-5 Интеграция таблицы страницы Profile с сервером	2022-07-04 10:10:03 +03:00
Daria Golova	0d4f27660a	Merge branch 'DID-5'	2022-07-01 17:27:39 +03:00
Daria Golova	9703371f28	made a reference book	2022-07-01 17:16:09 +03:00
Daria Golova	16ca8a1df2	converted user data into Map object	2022-07-01 16:03:21 +03:00
Daria Golova	e883b190a7	converted user data into Map object	2022-07-01 16:01:20 +03:00
Daria Golova	85897a8efe	changed name of the method in store.js	2022-06-30 14:50:59 +03:00
Daria Golova	5f85d1696a	integrated received data into table	2022-06-30 14:42:59 +03:00
Daria Golova	1c539e5255	made userDataStore	2022-06-30 14:42:59 +03:00
DuCay	bcfc018560	Merge pull request #25 from franze6/DID-4 Did 4	2022-06-30 13:35:58 +03:00
DwCay	e175ca0295	fix naming for post method	2022-06-30 13:35:07 +03:00
DwCay	bac246eac2	fix label name for post request	2022-06-30 13:17:10 +03:00
DwCay	f65c99e86a	fix store	2022-06-29 19:35:06 +03:00
DwCay	63439b2da1	Add method post encrypt auth data	2022-06-29 18:47:49 +03:00
Kirill Andrusyak	1d9368d200	Merge pull request #24 from franze6/DID-3 Доработка формы создания поля	2022-06-28 17:01:22 +03:00
kandrusyak	3a4ed9daf9	auth	2022-06-28 16:38:05 +03:00
Daria Golova	54ccd3ed9f	fix popup hint	2022-06-23 18:52:19 +03:00
Daria Golova	fe1105e9d6	delete useEffect	2022-06-23 15:28:29 +03:00
Daria Golova	95cc2ac1e0	fix property field, added default value of seed	2022-06-23 15:21:08 +03:00
Daria Golova	b4516ef18e	made a popup hint	2022-06-22 19:36:58 +03:00
kandrusyak	d617de75b5	router fix	2022-06-22 14:53:31 +03:00
Kirill Andrusyak	83e5e39d3c	Merge pull request #21 from franze6/DID-2 Создание fetch wrapper	2022-06-21 11:47:58 +03:00
Kirill Andrusyak	f89d59e7df	Merge branch 'master' into DID-2	2022-06-21 11:47:49 +03:00
Kirill Andrusyak	c944644db0	Merge pull request #23 from franze6/DID-1 Did 1	2022-06-21 11:44:57 +03:00
DwCay	bfdddee46a	Add method for get passPhrase and generation hex for account logo	2022-06-18 16:50:32 +03:00
kandrusyak	0da68ddd63	migrate to webpack	2022-06-17 16:56:30 +03:00
Daria Golova	f209ee5f5f	added token availability check	2022-06-16 16:05:48 +03:00
Daria Golova	9bef3d9311	fix authorization by token	2022-06-16 15:25:25 +03:00
Daria Golova	632b98a81a	added authorization by token	2022-06-16 14:30:41 +03:00
DwCay	eeaabeebf3	Add method for get passPhrase	2022-06-15 17:41:02 +03:00
Daria Golova	81f5ec2741	fix methods	2022-06-15 14:36:23 +03:00
Daria Golova	3fcda54070	fix wrapper	2022-06-15 14:21:39 +03:00
Daria Golova	49aff14a80	create fetch wrapper	2022-06-14 13:53:28 +03:00
DwCay	da04efbf80	Add registration store	2022-06-14 13:13:58 +03:00
DuCay	541c5988e9	Merge pull request #20 from franze6/Deleting_elements Delete Onboarding and Component from Sidebar	2022-06-02 15:53:43 +03:00
		`@@ -0,0 +1,3 @@`
							`import {fetchWrapper} from '../shared/fetchWrapper';`

							`export const getNodeInfo = (headers) => fetchWrapper.get('node/info/', headers)`