diff --git a/src/App.jsx b/src/App.jsx index ae7d65f..c6d7ca6 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,26 +1,29 @@ /*eslint-disable */ import Login from "./Screens/Login.jsx"; -import { useState, useEffect } from "react"; +import { useState, useEffect, createContext } from "react"; import MainApp from "./Screens/MainApp.jsx"; import sjcl from "sjcl"; +export const Appcontext = createContext(); export default function App() { const [keys, setKeys] = useState({ public: "", private: "" }); - if (keys.private !== "") { - console.log("heykj"); - console.log(keys.private); - window.localStorage.setItem("private", keys.private); - } else { - if (window.localStorage.getItem("private") !== null) { - console.log(window.localStorage.getItem("private")); - setKeys({ - private: window.localStorage.getItem("private"), - }); + useEffect(() => { + if (keys.private !== "") { + window.localStorage.setItem("private", keys.private); + } else { + if (window.localStorage.getItem("private") !== null) { + setKeys({ + private: window.localStorage.getItem("private"), + }); + } } - } - console.log(keys); + }, [keys.private]); return keys.private.length < 10 ? ( - + + + ) : ( - + + + ); } diff --git a/src/Components/Header.jsx b/src/Components/Header.jsx index 8737015..f326cc8 100644 --- a/src/Components/Header.jsx +++ b/src/Components/Header.jsx @@ -1,7 +1,8 @@ /*eslint-disable */ -import { useEffect, useState } from "react"; +import { useContext, useEffect, useState } from "react"; import getAccount from "../Scripts/Testnet"; import sjcl from "sjcl"; +import { Appcontext } from "../App"; function desprorr2(encripted) { var parsedMessage = JSON.parse(encripted); var encryptedMessageWithoutParameters = JSON.stringify(parsedMessage); @@ -12,10 +13,10 @@ function desprorr2(encripted) { var decryptedMessage = sjcl.decrypt("arstotzka", messageWithParameters); return decryptedMessage; } -export default function Header({ keys, setKeys }) { +export default function Header() { + const props = useContext(Appcontext); const [balance, setBalance] = useState([null, null]); - const desprivate = desprorr2(keys.private); - console.log(desprivate); + const desprivate = desprorr2(props.keys.private); if (balance[0] === null) { getAccount(desprivate).then((account) => { console.log(account.balances); @@ -33,7 +34,7 @@ export default function Header({ keys, setKeys }) { }); } function handleLogout() { - setKeys({ + props.setKeys({ public: "r", private: "r", }); diff --git a/src/Components/Pay.jsx b/src/Components/Pay.jsx index f539e24..2032fc3 100644 --- a/src/Components/Pay.jsx +++ b/src/Components/Pay.jsx @@ -3,6 +3,8 @@ import { useEffect, useRef, useState } from "react"; import { send } from "../Scripts/Testnet"; import sjcl from "sjcl"; import { getFee } from "../Scripts/Testnet"; +import { useContext } from "react"; +import { Appcontext } from "../App"; function desprorr2(encripted) { var parsedMessage = JSON.parse(encripted); var encryptedMessageWithoutParameters = JSON.stringify(parsedMessage); @@ -13,29 +15,20 @@ function desprorr2(encripted) { var decryptedMessage = sjcl.decrypt("arstotzka", messageWithParameters); return decryptedMessage; } -export default function Pay({ keys }) { - const [comision, setComision] = useState("0"); +export default function Pay() { + const props = useContext(Appcontext); const [fee, setFee] = useState("0"); useEffect(() => { setFee(((parseFloat(getFee()) * 0.00001) / 100).toString()); }, []); - function calculatecomision() { - let amount = document.getElementById("amount").value; - if (amount < 1) { - setComision("0.001"); - } else { - setComision((parseFloat(amount) / 500).toString()); - } - } function handleSend() { - console.log(keys); const amount = document.getElementById("amount").value; const to = document.getElementById("to").value; const memo = document.getElementById("memo").value; console.log(amount); console.log(to); - console.log(desprorr2(keys.private)); - send(amount, desprorr2(keys.private), to, memo); + console.log(desprorr2(props.keys.private)); + send(amount, desprorr2(props.keys.private), to, memo); } return (
@@ -45,7 +38,7 @@ export default function Pay({ keys }) { @@ -56,13 +49,9 @@ export default function Pay({ keys }) { -

- Comision BLC: {comision} -

Comision XLM: {fee}