Skip to content

Commit c5cf2a6

Browse files
author
tommyjk21
authored
feat: upgrade tauri, add some messages (#116)
1 parent b644cb6 commit c5cf2a6

File tree

11 files changed

+33
-23
lines changed

11 files changed

+33
-23
lines changed

.github/workflows/create_release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
release-on-push:
88
runs-on: ubuntu-latest
99
env:
10-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10+
GITHUB_TOKEN: ${{ secrets.ACTION_TRIGGER }}
1111
steps:
1212
- uses: rymndhng/release-on-push-action@v0.25.0
1313
with:

.github/workflows/release.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ jobs:
3434
asset_name: manta-signer-linux-amd64
3535
version_suffix: 1
3636
target: linux
37+
- os: ubuntu-22.04
38+
os_type: ubuntu
39+
artifact_name: manta-signer
40+
asset_name: manta-signer-linux-amd64
41+
version_suffix: 2
42+
target: linux
3743
- os: windows-2019
3844
os_type: windows
3945
artifact_name: manta-signer
@@ -75,7 +81,7 @@ jobs:
7581
run: cd ui/src-tauri; sed -i /icns/d tauri.conf.json
7682
if: matrix.os_type == 'ubuntu'
7783
- name: Ubuntu Build Dependencies
78-
run: sudo apt-get update && sudo apt-get -y install libayatana-appindicator3-dev libwebkit2gtk-4.0-dev libgtk-3-dev libappindicator3-dev patchelf librsvg2-dev
84+
run: sudo apt-get update && sudo apt-get -y install libayatana-appindicator3-dev libwebkit2gtk-4.0-dev libgtk-3-dev patchelf librsvg2-dev
7985
if: matrix.os_type == 'ubuntu'
8086
- name: Suffix version
8187
id: suffixed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "manta-signer"
33
edition = "2021"
4-
version = "0.7.0"
4+
version = "0.7.1"
55
authors = ["Manta Network <contact@manta.network>"]
66
readme = "README.md"
77
license-file = "LICENSE"

ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "manta-signer-ui",
3-
"version": "0.7.0",
3+
"version": "0.7.1",
44
"private": true,
55
"dependencies": {
66
"@tauri-apps/api": "^1.0.0-rc.1",

ui/public/about.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<main>
3939
<img src="Square89x89Logo.png" />
4040
<h3>Manta Signer</h3>
41-
<p>Version 0.7.0</p>
41+
<p>Version 0.7.1</p>
4242
<p>Copyright © 2019-2022 Manta Network</p>
4343
<p>
4444
<a href="https://github.com/manta-network/manta-signer">manta-network/manta-signer</a>

ui/src-tauri/Cargo.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "manta-signer-ui"
33
edition = "2018"
4-
version = "0.7.0"
4+
version = "0.7.1"
55
authors = ["Manta Network <contact@manta.network>"]
66
readme = "README.md"
77
license-file = "LICENSE"

ui/src-tauri/tauri.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"package": {
33
"productName": "manta-signer",
4-
"version": "0.7.0"
4+
"version": "0.7.1"
55
},
66
"build": {
77
"distDir": "../build",

ui/src/pages/CreateAccount.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const CreateAccount = ({ recoveryPhrase, sendPassword, endInitialConnectionPhase
3939
<Button className="button" onClick={onClickCreateAccount}>
4040
Create Account
4141
</Button>
42-
{password.length > 0 && !isValid(password) && (<><br/><Label basic color='red' pointing> `Please enter a minimum of ${MIN_PASSWORD_LENGTH} characters.`</Label></>)}
42+
{password.length > 0 && !isValid(password) && (<><br/><Label basic color='red' pointing>Please enter a minimum of {MIN_PASSWORD_LENGTH} characters.</Label></>)}
4343
</>
4444
)}
4545
{createdAccount && (

ui/src/pages/SignIn.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import React, { useState } from 'react';
2-
import { Button, Input, Header, Form } from 'semantic-ui-react';
2+
import { Button, Input, Header, Form, Label } from 'semantic-ui-react';
33

44
const SignIn = ({ sendPassword, endInitialConnectionPhase }) => {
55
const [password, setPassword] = useState('');
66
const [passwordInvalid, setPasswordInvalid] = useState(null);
7+
const [badPasswordTried, setBadPasswordTried] = useState(false);
78

89
const onClickSignIn = async () => {
910
const shouldRetry = await sendPassword(password);
@@ -13,11 +14,13 @@ const SignIn = ({ sendPassword, endInitialConnectionPhase }) => {
1314
await endInitialConnectionPhase();
1415
} else {
1516
console.log("RETRY!");
16-
setPasswordInvalid(true)
17+
setPasswordInvalid(true);
18+
setBadPasswordTried(true);
1719
}
1820
};
1921

2022
const onChangePassword = password => {
23+
setBadPasswordTried(false);
2124
setPassword(password)
2225
setPasswordInvalid(false)
2326
}
@@ -34,6 +37,7 @@ const SignIn = ({ sendPassword, endInitialConnectionPhase }) => {
3437
error={passwordInvalid}
3538
/>
3639
</Form.Field>
40+
{ badPasswordTried && <><Label basic color='red' pointing>Wrong Password</Label><br/></> }
3741
<Button className="button" onClick={onClickSignIn}>
3842
Sign in
3943
</Button>

0 commit comments

Comments
 (0)