Skip to content

Commit

Permalink
Merge pull request #167 from juanky201271/dev_new_version_zingo_pc_1_0_4
Browse files Browse the repository at this point in the history
New Zingo PC version 1.0.4
  • Loading branch information
juanky201271 authored Nov 13, 2023
2 parents a7ce3d0 + c79a38b commit c58f47a
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 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.3" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
echo "VERSION=1.0.4" | 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.3"
VERSION="1.0.4"
echo "VERSION=$VERSION" >> $GITHUB_ENV
8 changes: 4 additions & 4 deletions native/Cargo.lock

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

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.3",
"version": "1.0.4",
"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.3</p>
<p>Zingo PC v1.0.4</p>
<p>
Edit <code>public/electron.js</code> or <code>src/App.js</code> and save to reload.
</p>
Expand Down
10 changes: 5 additions & 5 deletions src/components/loadingscreen/LoadingScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,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.3</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.4</div>
<img src={this.props.logo} width="100px;" alt="Logo" style={{ borderRadius: 20 }} />
</div>
<div>{currentStatus}</div>
Expand Down Expand Up @@ -655,7 +655,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.3</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.4</div>
<img src={this.props.logo} width="100px;" alt="Logo" style={{ borderRadius: 20 }} />
</div>
<div className={[cstyles.well, styles.newwalletcontainer].join(" ")}>
Expand Down Expand Up @@ -739,7 +739,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.3</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.4</div>
<img src={this.props.logo} width="100px;" alt="Logo" style={{ borderRadius: 20 }} />
</div>
<div className={[cstyles.well, styles.newwalletcontainer].join(" ")}>
Expand Down Expand Up @@ -787,7 +787,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.3</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.4</div>
<img src={this.props.logo} width="100px;" alt="Logo" style={{ borderRadius: 20 }} />
</div>
<div className={[cstyles.well, styles.newwalletcontainer].join(" ")}>
Expand Down Expand Up @@ -847,7 +847,7 @@ class LoadingScreen extends Component<LoadingScreenProps & RouteComponentProps,
{walletScreen === 4 && (
<div>
<div style={{ marginTop: "20px", marginBottom: "20px" }}>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.3</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v4</div>
<img src={this.props.logo} width="100px;" 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 @@ -83,7 +83,7 @@ class Sidebar extends PureComponent<SidebarProps & RouteComponentProps, SidebarS
openErrorModal(
"Zingo PC",
<div className={cstyles.verticalflex}>
<div className={cstyles.margintoplarge}>Zingo PC v1.0.3</div>
<div className={cstyles.margintoplarge}>Zingo PC v1.0.4</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 @@ -601,7 +601,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.3</div>
<div style={{ color: "#888888", fontWeight: "bold", marginBottom: 10 }}>Zingo PC v1.0.4</div>
<div>
<img src={this.props.logo} width="70" alt="logo" style={{ borderRadius: 5, marginRight: 10 }} />
{readOnly && (
Expand Down

0 comments on commit c58f47a

Please sign in to comment.