From 8e2eae49b4f1758e83cb181b23009575974d764e Mon Sep 17 00:00:00 2001
From: Evan Kaloudis <kaloudis@users.noreply.github.com>
Date: Mon, 7 Feb 2022 20:33:05 -0500
Subject: [PATCH] [Releases] v0.6.0-rc2 b (#775)

* Send: make sure destination field doesn't autocorrect (#771)

* Wallet: modify style of Tor restart button (#772)

* Lockscreen enhancements (#773)

* Give autofocus to password field

* Put field in upper half of screen to not get cut off by keyboards

* Update lockscreen colors to match main theme

* Lockscreen: use TextInput component

* Nodes: refresh list after adding/delete node (#776)

* Nodes: refresh when passed new props

* Nodes: refactor node list fetching logic

* Take user back to nodes list after deleting node

* Enforce modal warning text color (#778)

* iOS Version Bump: v0.6.0-rc2 (b) (#779)
---
 components/TextInput.tsx           |  5 +++-
 ios/zeus.xcodeproj/project.pbxproj |  4 +--
 views/Lockscreen.tsx               | 11 ++++++---
 views/Send.tsx                     |  1 +
 views/Settings/AddEditNode.tsx     | 30 +++++++++++++++++------
 views/Settings/Nodes.tsx           | 39 ++++++++++++++----------------
 views/Wallet/Wallet.tsx            |  8 ++----
 7 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/components/TextInput.tsx b/components/TextInput.tsx
index 724fb7d20..6f84dec5a 100644
--- a/components/TextInput.tsx
+++ b/components/TextInput.tsx
@@ -14,6 +14,7 @@ interface TextInputProps {
     autoCapitalize?: string;
     autoCorrect?: boolean;
     multiline?: boolean;
+    autoFocus?: boolean;
 }
 
 function TextInput(props: TextInputProps) {
@@ -28,7 +29,8 @@ function TextInput(props: TextInputProps) {
         keyboardType,
         autoCapitalize,
         autoCorrect,
-        multiline
+        multiline,
+        autoFocus
     } = props;
 
     const defaultStyle = numberOfLines
@@ -73,6 +75,7 @@ function TextInput(props: TextInputProps) {
             autoCapitalize={autoCapitalize}
             autoCorrect={autoCorrect}
             multiline={multiline}
+            autoFocus={autoFocus}
         />
     );
 }
diff --git a/ios/zeus.xcodeproj/project.pbxproj b/ios/zeus.xcodeproj/project.pbxproj
index 222929dc1..bf79152fd 100644
--- a/ios/zeus.xcodeproj/project.pbxproj
+++ b/ios/zeus.xcodeproj/project.pbxproj
@@ -1360,7 +1360,7 @@
 				CODE_SIGN_ENTITLEMENTS = zeus/zeus.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 7222UU8F2H;
 				ENABLE_BITCODE = NO;
@@ -1399,7 +1399,7 @@
 				CODE_SIGN_ENTITLEMENTS = zeus/zeusRelease.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
diff --git a/views/Lockscreen.tsx b/views/Lockscreen.tsx
index 4abb6c11a..e49399323 100644
--- a/views/Lockscreen.tsx
+++ b/views/Lockscreen.tsx
@@ -1,8 +1,11 @@
 import * as React from 'react';
-import { ScrollView, StyleSheet, Text, TextInput, View } from 'react-native';
+import { ScrollView, StyleSheet, Text, View } from 'react-native';
 import { inject, observer } from 'mobx-react';
+
 import Button from './../components/Button';
 import { ErrorMessage } from './../components/SuccessErrorMessage';
+import TextInput from './../components/TextInput';
+
 import LinkingUtils from './../utils/LinkingUtils';
 import { localeString } from './../utils/LocaleUtils';
 
@@ -91,7 +94,7 @@ export default class Lockscreen extends React.Component<
                                 )}
                             />
                         )}
-                        <Text style={{ color: 'white' }}>
+                        <Text style={{ color: '#A7A9AC' }}>
                             {localeString('views.Lockscreen.passphrase')}
                         </Text>
                         <TextInput
@@ -109,6 +112,7 @@ export default class Lockscreen extends React.Component<
                             autoCorrect={false}
                             secureTextEntry={hidden}
                             style={styles.textInputDark}
+                            autoFocus={true}
                         />
                         <View style={styles.button}>
                             <Button
@@ -147,8 +151,7 @@ const styles = StyleSheet.create({
     },
     container: {
         flex: 1,
-        backgroundColor: 'black',
-        paddingTop: 200
+        backgroundColor: '#1f2328'
     },
     button: {
         paddingTop: 15,
diff --git a/views/Send.tsx b/views/Send.tsx
index 9804172e1..525614404 100644
--- a/views/Send.tsx
+++ b/views/Send.tsx
@@ -357,6 +357,7 @@ export default class Send extends React.Component<SendProps, SendState> {
                             this.validateAddress(text);
                         }}
                         style={styles.textInput}
+                        autoCorrect={false}
                     />
                     {!!error_msg && !!destination && (
                         <View style={{ paddingTop: 10, paddingBottom: 10 }}>
diff --git a/views/Settings/AddEditNode.tsx b/views/Settings/AddEditNode.tsx
index e43a91c96..7dc8eff6a 100644
--- a/views/Settings/AddEditNode.tsx
+++ b/views/Settings/AddEditNode.tsx
@@ -326,7 +326,7 @@ export default class AddEditNode extends React.Component<
                 privacy: settings.privacy
             })
         ).then(() => {
-            navigation.navigate('Wallet', { refresh: true });
+            navigation.navigate('Nodes', { refresh: true });
         });
     };
 
@@ -508,10 +508,17 @@ export default class AddEditNode extends React.Component<
                         <View style={styles.modal}>
                             {showLndHubModal && (
                                 <>
-                                    <Text style={{ fontSize: 40 }}>
+                                    <Text
+                                        style={{ fontSize: 40, color: 'black' }}
+                                    >
                                         {localeString('general.warning')}
                                     </Text>
-                                    <Text style={{ paddingTop: 20 }}>
+                                    <Text
+                                        style={{
+                                            paddingTop: 20,
+                                            color: 'black'
+                                        }}
+                                    >
                                         {localeString(
                                             'views.Settings.AddEditNode.lndhubWarning'
                                         )}
@@ -519,7 +526,8 @@ export default class AddEditNode extends React.Component<
                                     <Text
                                         style={{
                                             paddingTop: 20,
-                                            paddingBottom: 20
+                                            paddingBottom: 20,
+                                            color: 'black'
                                         }}
                                     >
                                         {localeString(
@@ -572,10 +580,17 @@ export default class AddEditNode extends React.Component<
                             )}
                             {showCertModal && (
                                 <>
-                                    <Text style={{ fontSize: 40 }}>
+                                    <Text
+                                        style={{ fontSize: 40, color: 'black' }}
+                                    >
                                         {localeString('general.warning')}
                                     </Text>
-                                    <Text style={{ paddingTop: 20 }}>
+                                    <Text
+                                        style={{
+                                            paddingTop: 20,
+                                            color: 'black'
+                                        }}
+                                    >
                                         {localeString(
                                             'views.Settings.AddEditNode.certificateWarning1'
                                         )}
@@ -583,7 +598,8 @@ export default class AddEditNode extends React.Component<
                                     <Text
                                         style={{
                                             paddingTop: 20,
-                                            paddingBottom: 20
+                                            paddingBottom: 20,
+                                            color: 'black'
                                         }}
                                     >
                                         {localeString(
diff --git a/views/Settings/Nodes.tsx b/views/Settings/Nodes.tsx
index 202c3a417..f70cad31c 100644
--- a/views/Settings/Nodes.tsx
+++ b/views/Settings/Nodes.tsx
@@ -31,40 +31,37 @@ export default class Nodes extends React.Component<NodesProps, NodesState> {
         loading: false
     };
 
-    renderSeparator = () => (
-        <View
-            style={{
-                height: 1,
-                width: '86%',
-                backgroundColor: themeColor('separator'),
-                marginLeft: '14%'
-            }}
-        />
-    );
-
     componentDidMount() {
-        const { SettingsStore } = this.props;
-        const { settings } = SettingsStore;
         this.refreshSettings();
-
-        if (settings) {
-            this.setState({
-                nodes: settings.nodes || []
-            });
-        }
     }
 
+    UNSAFE_componentWillReceiveProps = () => {
+        this.refreshSettings();
+    };
+
     async refreshSettings() {
         this.setState({
             loading: true
         });
-        await this.props.SettingsStore.getSettings().then(() => {
+        await this.props.SettingsStore.getSettings().then((settings: any) => {
             this.setState({
-                loading: false
+                loading: false,
+                nodes: (settings && settings.nodes) || []
             });
         });
     }
 
+    renderSeparator = () => (
+        <View
+            style={{
+                height: 1,
+                width: '86%',
+                backgroundColor: themeColor('separator'),
+                marginLeft: '14%'
+            }}
+        />
+    );
+
     render() {
         const { navigation, SettingsStore } = this.props;
         const { loading, nodes } = this.state;
diff --git a/views/Wallet/Wallet.tsx b/views/Wallet/Wallet.tsx
index 6f95d94f1..af9fae5b7 100644
--- a/views/Wallet/Wallet.tsx
+++ b/views/Wallet/Wallet.tsx
@@ -7,7 +7,6 @@ import {
     View
 } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
-import { Button } from 'react-native-elements';
 
 import { inject, observer } from 'mobx-react';
 import Clipboard from '@react-native-clipboard/clipboard';
@@ -16,6 +15,7 @@ import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
 import ChannelsPane from '../Channels/ChannelsPane';
 import MainPane from './MainPane';
 
+import Button from './../../components/Button';
 import LoadingIndicator from './../../components/LoadingIndicator';
 
 import RESTUtils from './../../utils/RESTUtils';
@@ -241,7 +241,7 @@ export default class Wallet extends React.Component<WalletProps, {}> {
                     />
 
                     {error && enableTor && (
-                        <View style={{ marginTop: 10 }}>
+                        <View style={{ backgroundColor: themeColor('error') }}>
                             <Button
                                 title={localeString('views.Wallet.restartTor')}
                                 icon={{
@@ -249,10 +249,6 @@ export default class Wallet extends React.Component<WalletProps, {}> {
                                     size: 25,
                                     color: 'white'
                                 }}
-                                buttonStyle={{
-                                    backgroundColor: 'gray',
-                                    borderRadius: 30
-                                }}
                                 onPress={() => this.restartTorAndReload()}
                             />
                         </View>