Merge branch 'master' into production

This commit is contained in:
Martti Malmi 2023-05-08 12:23:13 +03:00
commit 2b219db31f
3 changed files with 12 additions and 9 deletions

14
src-tauri/Cargo.lock generated
View File

@ -2326,9 +2326,9 @@ dependencies = [
[[package]]
name = "tauri"
version = "1.2.4"
version = "1.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe7e0f1d535e7cbbbab43c82be4fc992b84f9156c16c160955617e0260ebc449"
checksum = "e3a1fe72365a6d860fddf3403934649a5157b2bbb6f0b50dd3a8858cd1a22412"
dependencies = [
"anyhow",
"cocoa",
@ -2426,9 +2426,9 @@ dependencies = [
[[package]]
name = "tauri-runtime"
version = "0.12.1"
version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c507d954d08ac8705d235bc70ec6975b9054fb95ff7823af72dbb04186596f3b"
checksum = "dc36898ad4acb6c381878acf903c320a36cf29b68b74f6e791d6045b6557128c"
dependencies = [
"gtk",
"http",
@ -2439,6 +2439,7 @@ dependencies = [
"serde_json",
"tauri-utils",
"thiserror",
"url",
"uuid 1.3.0",
"webview2-com",
"windows 0.39.0",
@ -2446,9 +2447,9 @@ dependencies = [
[[package]]
name = "tauri-runtime-wry"
version = "0.12.2"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36b1c5764a41a13176a4599b5b7bd0881bea7d94dfe45e1e755f789b98317e30"
checksum = "e2ebc22bc5566ba33310744fadd86709fa591ed163491b165855474523ac1aab"
dependencies = [
"cocoa",
"gtk",
@ -2457,6 +2458,7 @@ dependencies = [
"raw-window-handle",
"tauri-runtime",
"tauri-utils",
"url",
"uuid 1.3.0",
"webkit2gtk",
"webview2-com",

View File

@ -1,6 +1,6 @@
[package]
name = "app"
version = "0.1.1"
version = "0.1.2"
description = "A Tauri App"
authors = ["you"]
license = ""
@ -17,7 +17,7 @@ tauri-build = { version = "1.2.1", features = [] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
tauri = { version = "1.2.4", features = [] }
tauri = { version = "1.2.5", features = ["updater"] }
[features]
# by default Tauri runs in production mode

View File

@ -131,7 +131,8 @@ export default function SendSats(props: ZapProps) {
: false;
useEffect(() => {
localState.get('defaultZapAmount').on((value) => {
localState.get('defaultZapAmount').on((v) => {
const value = parseInt(v);
setAmount(value);
setCustomAmount(value);
console.log('defaultZapAmount', value);