Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade tauri, add some messages #116

Merged
merged 6 commits into from
Jun 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/create_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
release-on-push:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.ACTION_TRIGGER }}
bhgomes marked this conversation as resolved.
Show resolved Hide resolved
steps:
- uses: rymndhng/[email protected]
with:
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ jobs:
asset_name: manta-signer-linux-amd64
version_suffix: 1
target: linux
- os: ubuntu-22.04
os_type: ubuntu
artifact_name: manta-signer
asset_name: manta-signer-linux-amd64
version_suffix: 2
target: linux
- os: windows-2019
os_type: windows
artifact_name: manta-signer
Expand Down Expand Up @@ -75,7 +81,7 @@ jobs:
run: cd ui/src-tauri; sed -i /icns/d tauri.conf.json
if: matrix.os_type == 'ubuntu'
- name: Ubuntu Build Dependencies
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
run: sudo apt-get update && sudo apt-get -y install libayatana-appindicator3-dev libwebkit2gtk-4.0-dev libgtk-3-dev patchelf librsvg2-dev
if: matrix.os_type == 'ubuntu'
- name: Suffix version
id: suffixed
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "manta-signer"
edition = "2021"
version = "0.7.0"
version = "0.7.1"
authors = ["Manta Network <[email protected]>"]
readme = "README.md"
license-file = "LICENSE"
Expand Down
2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "manta-signer-ui",
"version": "0.7.0",
"version": "0.7.1",
"private": true,
"dependencies": {
"@tauri-apps/api": "^1.0.0-rc.1",
Expand Down
2 changes: 1 addition & 1 deletion ui/public/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<main>
<img src="Square89x89Logo.png" />
<h3>Manta Signer</h3>
<p>Version 0.7.0</p>
<p>Version 0.7.1</p>
<p>Copyright © 2019-2022 Manta Network</p>
<p>
<a href="https://github.com/manta-network/manta-signer">manta-network/manta-signer</a>
Expand Down
20 changes: 10 additions & 10 deletions ui/src-tauri/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 ui/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "manta-signer-ui"
edition = "2018"
version = "0.7.0"
version = "0.7.1"
authors = ["Manta Network <[email protected]>"]
readme = "README.md"
license-file = "LICENSE"
Expand Down
2 changes: 1 addition & 1 deletion ui/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"package": {
"productName": "manta-signer",
"version": "0.7.0"
"version": "0.7.1"
},
"build": {
"distDir": "../build",
Expand Down
2 changes: 1 addition & 1 deletion ui/src/pages/CreateAccount.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const CreateAccount = ({ recoveryPhrase, sendPassword, endInitialConnectionPhase
<Button className="button" onClick={onClickCreateAccount}>
Create Account
</Button>
{password.length > 0 && !isValid(password) && (<><br/><Label basic color='red' pointing> `Please enter a minimum of ${MIN_PASSWORD_LENGTH} characters.`</Label></>)}
{password.length > 0 && !isValid(password) && (<><br/><Label basic color='red' pointing>Please enter a minimum of {MIN_PASSWORD_LENGTH} characters.</Label></>)}
</>
)}
{createdAccount && (
Expand Down
8 changes: 6 additions & 2 deletions ui/src/pages/SignIn.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React, { useState } from 'react';
import { Button, Input, Header, Form } from 'semantic-ui-react';
import { Button, Input, Header, Form, Label } from 'semantic-ui-react';

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

const onClickSignIn = async () => {
const shouldRetry = await sendPassword(password);
Expand All @@ -13,11 +14,13 @@ const SignIn = ({ sendPassword, endInitialConnectionPhase }) => {
await endInitialConnectionPhase();
} else {
console.log("RETRY!");
setPasswordInvalid(true)
setPasswordInvalid(true);
setBadPasswordTried(true);
}
};

const onChangePassword = password => {
setBadPasswordTried(false);
setPassword(password)
setPasswordInvalid(false)
}
Expand All @@ -34,6 +37,7 @@ const SignIn = ({ sendPassword, endInitialConnectionPhase }) => {
error={passwordInvalid}
/>
</Form.Field>
{ badPasswordTried && <><Label basic color='red' pointing>Wrong Password</Label><br/></> }
<Button className="button" onClick={onClickSignIn}>
Sign in
</Button>
Expand Down
6 changes: 3 additions & 3 deletions www/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ function App() {
className='px-6 py-4 text-white text-2xl bg-button rounded-full mt-12 cursor-pointer'
href={
os === 'Mac'
? 'https://github.com/Manta-Network/manta-signer/releases/download/0.7.0/manta-signer-macos-latest_0.7.0-103_x64.dmg'
? 'https://github.com/Manta-Network/manta-signer/releases/download/0.7.1/manta-signer-macos-latest_0.7.1-103_x64.dmg'
: os === 'Windows'
? 'https://github.com/Manta-Network/manta-signer/releases/download/0.7.0/manta-signer-windows-2019_0.7.0_x64.msi'
: 'https://github.com/Manta-Network/manta-signer/releases/download/0.7.0/manta-signer-ubuntu-18.04_0.7.0_amd64.deb'
? 'https://github.com/Manta-Network/manta-signer/releases/download/0.7.1/manta-signer-windows-2019_0.7.1_x64.msi'
: 'https://github.com/Manta-Network/manta-signer/releases/download/0.7.1/manta-signer-ubuntu-18.04_0.7.1_amd64.deb'
}
title={
os === 'Mac'
Expand Down