Fixes before APK build

Sifir-io · Jun 26, 2020 · 1070f4e · 1070f4e
1 parent c454287
commit 1070f4e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/common/constants.js b/src/common/constants.js
@@ -137,6 +137,8 @@ export const C = {
   STR_Min_Anonset: 'Min Anonset',
   STR_Anonim_Level: 'Anonimity Level',
   STR_Set_Min_Anonset: 'Set Minimum Anonset',
+  STR_Auto_mix_account_select:
+    'Funds reaching the minimum anonset specified will be sent to',
   STR_Select_Account:
     'Select one account to which the Wasabi wallet will autosend funds to.',
   // --- ERRORS --

diff --git a/src/components/screens/wallet/SifirBtcReceiveTxnScreen.js b/src/components/screens/wallet/SifirBtcReceiveTxnScreen.js
@@ -58,12 +58,15 @@ const SifirBtcReceiveTxnScreen = props => {
 
   useEffect(() => {
     loadWalletAddress();
-  }, [labelInputDone, addrType]);
+  }, []);
+  // }, [labelInputDone, addrType]);
   // load new address
   useEffect(() => {
+    let loadNew = false;
     if (refresh > 0 && refresh > prevRefreshValue.current) {
-      loadWalletAddress({loadNew: true});
+      loadNew = true;
     }
+    loadWalletAddress({loadNew});
     prevRefreshValue.current = refresh;
   }, [refresh]);
 
@@ -209,13 +212,15 @@ const SifirBtcReceiveTxnScreen = props => {
           )}
           {!labelInputDone && (
             <TouchableOpacity
+              disabled={labelInput?.length < 1}
               onPressOut={() => {
                 if (labelInputDone) {
                   setAddress(null);
                   setLabelInput('');
                   setLabelInputDone(false);
                 } else {
                   setLabelInputDone(true);
+                  setRefresh(refresh + 1);
                 }
               }}
               style={styles.labelButtonCTA}>
@@ -301,13 +306,9 @@ const SifirBtcReceiveTxnScreen = props => {
                   ]}>{`Label: ${labelInput}`}</Text>
                 <TouchableOpacity
                   onPress={() => {
-                    if (labelInputDone) {
-                      setAddress(null);
-                      setLabelInput('');
-                      setLabelInputDone(false);
-                    } else {
-                      setLabelInputDone(true);
-                    }
+                    setAddress(null);
+                    setLabelInput('');
+                    setLabelInputDone(false);
                   }}>
                   <Image
                     source={Images.icon_failure}

diff --git a/src/components/screens/wallet/SifirWasabiAutoSpendScreen.js b/src/components/screens/wallet/SifirWasabiAutoSpendScreen.js
@@ -272,7 +272,7 @@ const SifirWasabiAutoSpendScreen = props => {
               marginTop: 0,
             },
           ]}>
-          {C.STR_Select_Account}
+          {`${C.STR_Auto_mix_account_select} ${selectedWallet.label}`}
         </Text>
       )}
       {selectedWallet?.label && WalletAnonSlider}