Merge pull request zingolabs#756 from juanky201271/dev_minor_fixes

A few random adjustments
juanky201271 · Nov 25, 2024 · b350cbf · b350cbf
2 parents 544bef3 + ae93b38
commit b350cbf
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -88,3 +88,6 @@ buck-out/
 # firebase
 /**/google-services.json
 /**/GoogleService-Info.plist
+
+# Binaries
+/rust/test_binaries/bins/
diff --git a/components/Header/Header.tsx b/components/Header/Header.tsx
@@ -673,7 +673,7 @@ const Header: React.FunctionComponent<HeaderProps> = ({
         </View>
       )}
 
-      {showShieldButton && !calculateDisableButtonToShield() && setComputingModalVisible && (
+      {showShieldButton && !calculateDisableButtonToShield() && setComputingModalVisible && valueTransfers !== null && (
         <View style={{ justifyContent: 'center', alignItems: 'center' }}>
           <FadeText style={{ fontSize: 8 }}>
             {(translate(`history.shield-legend-${calculatePoolsToShield()}`) as string) +

diff --git a/components/Send/components/Confirm.tsx b/components/Send/components/Confirm.tsx
@@ -325,8 +325,8 @@ const Confirm: React.FunctionComponent<ConfirmProps> = ({
           <CurrencyAmount amtZec={sendingTotal} price={zecPrice.zecPrice} currency={currency} privacy={false} />
         </View>
         <View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
-          <View style={{ marginHorizontal: 10 }}>
-            <FadeText style={{ marginTop: 10 }}>{translate('send.confirm-privacy-level') as string}</FadeText>
+          <View style={{ margin: 10 }}>
+            <FadeText>{translate('send.confirm-privacy-level') as string}</FadeText>
             <RegText>{privacyLevel}</RegText>
           </View>
           <View style={{ margin: 10 }}>

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/lib/src/lib.rs b/rust/lib/src/lib.rs
@@ -27,9 +27,15 @@ lazy_static! {
         Mutex::new(RefCell::new(None));
 }
 
-fn lock_client_return_seed(lightclient: LightClient) -> String {
+fn lock_client_return_seed(
+    lightclient: LightClient,
+    monitor_mempool: bool,
+) -> String {
     let lc = Arc::new(lightclient);
-    let _ = LightClient::start_mempool_monitor(lc.clone());
+
+    if monitor_mempool {
+        let _ = LightClient::start_mempool_monitor(lc.clone());
+    }
 
     LIGHTCLIENT.lock().unwrap().replace(Some(lc));
 
@@ -103,7 +109,7 @@ pub fn init_new(
             return format!("Error: {}", e);
         }
     };
-    lock_client_return_seed(lightclient)
+    lock_client_return_seed(lightclient, monitor_mempool)
 }
 
 pub fn init_from_seed(
@@ -130,7 +136,7 @@ pub fn init_from_seed(
             return format!("Error: {}", e);
         }
     };
-    lock_client_return_seed(lightclient)
+    lock_client_return_seed(lightclient, monitor_mempool)
 }
 
 pub fn init_from_ufvk(
@@ -157,7 +163,7 @@ pub fn init_from_ufvk(
             return format!("Error: {}", e);
         }
     };
-    lock_client_return_seed(lightclient)
+    lock_client_return_seed(lightclient, monitor_mempool)
 }
 
 pub fn init_from_b64(
@@ -191,7 +197,7 @@ pub fn init_from_b64(
                 return format!("Error: {}", e);
             }
         };
-    lock_client_return_seed(lightclient)
+    lock_client_return_seed(lightclient, monitor_mempool)
 }
 
 pub fn save_to_b64() -> String {