Minor fixes

.gitignore

@@ -33,7 +33,7 @@ storybook-static
 
 # cargo
 /target/
-/.cargo/
+.cargo/
 
 .direnv/
 result*

src-tauri/Cargo.toml

@@ -19,7 +19,7 @@ tauri-build = { version = "2.0.0-beta.17", default-features = false , features =
 
 [dependencies]
 tauri = { version = "2.0.0-beta.22", features = [] }
-tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/tauri-plugin-holochain", branch = "develop" }
+tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/tauri-plugin-holochain", branch = "main" }
 holochain_types = { version = "0.3.1-rc" }
 lair_keystore = { version = "0.4.0" }
 holochain_client = { version = "0.5.0-rc" }

src-tauri/src/lib.rs

@@ -1,5 +1,6 @@
 use holochain_types::prelude::*;
 use lair_keystore::dependencies::sodoken::{BufRead, BufWrite};
+use tauri_plugin_log::{Target, TargetKind};
 use std::{collections::HashMap, path::PathBuf};
 use tauri::Manager;
 use tauri_plugin_holochain::{HolochainExt, HolochainPluginConfig};
@@ -29,19 +30,16 @@ pub fn vec_to_locked(mut pass_tmp: Vec<u8>) -> std::io::Result<BufRead> {
     }
 }
 
+
 fn internal_ip() -> String {
-    if cfg!(mobile) {
-        std::option_env!("INTERNAL_IP")
-            .expect("Environment variable INTERNAL_IP was not set")
-            .to_string()
-    } else {
-        String::from("localhost")
-    }
+    std::option_env!("INTERNAL_IP")
+        .expect("Environment variable INTERNAL_IP was not set")
+        .to_string()
 }
 
 fn bootstrap_url() -> Url2 {
     // Resolved at compile time to be able to point to local services
-    if cfg!(debug_assertions) {
+    if tauri::is_dev() {
         let internal_ip = internal_ip();
         let port = std::option_env!("BOOTSTRAP_PORT")
             .expect("Environment variable BOOTSTRAP_PORT was not set");
@@ -53,7 +51,7 @@ fn bootstrap_url() -> Url2 {
 
 fn signal_url() -> Url2 {
     // Resolved at compile time to be able to point to local services
-    if cfg!(debug_assertions) {
+    if tauri::is_dev() {
         let internal_ip = internal_ip();
         let signal_port =
             std::option_env!("SIGNAL_PORT").expect("Environment variable INTERNAL_IP was not set");
@@ -64,7 +62,7 @@ fn signal_url() -> Url2 {
 }
 
 fn holochain_dir() -> PathBuf {
-    if cfg!(debug_assertions) {
+    if tauri::is_dev() {
         let tmp_dir =
             tempdir::TempDir::new("plenty").expect("Could not create temporary directory");
 

src-tauri/tauri.conf.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "identifier": "studio.darksoil.plenty",
   "build": {
-    "beforeBuildCommand": "pnpm -F ui build && pnpm happ:build",
+    "beforeBuildCommand": "pnpm -F ui build && pnpm happ:build-debug",
     "devUrl": "http://localhost:1420",
     "frontendDist": "../ui/dist"
   },
@@ -15,6 +15,13 @@
   },
   "bundle": {
     "active": true,
-    "targets": "all"
+    "targets": "all",
+    "icon": [
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/[email protected]",
+      "icons/icon.icns",
+      "icons/icon.ico"
+    ]
   }
 }

ui/package.json

@@ -12,7 +12,7 @@
     "localize:build": "lit-localize build"
   },
   "dependencies": {
-    "@darksoil-studio/notifications": "github:darksoil-studio/notifications#25b4ad9691737a61ccd750b2ce7d0b177e4811c8&path:ui",
+    "@darksoil-studio/notifications": "github:darksoil-studio/notifications#ee1a910858d9235d6f9a68af9f72248f930c33cc&path:ui",
     "@holochain-open-dev/elements": "^0.300.0-rc",
     "@holochain-open-dev/file-storage": "github:holochain-open-dev/file-storage#7761b9e0057d14048a93a859bd6dc6170db24607&path:ui",
     "@holochain-open-dev/profiles": "github:holochain-open-dev/profiles#decbb755bfa4432d672a58783eb7d4985fcadcba&path:ui",