- {walletScreen === 0 && (
-
-
- 
+ return (
+
Zingo PC v1.0.4
-
+
+
+ {walletScreen === 0 && (
+
+
{currentStatus}
+ {currentStatusIsError && (
+
+
+
+
- {currentStatus}
- {currentStatusIsError && (
-
-
+ )}
+
+ )}
+
+ {walletScreen === 1 && (
+
+
+
+
+ Create A New Wallet
+
+ Creates a new wallet with a new randomly generated seed phrase. Please save the seed phrase
+ carefully, it’s the only way to restore your wallet.
+
+
+
+
+
+
- )}
-
- )}
-
- {walletScreen === 1 && (
- Restore Wallet From Seed
+
+ If you already have a seed phrase, you can restore it to this wallet. This will rescan the
+ blockchain for all transactions from the seed phrase.
+
+
-
-
- Zingo PC v1.0.4
-
-
-
- Create A New Wallet
-
- Creates a new wallet with a new randomly generated seed phrase. Please save the seed phrase
- carefully, it’s the only way to restore your wallet.
-
-
-
-
-
-
-
Restore Wallet From Seed
-
- If you already have a seed phrase, you can restore it to this wallet. This will rescan the
- blockchain for all transactions from the seed phrase.
-
-
-
-
+
+
- )}
-
- {walletScreen === 2 && (
- Restore Wallet From Viewing Key
+
+ If you already have a Unified Full Viewing Key, you can restore it to this wallet. This will rescan the
+ blockchain for all transactions from the UFVK.
-
-
Restore Wallet From Viewing Key
-
- If you already have a Unified Full Viewing Key, you can restore it to this wallet. This will rescan the
- blockchain for all transactions from the UFVK.
-
-
-
-
+
+
-
-
-
- Zingo PC v1.0.4
-
-
- {newWalletError && (
-
-
-
-
+ )}
+
+ {walletScreen === 2 && (
+ Error Creating New Wallet
- There was an error creating a new wallet
- -
{newWalletError}
- -
-
-
+
+
+
- )}
-
- {walletScreen === 3 && (
-
+ {newWalletError && (
+
+
+
+
+
+
+ )}
Error Creating New Wallet
+ There was an error creating a new wallet
+ +
{newWalletError}
+ +
+
- )}
-
- {!newWalletError && (
-
-
-
-
+ )}
+
+ {!newWalletError && (
+ Your New Wallet
-
- This is your new wallet. Below is your seed phrase. PLEASE STORE IT CAREFULLY! The seed phrase
- is the only way to recover your funds and transactions.
-
- -
{seed}
- -
-
-
+
+
+ Your New Wallet
+
+ This is your new wallet. Below is your seed phrase. PLEASE STORE IT CAREFULLY! The seed phrase
+ is the only way to recover your funds and transactions.
- )}
- +
{seed}
+ +
+
+
+
-
-
-
- Zingo PC v1.0.4
-
-
- {newWalletError && (
-
-
-
-
+ )}
+
+ {walletScreen === 3 && (
+ Error Restoring Wallet
- There was an error restoring your seed phrase
- -
{newWalletError}
- -
-
-
+
+
+
- )}
-
- {walletScreen === 4 && (
-
+ {newWalletError && (
+
+
+
+
+ )}
+
+ {!newWalletError && (
+ Error Restoring Wallet
+ There was an error restoring your seed phrase
+ +
{newWalletError}
+ +
+
+
+
+ this.updateSeed(e)}
+ />
+
+
+ )}
Please enter your seed phrase
+
+ Wallet Birthday. If you don’t know this, it is OK to enter ‘0’
- )}
-
- {!newWalletError && (
-
- this.updateSeed(e)}
- />
-
-
+ Please enter your seed phrase
-
- Wallet Birthday. If you don’t know this, it is OK to enter ‘0’
-
- this.updateBirthday(e)}
- />
-
-
-
-
-
+ this.updateBirthday(e)}
+ />
+
+
+
+
- )}
-
- ("");
@@ -28,7 +28,7 @@ export default function ServerSelectModal({ closeModal, openErrorModal }: ModalP
const [customChain, setCustomChain] = useState<'main' | 'test' | 'regtest' | ''>("");
//const [listChain, setListChain] = useState<'main' | 'test' | 'regtest' | ''>("");
- const [servers, setServers] = useState(serverUrisContext.length > 0 ? serverUrisContext : serverUris());
+ const [servers, setServers] = useState(serverUris.length > 0 ? serverUris : serverUrisList());
const chains = {
"main": "Mainnet",
@@ -70,7 +70,7 @@ export default function ServerSelectModal({ closeModal, openErrorModal }: ModalP
useEffect(() => {
(async () => {
- const servers: Server[] = serverUrisContext.length > 0 ? serverUrisContext : serverUris();
+ const servers: Server[] = serverUris.length > 0 ? serverUris : serverUrisList();
const settings = await ipcRenderer.invoke("loadSettings");
//console.log('modal server settings', settings);
@@ -83,7 +83,7 @@ export default function ServerSelectModal({ closeModal, openErrorModal }: ModalP
setSelectedSelection(currSelection);
setServers(servers);
})();
- }, [initialServerValue, serverUrisContext]);
+ }, [initialServerValue, serverUris]);
const switchServer = async () => {
const serveruri: string = selectedServer;
diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx
index bb4abeda..8b0e881e 100644
--- a/src/components/sidebar/Sidebar.tsx
+++ b/src/components/sidebar/Sidebar.tsx
@@ -4,7 +4,7 @@ import { RouteComponentProps, withRouter } from "react-router";
import styles from "./Sidebar.module.css";
import cstyles from "../common/Common.module.css";
import routes from "../../constants/routes.json";
-import { Address, Info, Transaction, TxDetail } from "../appstate";
+import { Address, Info, Server, Transaction, TxDetail } from "../appstate";
import Utils from "../../utils/utils";
import RPC from "../../rpc/rpc";
import { parseZcashURI, ZcashURITarget } from "../../utils/uris";
@@ -14,9 +14,7 @@ import ImportPrivKeyModal from "./components/ImportPrivKeyModal";
import ExportPrivKeyModal from "./components/ExportPrivKeyModal";
import SidebarMenuItem from "./components/SidebarMenuItem";
import { ContextApp } from "../../context/ContextAppState";
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faSnowflake } from '@fortawesome/free-solid-svg-icons';
-import serverUris from "../../utils/serverUris";
+import { Logo } from "../logo";
const { ipcRenderer, remote } = window.require("electron");
const fs = window.require("fs");
@@ -40,7 +38,7 @@ type SidebarProps = {
encryptWallet: (p: string) => Promise;
decryptWallet: (p: string) => Promise;
updateWalletSettings: () => Promise;
- logo: string;
+ navigateToLoadingScreen: (b: boolean, c: string, s: Server[]) => void;
};
type SidebarState = {
@@ -199,7 +197,6 @@ class Sidebar extends PureComponent {
- const s = serverUris;
// To change to another wallet, we reset the wallet loading
// and redirect to the loading screen
clearTimers();
@@ -207,14 +204,7 @@ class Sidebar extends PureComponent {
- const s = serverUris;
// To rescan, we reset the wallet loading
// So set info the default, and redirect to the loading screen
clearTimers();
@@ -344,12 +333,7 @@ class Sidebar extends PureComponent {
- const { importPrivKeys, openErrorModal, setInfo, clearTimers, setRescanning, history } = this.props;
- const { info } = this.context;
+ const { importPrivKeys, openErrorModal, setInfo, clearTimers, setRescanning } = this.props;
+ const { info, serverUris } = this.context;
if (key) {
let keys: string[] = key.split(new RegExp("[\\n\\r]+"));
@@ -467,7 +451,6 @@ class Sidebar extends PureComponent
-
-
- Zingo PC v4
-
-
+ );
- return
- {newWalletError && (
-
+ )}
+
-
-
-
+ )}
+
+ {walletScreen === 4 && (
+ Error Restoring Wallet
- There was an error restoring your Viewing Key
- -
{newWalletError}
- -
-
-
+
+
- );
- }
+
+
- )}
-
+ {newWalletError && (
+
+
+
+
+ )}
+
+ {!newWalletError && (
+ Error Restoring Wallet
+ There was an error restoring your Viewing Key
+ +
{newWalletError}
+ +
+
+
+
+ this.updateUfvk(e)}
+ />
+
+
+ )}
Please enter your Unified Full Viewing Key
+
+ Wallet Birthday. If you don’t know this, it is OK to enter ‘0’
- )}
-
- {!newWalletError && (
-
- this.updateUfvk(e)}
- />
-
-
+ Please enter your Unified Full Viewing Key
-
- Wallet Birthday. If you don’t know this, it is OK to enter ‘0’
-
- this.updateBirthday(e)}
- />
-
-
-
-
-
+ this.updateBirthday(e)}
+ />
+
+
+
+
- )}
- Zingo PC v1.0.4
+
+ 
+ {readOnly && (
+
+
+ );
+}
+
+export default Logo;
\ No newline at end of file
diff --git a/src/components/logo/index.ts b/src/components/logo/index.ts
new file mode 100644
index 00000000..586b1e73
--- /dev/null
+++ b/src/components/logo/index.ts
@@ -0,0 +1,3 @@
+import Logo from "./Logo";
+
+export { Logo };
\ No newline at end of file
diff --git a/src/components/serverselectmodal/ServerSelectModal.tsx b/src/components/serverselectmodal/ServerSelectModal.tsx
index 998f0110..6d895255 100644
--- a/src/components/serverselectmodal/ServerSelectModal.tsx
+++ b/src/components/serverselectmodal/ServerSelectModal.tsx
@@ -3,7 +3,7 @@ import React, { useCallback, useContext, useEffect, useState } from "react";
import cstyles from "../common/Common.module.css";
import { ContextApp } from "../../context/ContextAppState";
import { Server } from "../appstate";
-import serverUris from "../../utils/serverUris";
+import serverUrisList from "../../utils/serverUrisList";
const { ipcRenderer } = window.require("electron");
type ModalProps = {
@@ -13,7 +13,7 @@ type ModalProps = {
export default function ServerSelectModal({ closeModal, openErrorModal }: ModalProps) {
const context = useContext(ContextApp);
- const { serverSelectState, serverUris: serverUrisContext } = context;
+ const { serverSelectState, serverUris } = context;
const { modalIsOpen } = serverSelectState;
const [selectedServer, setSelectedServer] = useState
-
Zingo PC v1.0.4
-
-
- {readOnly && (
-
+
diff --git a/src/root/Routes.tsx b/src/root/Routes.tsx
index 9fca0656..f611def9 100644
--- a/src/root/Routes.tsx
+++ b/src/root/Routes.tsx
@@ -41,8 +41,6 @@ import PasswordModal from "../components/passwordmodal/PasswordModal";
import ServerSelectModal from "../components/serverselectmodal/ServerSelectModal";
import { ContextAppProvider, defaultAppState } from "../context/ContextAppState";
-import Logo from "../assets/img/logobig.png";
-
type Props = {};
class Routes extends React.Component {
@@ -496,11 +494,20 @@ class Routes extends React.Component {
return result;
}
- navigateToLoadingScreen = () => {
- this.props.history.push({
- pathname: routes.LOADING,
+ navigateToDashboard = () => {
+ this.props.history.replace({
+ pathname: routes.DASHBOARD,
+ state: {},
+ });
+ };
+
+ navigateToLoadingScreen = (currentStatusIsError: boolean, currentStatus: string, serverUris: Server[]) => {
+ this.props.history.replace({
+ pathname: routes.LOADING,
state: {
- serverUris: this.state.serverUris,
+ currentStatusIsError,
+ currentStatus,
+ serverUris,
},
});
};
@@ -525,7 +532,7 @@ class Routes extends React.Component {
/>
- {this.props.location.pathname !== "/" && (
+ {this.props.location.pathname !== "/" && !this.props.location.pathname.includes("zingo") && (
{
openPassword={this.openPassword}
clearTimers={this.clearTimers}
updateWalletSettings={this.updateWalletSettings}
- logo={Logo}
+ navigateToLoadingScreen={this.navigateToLoadingScreen}
{...standardProps}
/>
@@ -620,9 +627,9 @@ class Routes extends React.Component {
setRescanning={this.setRescanning}
setInfo={this.setInfo}
openServerSelectModal={this.openServerSelectModal}
- logo={Logo}
setReadOnly={this.setReadOnly}
setServerUris={this.setServerUris}
+ navigateToDashboard={this.navigateToDashboard}
/>
)}
/>
diff --git a/src/rpc/rpc.ts b/src/rpc/rpc.ts
index 77204758..1bf22104 100644
--- a/src/rpc/rpc.ts
+++ b/src/rpc/rpc.ts
@@ -66,7 +66,7 @@ export default class RPC {
// trying to sync
this.refresh(false);
// I need to save the wallet every 30 seconds Just in case.
- RPC.doSave();
+ //RPC.doSave();
// I need to fetch the ZEC price in USD.
this.getZecPrice();
}, 30 * 1000); // 30 sec
@@ -82,7 +82,7 @@ export default class RPC {
// Immediately call the refresh after configure to update the UI
this.refresh(true);
this.updateData();
- RPC.doSave();
+ //RPC.doSave();
}
clearTimers() {
@@ -118,10 +118,11 @@ export default class RPC {
return syncstr;
}
- static async doSave() {
- const savestr: string = await native.zingolib_execute_async("save", "");
- console.log(`Save status: ${savestr}`);
- }
+ // deprecated in zingolib
+ //static async doSave() {
+ // const savestr: string = await native.zingolib_execute_async("save", "");
+ // console.log(`Save status: ${savestr}`);
+ //}
static deinitialize() {
const str: string = native.zingolib_deinitialize();
@@ -235,7 +236,7 @@ export default class RPC {
this.lastBlockHeight = latestBlockHeight;
// Save the wallet
- RPC.doSave();
+ //RPC.doSave();
// All done
console.log(`Finished (blocks) full refresh at server: ${latestBlockHeight} & wallet: ${walletHeight}`);
@@ -260,7 +261,7 @@ export default class RPC {
this.lastBlockHeight = latestBlockHeight;
// Save the wallet
- RPC.doSave();
+ //RPC.doSave();
// All done
console.log(`Finished (in_progress) full refresh at ${latestBlockHeight} & wallet: ${walletHeight}`);
@@ -400,7 +401,7 @@ export default class RPC {
static async setWalletSettingOption(name: string, value: string): Promise {
const r: string = await native.zingolib_execute_async("setoption", `${name}=${value}`);
- RPC.doSave();
+ //RPC.doSave();
return r;
}
@@ -1083,7 +1084,7 @@ export default class RPC {
this.fetchInfo();
// And save the wallet
- RPC.doSave();
+ //RPC.doSave();
return resultJSON.result === "success";
}
@@ -1096,7 +1097,7 @@ export default class RPC {
this.fetchInfo();
// And save the wallet
- RPC.doSave();
+ //RPC.doSave();
return resultJSON.result === "success";
}
diff --git a/src/utils/serverUris.ts b/src/utils/serverUrisList.ts
similarity index 96%
rename from src/utils/serverUris.ts
rename to src/utils/serverUrisList.ts
index 3983d31d..b48baf13 100644
--- a/src/utils/serverUris.ts
+++ b/src/utils/serverUrisList.ts
@@ -1,6 +1,6 @@
import { Server } from "../components/appstate";
-const serverUris = (): Server[] => {
+const serverUrisList = (): Server[] => {
return [
{
uri: 'https://mainnet.lightwalletd.com:9067',
@@ -89,4 +89,4 @@ const serverUris = (): Server[] => {
];
};
-export default serverUris;
+export default serverUrisList;