Skip to content

Commit

Permalink
Merge pull request #115 from juanky201271/dev_new_version_zingo_pc_1_0_3
Browse files Browse the repository at this point in the history
New Zingo PC version 1.0.3
  • Loading branch information
juanky201271 authored Sep 29, 2023
2 parents 9c319b6 + cebd8c5 commit 51a0e59
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 37 deletions.
2 changes: 1 addition & 1 deletion bin/printversion.ps1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
echo "VERSION=1.0.2" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
echo "VERSION=1.0.3" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
2 changes: 1 addition & 1 deletion bin/printversion.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
VERSION="1.0.2"
VERSION="1.0.3"
echo "VERSION=$VERSION" >> $GITHUB_ENV
26 changes: 13 additions & 13 deletions native/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 1 addition & 9 deletions native/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,20 +108,12 @@ fn zingolib_initialize_new(mut cx: FunctionContext) -> JsResult<JsString> {
// Initialize logging
let _ = LightClient::init_logging();

let seed = match lightclient.do_seed_phrase_sync() {
Ok(s) => s.dump(),
Err(e) => {
return format!("Error: {}", e);
}
};

let lc = Arc::new(lightclient);
LightClient::start_mempool_monitor(lc.clone());

*LIGHTCLIENT.write().unwrap() = Some(lc);

// Return the wallet's seed
seed
format!("OK")
};
Ok(cx.string(resp()))
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "zingo-pc",
"productName": "Zingo PC",
"version": "1.0.2",
"version": "1.0.3",
"private": true,
"description": "Zingo PC",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function App() {
<p>Built using CRA electron-builder-typescript Template.</p>
{/*<p>{addon.zingolib_say_hello("Me")}</p>*/}
<img src={logo} className="App-logo" alt="logo" />
<p>Zingo PC v1.0.2</p>
<p>Zingo PC v1.0.3</p>
<p>
Edit <code>public/electron.js</code> or <code>src/App.js</code> and save to reload.
</p>
Expand Down
18 changes: 9 additions & 9 deletions src/components/loadingscreen/LoadingScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ class LoadingScreen extends Component<LoadingScreenProps & RouteComponentProps,
<br />
<br />
<br />
Please wait...
Please wait...
<br />
This could take several minutes or hours
</div>
Expand All @@ -384,16 +384,16 @@ class LoadingScreen extends Component<LoadingScreenProps & RouteComponentProps,
}, 2 * 1000);
};

createNewWallet = () => {
const { url, chain } = this.state;
createNewWallet = async () => {
const { url, chain } = this.state;
const result: string = native.zingolib_initialize_new(url, chain);

if (result.toLowerCase().startsWith("error")) {
console.log(result);
this.setState({ walletScreen: 2, newWalletError: result });
} else {
const r = JSON.parse(result);
this.setState({ walletScreen: 2, seed: r.seed });
const seed: string = await RPC.fetchSeed();
this.setState({ walletScreen: 2, seed });
}
};

Expand Down Expand Up @@ -465,7 +465,7 @@ class LoadingScreen extends Component<LoadingScreenProps & RouteComponentProps,
{walletScreen === 0 && (
<div>
<div style={{ marginTop: "100px", marginBottom: "20px" }}>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.2</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.3</div>
<img src={Logo} width="200px;" alt="Logo" style={{ borderRadius: 20 }} />
</div>
<div>{currentStatus}</div>
Expand Down Expand Up @@ -542,7 +542,7 @@ class LoadingScreen extends Component<LoadingScreenProps & RouteComponentProps,
{walletScreen === 1 && (
<div>
<div style={{ marginTop: "20px", marginBottom: "20px" }}>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.2</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.3</div>
<img src={Logo} width="200px;" alt="Logo" style={{ borderRadius: 20 }} />
</div>
<div className={[cstyles.well, styles.newwalletcontainer].join(" ")}>
Expand Down Expand Up @@ -603,7 +603,7 @@ class LoadingScreen extends Component<LoadingScreenProps & RouteComponentProps,
{walletScreen === 2 && (
<div>
<div style={{ marginTop: "20px", marginBottom: "20px" }}>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.2</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.3</div>
<img src={Logo} width="200px;" alt="Logo" style={{ borderRadius: 20 }} />
</div>
<div className={[cstyles.well, styles.newwalletcontainer].join(" ")}>
Expand Down Expand Up @@ -651,7 +651,7 @@ class LoadingScreen extends Component<LoadingScreenProps & RouteComponentProps,
{walletScreen === 3 && (
<div>
<div style={{ marginTop: "20px", marginBottom: "20px" }}>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.2</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.3</div>
<img src={Logo} width="200px;" alt="Logo" style={{ borderRadius: 20 }} />
</div>
<div className={[cstyles.well, styles.newwalletcontainer].join(" ")}>
Expand Down
4 changes: 2 additions & 2 deletions src/components/sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class Sidebar extends PureComponent<SidebarProps & RouteComponentProps, SidebarS
openErrorModal(
"Zingo PC",
<div className={cstyles.verticalflex}>
<div className={cstyles.margintoplarge}>Zingo PC v1.0.2</div>
<div className={cstyles.margintoplarge}>Zingo PC v1.0.3</div>
<div className={cstyles.margintoplarge}>Built with Electron. Copyright (c) 2023, ZingoLabs.</div>
<div className={cstyles.margintoplarge}>
The MIT License (MIT) Copyright (c) 2023 ZingoLabs
Expand Down Expand Up @@ -557,7 +557,7 @@ class Sidebar extends PureComponent<SidebarProps & RouteComponentProps, SidebarS
/>

<div className={[cstyles.center, styles.sidebarlogobg].join(" ")}>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.2</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.3</div>
<img src={Logo} width="70" alt="logo" style={{ borderRadius: 5 }} />
</div>

Expand Down

0 comments on commit 51a0e59

Please sign in to comment.