diff --git a/package.json b/package.json index 04a7ac7c8..1d815f604 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "lume", "description": "the communication app", "private": true, - "version": "1.2.5", + "version": "1.2.6", "scripts": { "dev": "vite", "build": "vite build", diff --git a/public/wallpapers/1.png b/public/wallpapers/1.png deleted file mode 100644 index f401bc6c8..000000000 Binary files a/public/wallpapers/1.png and /dev/null differ diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 29352b746..5da78a662 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2638,7 +2638,7 @@ dependencies = [ [[package]] name = "lume" -version = "1.2.5" +version = "1.2.6" dependencies = [ "cocoa 0.25.0", "objc", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 096a0f389..4ea6cee26 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lume" -version = "1.2.5" +version = "1.2.6" description = "the communication app" authors = ["Ren Amamiya"] license = "GPL-3.0" @@ -11,12 +11,13 @@ rust-version = "1.66" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "1.4", features = [] } +tauri-build = { version = "1.4.1", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.4", features = [ "macos-private-api", +tauri = { version = "1.5", features = [ + "macos-private-api", "window-close", "window-print", "window-create", diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index ef748b85b..87952bb20 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -112,8 +112,6 @@ fn main() { apply_vibrancy(&window, NSVisualEffectMaterial::HudWindow, None, None) .expect("Unsupported platform! 'apply_vibrancy' is only supported on macOS"); - #[cfg(target_os = "macos")] - window.set_transparent_titlebar(true); #[cfg(target_os = "macos")] window.position_traffic_lights(16.0, 25.0); diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 18c5a849a..dbca863f2 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -9,7 +9,7 @@ }, "package": { "productName": "Lume", - "version": "1.2.5" + "version": "1.2.6" }, "tauri": { "allowlist": { diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json index 2408a078f..41eb03d08 100644 --- a/src-tauri/tauri.linux.conf.json +++ b/src-tauri/tauri.linux.conf.json @@ -3,8 +3,8 @@ "tauri": { "windows": [ { - "width": 400, - "height": 500, + "width": 300, + "height": 300, "decorations": false, "title": "Lume", "center": true, diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index 1386b5240..1ca3cda69 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -4,9 +4,9 @@ "macOSPrivateApi": true, "windows": [ { - "width": 400, - "height": 500, - "decorations": true, + "width": 300, + "height": 300, + "decorations": false, "title": "Lume", "titleBarStyle": "Overlay", "hiddenTitle": true, diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index 2408a078f..41eb03d08 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -3,8 +3,8 @@ "tauri": { "windows": [ { - "width": 400, - "height": 500, + "width": 300, + "height": 300, "decorations": false, "title": "Lume", "center": true, diff --git a/src/app/auth/create/step-2.tsx b/src/app/auth/create/step-2.tsx index 56f485bb6..84e5dfab3 100644 --- a/src/app/auth/create/step-2.tsx +++ b/src/app/auth/create/step-2.tsx @@ -66,7 +66,7 @@ export function CreateStep2Screen() { if (!db.secureDB) db.secureDB = stronghold; // save privkey to secure storage - await db.secureSave(pubkey, privkey, pubkey); + await db.secureSave(pubkey, privkey); // redirect to next step navigate('/auth/create/step-3', { replace: true }); diff --git a/src/app/auth/import/step-2.tsx b/src/app/auth/import/step-2.tsx index e2975e8d6..42da6e815 100644 --- a/src/app/auth/import/step-2.tsx +++ b/src/app/auth/import/step-2.tsx @@ -66,7 +66,7 @@ export function ImportStep2Screen() { if (!db.secureDB) db.secureDB = stronghold; // save privkey to secure storage - await db.secureSave(pubkey, privkey, pubkey); + await db.secureSave(pubkey, privkey); // redirect to next step navigate('/auth/import/step-3', { replace: true }); diff --git a/src/app/splash.tsx b/src/app/splash.tsx index 5715fc5f9..6fe409636 100644 --- a/src/app/splash.tsx +++ b/src/app/splash.tsx @@ -1,6 +1,6 @@ import { message } from '@tauri-apps/api/dialog'; import { invoke } from '@tauri-apps/api/tauri'; -import { useEffect, useState } from 'react'; +import { useEffect } from 'react'; import { useNDK } from '@libs/ndk/provider'; import { useStorage } from '@libs/storage/provider'; @@ -14,12 +14,6 @@ export function SplashScreen() { const { ndk } = useNDK(); const { fetchUserData } = useNostr(); - const [isLoading, setIsLoading] = useState(true); - - const skip = async () => { - await invoke('close_splashscreen'); - }; - useEffect(() => { async function syncUserData() { if (!db.account) { @@ -40,11 +34,11 @@ export function SplashScreen() { await invoke('close_splashscreen'); } } catch (e) { - setIsLoading(false); await message(e, { title: 'An unexpected error has occurred', type: 'error', }); + await invoke('close_splashscreen'); } } } @@ -59,34 +53,11 @@ export function SplashScreen() {
-
+
- {isLoading ? ( -
-

- {!ndk ? 'Connecting to relay...' : 'Syncing user data...'} -

- {ndk ? ( -

- Ensure all your data is sync across all Nostr clients. It may take a few - seconds, please don't close app. -

- ) : null} -
- ) : ( -
-

- An unexpected error has occurred -

- -
- )} +

+ {!ndk ? 'Connecting...' : 'Syncing...'} +