Merge branch 'main' into fix/orphan-chain-false-positive

tari-project · Nov 20, 2024 · a7a8189 · a7a8189
2 parents a9cb146 + 19998b5
commit a7a8189
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src-tauri/src/app_config.rs b/src-tauri/src/app_config.rs
@@ -50,7 +50,7 @@ pub struct AppConfigFromFile {
     airdrop_ui_enabled: bool,
     #[serde(default = "default_true")]
     use_tor: bool,
-    #[serde(default = "default_false")]
+    #[serde(default = "default_true")]
     paper_wallet_enabled: bool,
     #[serde(default = "default_false")]
     reset_earnings: bool,
@@ -99,7 +99,7 @@ impl Default for AppConfigFromFile {
             custom_max_cpu_usage: None,
             custom_max_gpu_usage: None,
             airdrop_ui_enabled: true,
-            paper_wallet_enabled: false,
+            paper_wallet_enabled: true,
             use_tor: true,
             eco_mode_cpu_options: Vec::new(),
             ludicrous_mode_cpu_options: Vec::new(),
@@ -232,7 +232,7 @@ impl AppConfig {
             use_tor: true,
             custom_max_cpu_usage: None,
             custom_max_gpu_usage: None,
-            paper_wallet_enabled: false,
+            paper_wallet_enabled: true,
             reset_earnings: false,
             eco_mode_cpu_options: Vec::new(),
             ludicrous_mode_cpu_options: Vec::new(),
@@ -346,6 +346,11 @@ impl AppConfig {
             self.visual_mode = true;
             self.config_version = 12;
         }
+
+        if self.config_version <= 12 {
+            self.paper_wallet_enabled = true;
+            self.config_version = 13;
+        }
     }
 
     pub fn mmproxy_monero_nodes(&self) -> &Vec<String> {
@@ -662,7 +667,7 @@ impl AppConfig {
 }
 
 fn default_version() -> u32 {
-    11
+    13
 }
 
 fn default_custom_max_cpu_usage() -> Option<u32> {

diff --git a/src/store/useAppConfigStore.ts b/src/store/useAppConfigStore.ts
@@ -52,7 +52,7 @@ const initialState: State = {
     cpu_mining_enabled: true,
     sharing_enabled: true,
     airdrop_ui_enabled: false,
-    paper_wallet_enabled: false,
+    paper_wallet_enabled: true,
     custom_power_levels_enabled: true,
     use_tor: true,
     auto_update: false,