From 971d92f4e32d908ff6e907a48bdb393473c6ab02 Mon Sep 17 00:00:00 2001
From: marcosrdz <marcospr@pm.me>
Date: Sun, 29 Mar 2020 23:41:02 -0400
Subject: [PATCH] REF: Moved network settings

---
 MainBottomTabs.js                  |  5 +++++
 screen/settings/NetworkSettings.js | 30 ++++++++++++++++++++++++++++++
 screen/settings/settings.js        |  7 +++----
 3 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 screen/settings/NetworkSettings.js

diff --git a/MainBottomTabs.js b/MainBottomTabs.js
index de03c94fc..8edc132b7 100644
--- a/MainBottomTabs.js
+++ b/MainBottomTabs.js
@@ -11,6 +11,7 @@ import PlausibleDeniability from './screen/plausibledeniability';
 import LightningSettings from './screen/settings/lightningSettings';
 import ElectrumSettings from './screen/settings/electrumSettings';
 import GeneralSettings from './screen/settings/GeneralSettings';
+import NetworkSettings from './screen/settings/NetworkSettings';
 import DefaultView from './screen/settings/defaultView';
 
 import WalletsList from './screen/wallets/list';
@@ -135,6 +136,10 @@ const WalletsStackNavigator = createStackNavigator(
       screen: GeneralSettings,
       path: 'GeneralSettings',
     },
+    NetworkSettings: {
+      screen: NetworkSettings,
+      path: 'NetworkSettings',
+    },
     PlausibleDeniability: {
       screen: PlausibleDeniability,
       path: 'PlausibleDeniability',
diff --git a/screen/settings/NetworkSettings.js b/screen/settings/NetworkSettings.js
new file mode 100644
index 000000000..af2b00562
--- /dev/null
+++ b/screen/settings/NetworkSettings.js
@@ -0,0 +1,30 @@
+import React, { useEffect, useState } from 'react';
+import { ScrollView, TouchableOpacity } from 'react-native';
+import { BlueNavigationStyle, BlueLoading, SafeBlueArea, BlueListItem } from '../../BlueComponents';
+import { useNavigation } from 'react-navigation-hooks';
+const loc = require('../../loc');
+
+const NetworkSettings = () => {
+  const [isLoading, setIsLoading] = useState(true);
+  const { navigate } = useNavigation();
+
+  useEffect(() => {
+    setIsLoading(false);
+  });
+
+  return isLoading ? (
+    <BlueLoading />
+  ) : (
+    <SafeBlueArea forceInset={{ horizontal: 'always' }} style={{ flex: 1 }}>
+      <ScrollView>
+        <BlueListItem title={loc.settings.lightning_settings} component={TouchableOpacity} onPress={() => navigate('LightningSettings')} />
+        <BlueListItem title={'Electrum server'} component={TouchableOpacity} onPress={() => navigate('ElectrumSettings')} />
+      </ScrollView>
+    </SafeBlueArea>
+  );
+};
+NetworkSettings.navigationOptions = {
+  ...BlueNavigationStyle(),
+  title: 'Network',
+};
+export default NetworkSettings;
diff --git a/screen/settings/settings.js b/screen/settings/settings.js
index 3b97f76d9..14a9db31b 100644
--- a/screen/settings/settings.js
+++ b/screen/settings/settings.js
@@ -19,11 +19,10 @@ const Settings = () => {
       <BlueHeaderDefaultSub leftText={loc.settings.header} rightComponent={null} />
       <ScrollView>
         <BlueListItem title={'General'} component={TouchableOpacity} onPress={() => navigate('GeneralSettings')} />
-        <BlueListItem title="Security" onPress={() => navigate('EncryptStorage')} component={TouchableOpacity} testID="SecurityButton" />
-        <BlueListItem title={loc.settings.lightning_settings} component={TouchableOpacity} onPress={() => navigate('LightningSettings')} />
-        <BlueListItem title={loc.settings.language} component={TouchableOpacity} onPress={() => navigate('Language')} />
         <BlueListItem title={loc.settings.currency} component={TouchableOpacity} onPress={() => navigate('Currency')} />
-        <BlueListItem title={'Electrum server'} component={TouchableOpacity} onPress={() => navigate('ElectrumSettings')} />
+        <BlueListItem title={loc.settings.language} component={TouchableOpacity} onPress={() => navigate('Language')} />
+        <BlueListItem title="Security" onPress={() => navigate('EncryptStorage')} component={TouchableOpacity} testID="SecurityButton" />
+        <BlueListItem title="Network" component={TouchableOpacity} onPress={() => navigate('NetworkSettings')} />
         <BlueListItem title={loc.settings.about} component={TouchableOpacity} onPress={() => navigate('About')} testID="AboutButton" />
       </ScrollView>
     </SafeBlueArea>