diff --git a/src/pages/Onboarding1.jsx b/src/pages/Onboarding1.jsx index f3205bf..b5466e6 100644 --- a/src/pages/Onboarding1.jsx +++ b/src/pages/Onboarding1.jsx @@ -4,12 +4,10 @@ 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); + registrationStore.generatePassPhrase() return (
diff --git a/src/pages/Onboarding3.jsx b/src/pages/Onboarding3.jsx index 5c8e8fc..95df910 100644 --- a/src/pages/Onboarding3.jsx +++ b/src/pages/Onboarding3.jsx @@ -1,23 +1,18 @@ -import React, { useState} from 'react'; +import React from 'react'; +import {observer} from "mobx-react-lite"; 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)); +const Onboarding3 = observer(()=>{ function generatePassPhrase() { - let phrase = passphrase.Mnemonic.generateMnemonic(); - registrationStore.savePassPhrase(phrase); - setPassPhrase(convertPhraseToArray(registrationStore.passPhrase)); + registrationStore.generatePassPhrase(); }; function savePassPhraseInStore (copiedPhrase) { - let phrasePaste = convertPhraseToArray(copiedPhrase.trim()); - if (phrasePaste.length === 12) { - registrationStore.savePassPhrase(copiedPhrase.trim()); - setPassPhrase(phrasePaste); + if (copiedPhrase.split(' ').length === 12) { + registrationStore.savePastPassPhrase(copiedPhrase.trim()); } else { return false } @@ -27,10 +22,6 @@ function Onboarding3() { navigator.clipboard.readText().then(res => savePassPhraseInStore(res)) }; - function convertPhraseToArray(phrase) { - return phrase.split(' ').map((item, index) => ({str:item, id:index})) - }; - return (
@@ -85,21 +76,21 @@ function Onboarding3() {

Company information ✨

{/* htmlForm */}
- {passPhrase.map(tag => ( + {registrationStore.convertPassPhraseToArray.map(tag => ( ))}
- -
); -} +}); export default Onboarding3; diff --git a/src/pages/Onboarding4.jsx b/src/pages/Onboarding4.jsx index 6db6251..63564fd 100644 --- a/src/pages/Onboarding4.jsx +++ b/src/pages/Onboarding4.jsx @@ -12,6 +12,7 @@ const Onboarding4 = observer(() => { function createAccount() { if(checkBoxesSelected.length === 2) { registrationStore.pushAccountData(); + sessionStorage.setItem('passPhrase', registrationStore.passPhrase) } }; diff --git a/src/partials/validationLog/ValidationSeasonItem.jsx b/src/partials/validationLog/ValidationSeasonItem.jsx index 8cabd4e..c835ba9 100644 --- a/src/partials/validationLog/ValidationSeasonItem.jsx +++ b/src/partials/validationLog/ValidationSeasonItem.jsx @@ -20,7 +20,7 @@ function ValidationSeasonItem({ length, item, index }) {
{item.value}
- {item.address ? "Validated data" : "Updated data"} + {item.address ? "Validated data" : "Updated data"}
Explore -> diff --git a/src/store/store.js b/src/store/store.js index 09c14c4..b7ecc63 100644 --- a/src/store/store.js +++ b/src/store/store.js @@ -1,5 +1,6 @@ import { reaction, makeAutoObservable, onBecomeObserved, onBecomeUnobserved} from "mobx"; import {cryptography} from "@liskhq/lisk-client"; +import { passphrase } from "@liskhq/lisk-client"; import {getNodeInfo} from '../api/node'; import {fetchWrapper} from '../shared/fetchWrapper'; import {labelMap} from "../shared/labelMap"; @@ -13,7 +14,7 @@ const usersImages = [User08,User06,User05,User09]; class Store { _accountData = [] - _passPhrase='rocket north inform swift improve fringe sweet crew client canyon bean autumn' + _passPhrase _nodeInfo = {} @@ -23,8 +24,6 @@ class Store { _sharedData = [] - _personalAccount = {} - _transactionsInfo = [] constructor() { @@ -32,6 +31,8 @@ class Store { this.fetchNodeInfo() + this.generatePassPhrase() + reaction(() => this.keysArray, () => this.fetchSharedData()) onBecomeObserved(this, "decryptedUserData", () => this.fetchNewAccountData()) onBecomeObserved(this, "sharedData", () => this.fetchKeysArray()) @@ -73,21 +74,14 @@ class Store { } fetchTransactionsInfo() { - fetchWrapper.get(`account/transactions/${this.accountMadeTransaction}`, { + fetchWrapper.get("account/transactions/71ccaeefe22050abc9b36ce0c1744316c11c49e1", { networkIdentifier: this.nodeInfo.networkIdentifier, lastBlockID: this.nodeInfo.lastBlockID }).then((res) => this.saveInfoTransactions(res)) } - fetchPersonalAccount() { - fetchWrapper.get(`account/${this.accountMadeTransaction}`, { - networkIdentifier: this.nodeInfo.networkIdentifier, - lastBlockID: this.nodeInfo.lastBlockID - }).then((res)=>this.savePersonalAccount(res)) - } - - savePersonalAccount(res) { - this._personalAccount=res.data + generatePassPhrase() { + this._passPhrase = passphrase.Mnemonic.generateMnemonic() } fetchSharedData() { @@ -108,7 +102,7 @@ class Store { }) } - savePassPhrase(phrase) { + savePastPassPhrase(phrase) { this._passPhrase = phrase } @@ -164,7 +158,7 @@ class Store { transaction: item.asset.features.map(asset => { return { transaction_id: item.id, - address: item.asset.recipientAddress && "b444b7ff3118cf2a30cbd54cfcdb8fd5d805017a", + address: item.asset.recipientAddress && cryptography.bufferToHex(cryptography.getAddressFromPublicKey(cryptography.hexToBuffer(item.senderPublicKey))), value: asset.value, label: labelMap[asset.label], } @@ -186,27 +180,26 @@ class Store { 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, + label: item.key, + value: value.encryptedMessage, + value_nonce: value.nonce, } }) } - get accountMadeTransaction() { - return "71ccaeefe22050abc9b36ce0c1744316c11c49e1" - } - - get personalAccount() { - return this._personalAccount - } - get keysArray() { return this._keysArray; } get passPhrase() { - return 'rocket north inform swift improve fringe sweet crew client canyon bean autumn' + if(sessionStorage.getItem('passPhrase')) { + this._passPhrase = sessionStorage.getItem('passPhrase') + } + return this._passPhrase + } + + get convertPassPhraseToArray() { + return this._passPhrase.split(' ').map((item, index) => ({str:item, id:index})) } get accountData() {