From c5cf2a6d89a5f64eda81553df783a8bf36598809 Mon Sep 17 00:00:00 2001 From: tommyjk21 <92386732+tommyjk21@users.noreply.github.com> Date: Fri, 17 Jun 2022 18:25:30 -0400 Subject: [PATCH] feat: upgrade tauri, add some messages (#116) --- .github/workflows/create_release.yaml | 2 +- .github/workflows/release.yml | 8 +++++++- Cargo.toml | 2 +- ui/package.json | 2 +- ui/public/about.html | 2 +- ui/src-tauri/Cargo.lock | 20 ++++++++++---------- ui/src-tauri/Cargo.toml | 2 +- ui/src-tauri/tauri.conf.json | 2 +- ui/src/pages/CreateAccount.js | 2 +- ui/src/pages/SignIn.js | 8 ++++++-- www/src/App.tsx | 6 +++--- 11 files changed, 33 insertions(+), 23 deletions(-) diff --git a/.github/workflows/create_release.yaml b/.github/workflows/create_release.yaml index 7b143102..2ce4de26 100644 --- a/.github/workflows/create_release.yaml +++ b/.github/workflows/create_release.yaml @@ -7,7 +7,7 @@ jobs: release-on-push: runs-on: ubuntu-latest env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.ACTION_TRIGGER }} steps: - uses: rymndhng/release-on-push-action@v0.25.0 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd3f9d5f..e46c463e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 diff --git a/Cargo.toml b/Cargo.toml index cba69d6a..91e28f91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "manta-signer" edition = "2021" -version = "0.7.0" +version = "0.7.1" authors = ["Manta Network "] readme = "README.md" license-file = "LICENSE" diff --git a/ui/package.json b/ui/package.json index e981f306..56eaa418 100644 --- a/ui/package.json +++ b/ui/package.json @@ -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", diff --git a/ui/public/about.html b/ui/public/about.html index 4a43a473..82c420ed 100644 --- a/ui/public/about.html +++ b/ui/public/about.html @@ -38,7 +38,7 @@

Manta Signer

-

Version 0.7.0

+

Version 0.7.1

Copyright © 2019-2022 Manta Network

manta-network/manta-signer diff --git a/ui/src-tauri/Cargo.lock b/ui/src-tauri/Cargo.lock index 7d908e8f..dec08d49 100644 --- a/ui/src-tauri/Cargo.lock +++ b/ui/src-tauri/Cargo.lock @@ -2477,8 +2477,8 @@ dependencies = [ [[package]] name = "manta-accounting" -version = "0.4.0" -source = "git+https://github.com/manta-network/manta-rs?branch=feat/simplify-sync#ad20b843c2092dd6fa0744c286526d0a5d44dc3b" +version = "0.5.0" +source = "git+https://github.com/manta-network/manta-rs#c8f9a3f07e185206d8c2f6e0f59dd84de0681f36" dependencies = [ "bitflags", "cocoon", @@ -2491,8 +2491,8 @@ dependencies = [ [[package]] name = "manta-crypto" -version = "0.4.0" -source = "git+https://github.com/manta-network/manta-rs?branch=feat/simplify-sync#ad20b843c2092dd6fa0744c286526d0a5d44dc3b" +version = "0.5.0" +source = "git+https://github.com/manta-network/manta-rs#c8f9a3f07e185206d8c2f6e0f59dd84de0681f36" dependencies = [ "derivative", "manta-util", @@ -2501,8 +2501,8 @@ dependencies = [ [[package]] name = "manta-pay" -version = "0.4.0" -source = "git+https://github.com/manta-network/manta-rs?branch=feat/simplify-sync#ad20b843c2092dd6fa0744c286526d0a5d44dc3b" +version = "0.5.0" +source = "git+https://github.com/manta-network/manta-rs#c8f9a3f07e185206d8c2f6e0f59dd84de0681f36" dependencies = [ "aes-gcm 0.9.4", "ark-bls12-381", @@ -2539,7 +2539,7 @@ dependencies = [ [[package]] name = "manta-signer" -version = "0.6.0" +version = "0.7.1" dependencies = [ "argon2", "async-std", @@ -2564,7 +2564,7 @@ dependencies = [ [[package]] name = "manta-signer-ui" -version = "0.6.0" +version = "0.7.1" dependencies = [ "manta-signer", "tauri", @@ -2573,8 +2573,8 @@ dependencies = [ [[package]] name = "manta-util" -version = "0.4.0" -source = "git+https://github.com/manta-network/manta-rs?branch=feat/simplify-sync#ad20b843c2092dd6fa0744c286526d0a5d44dc3b" +version = "0.5.0" +source = "git+https://github.com/manta-network/manta-rs#c8f9a3f07e185206d8c2f6e0f59dd84de0681f36" dependencies = [ "serde", "serde_with", diff --git a/ui/src-tauri/Cargo.toml b/ui/src-tauri/Cargo.toml index 19a1be78..64ae3874 100644 --- a/ui/src-tauri/Cargo.toml +++ b/ui/src-tauri/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "manta-signer-ui" edition = "2018" -version = "0.7.0" +version = "0.7.1" authors = ["Manta Network "] readme = "README.md" license-file = "LICENSE" diff --git a/ui/src-tauri/tauri.conf.json b/ui/src-tauri/tauri.conf.json index f2c16a7b..9d795b5e 100644 --- a/ui/src-tauri/tauri.conf.json +++ b/ui/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "package": { "productName": "manta-signer", - "version": "0.7.0" + "version": "0.7.1" }, "build": { "distDir": "../build", diff --git a/ui/src/pages/CreateAccount.js b/ui/src/pages/CreateAccount.js index 9930cec8..852735fe 100644 --- a/ui/src/pages/CreateAccount.js +++ b/ui/src/pages/CreateAccount.js @@ -39,7 +39,7 @@ const CreateAccount = ({ recoveryPhrase, sendPassword, endInitialConnectionPhase - {password.length > 0 && !isValid(password) && (<>
)} + {password.length > 0 && !isValid(password) && (<>
)} )} {createdAccount && ( diff --git a/ui/src/pages/SignIn.js b/ui/src/pages/SignIn.js index d01f3a6d..d8e26e75 100644 --- a/ui/src/pages/SignIn.js +++ b/ui/src/pages/SignIn.js @@ -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); @@ -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) } @@ -34,6 +37,7 @@ const SignIn = ({ sendPassword, endInitialConnectionPhase }) => { error={passwordInvalid} /> + { badPasswordTried && <>
} diff --git a/www/src/App.tsx b/www/src/App.tsx index 2aceb5f4..b1c6f534 100755 --- a/www/src/App.tsx +++ b/www/src/App.tsx @@ -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'