Merge branch 'main' into shanimal/feat_reward-history-ui

index.html

@@ -39,6 +39,8 @@
           time = performance.now() / 1000;
           window.addEventListener('resize', onResize);
 
+          glApp.properties.bgColor2 = '#E5E5E5';
+
           onResize();
           animate();
         }

package.json

@@ -1,7 +1,7 @@
 {
     "name": "tari-universe",
     "private": true,
-    "version": "0.5.6",
+    "version": "0.5.7",
     "type": "module",
     "scripts": {
         "dev": "vite dev --mode development",

src-tauri/Cargo.toml

@@ -3,7 +3,7 @@ name = "tari-universe"
 authors = ["The Tari Development Community"]
 description = "Tari Universe"
 repository = "https://github.com/tari-project/universe"
-version = "0.5.6"
+version = "0.5.7"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src-tauri/src/app_config.rs

@@ -39,7 +39,7 @@ pub struct AppConfigFromFile {
     should_always_use_system_language: bool,
     #[serde(default = "default_application_language")]
     application_language: String,
-    #[serde(default = "default_false")]
+    #[serde(default = "default_true")]
     airdrop_ui_enabled: bool,
 }
 
@@ -59,7 +59,7 @@ impl Default for AppConfigFromFile {
             has_system_language_been_proposed: false,
             should_always_use_system_language: false,
             application_language: default_application_language(),
-            airdrop_ui_enabled: false,
+            airdrop_ui_enabled: true,
         }
     }
 }
@@ -124,7 +124,7 @@ impl AppConfig {
             has_system_language_been_proposed: false,
             should_always_use_system_language: false,
             application_language: default_application_language(),
-            airdrop_ui_enabled: false,
+            airdrop_ui_enabled: true,
         }
     }
 
@@ -173,6 +173,10 @@ impl AppConfig {
             self.config_version = 7;
             self.p2pool_enabled = true;
         }
+        if self.config_version <= 7 {
+            self.config_version = 8;
+            self.airdrop_ui_enabled = true;
+        }
     }
 
     pub fn anon_id(&self) -> &str {
@@ -313,8 +317,6 @@ impl AppConfig {
             .clone()
             .ok_or_else(|| anyhow!("Config file not set"))?;
 
-        let default_config = AppConfigFromFile::default();
-
         let config = &AppConfigFromFile {
             version: self.config_version,
             mode: MiningMode::to_str(self.mode),
@@ -330,7 +332,6 @@ impl AppConfig {
             should_always_use_system_language: self.should_always_use_system_language,
             application_language: self.application_language.clone(),
             airdrop_ui_enabled: self.airdrop_ui_enabled,
-            ..default_config
         };
         let config = serde_json::to_string(config)?;
         debug!(target: LOG_TARGET, "Updating config file: {:?} {:?}", file, self.clone());

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
     },
     "package": {
         "productName": "Tari Universe (Alpha)",
-        "version": "0.5.6"
+        "version": "0.5.7"
     },
     "tauri": {
         "systemTray": {

src/components/elements/CircularProgress.tsx

@@ -2,8 +2,8 @@ import { m } from 'framer-motion';
 import styled from 'styled-components';
 
 const Wrapper = styled.div`
-    width: 100%;
-    height: 100%;
+    max-width: 100%;
+    max-height: 100%;
     display: flex;
     align-items: center;
     justify-content: center;

src/store/useWalletStore.ts

@@ -39,7 +39,7 @@ export const useWalletStore = create<WalletStoreState>()((set) => ({
                 ...tari_wallet_details.wallet_balance,
                 tari_address_base58: tari_wallet_details.tari_address_base58,
                 tari_address_emoji: tari_wallet_details.tari_address_emoji,
-                balance: newBalance,
+                balance: tari_wallet_details.wallet_balance ? newBalance : null,
             });
         } catch (error) {
             console.error('Could not get tari wallet details: ', error);