From a4cc81bda5900ecf515b8b572c61761ab7714ef0 Mon Sep 17 00:00:00 2001
From: marcosrdz <marcospr@pm.me>
Date: Tue, 15 Sep 2020 20:48:24 -0400
Subject: [PATCH] FIX: Reorder screen is broken

---
 Navigation.js                    | 9 ++++++++-
 ios/Podfile.lock                 | 8 ++++----
 screen/wallets/reorderWallets.js | 7 +++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Navigation.js b/Navigation.js
index 3d3692f30..d1a9b48f7 100644
--- a/Navigation.js
+++ b/Navigation.js
@@ -251,6 +251,13 @@ const HodlHodlLoginRoot = () => (
   </HodlHodlLoginStack.Navigator>
 );
 
+const ReorderWalletsStack = createStackNavigator();
+const ReorderWalletsStackRoot = () => (
+  <ReorderWalletsStack.Navigator name="ReorderWalletsRoot" screenOptions={defaultStackScreenOptions}>
+    <ReorderWalletsStack.Screen name="ReorderWallets" component={ReorderWallets} options={ReorderWallets.navigationOptions} />
+  </ReorderWalletsStack.Navigator>
+);
+
 const Drawer = createDrawerNavigator();
 function DrawerRoot() {
   const dimensions = useWindowDimensions();
@@ -276,7 +283,7 @@ const InitRoot = () => (
       component={UnlockWithScreenRoot}
       options={{ headerShown: false, animationEnabled: false }}
     />
-    <InitStack.Screen name="ReorderWallets" component={ReorderWallets} options={ReorderWallets.navigationOptions} />
+    <InitStack.Screen name="ReorderWallets" component={ReorderWalletsStackRoot} options={{ headerShown: false }} />
     <InitStack.Screen name="DrawerRoot" component={DrawerRoot} options={{ headerShown: false, animationEnabled: false }} />
   </InitStack.Navigator>
 );
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 67e65a625..367337455 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -266,7 +266,7 @@ PODS:
     - React
   - react-native-randombytes (3.5.3):
     - React
-  - react-native-safe-area-context (3.1.4):
+  - react-native-safe-area-context (3.1.6):
     - React
   - react-native-slider (3.0.3):
     - React
@@ -341,7 +341,7 @@ PODS:
     - React
   - RemobileReactNativeQrcodeLocalImage (1.0.4):
     - React
-  - RNCAsyncStorage (1.11.0):
+  - RNCAsyncStorage (1.12.0):
     - React
   - RNCClipboard (1.2.3):
     - React
@@ -678,7 +678,7 @@ SPEC CHECKSUMS:
   react-native-geolocation: cbd9d6bd06bac411eed2671810f454d4908484a8
   react-native-image-picker: a6c3d644751a388b0fc8b56822ff7cbd398a3008
   react-native-randombytes: 991545e6eaaf700b4ee384c291ef3d572e0b2ca8
-  react-native-safe-area-context: 0ed9288ed4409beabb0817b54efc047286fc84da
+  react-native-safe-area-context: 1a1fdfdc6f9f5beb55b2f0d10d8cf029efd996f4
   react-native-slider: b733e17fdd31186707146debf1f04b5d94aa1a93
   react-native-tcp-socket: 96a4f104cdcc9c6621aafe92937f163d88447c5b
   react-native-webview: 162c2f2b14555cb524ac0e3b422a9b66ebceefee
@@ -695,7 +695,7 @@ SPEC CHECKSUMS:
   ReactNativePrivacySnapshot: cc295e45dc22810e9ff2c93380d643de20a77015
   RealmJS: c8645e0d65b676780f7e6c393d327527a2eb15e8
   RemobileReactNativeQrcodeLocalImage: 57aadc12896b148fb5e04bc7c6805f3565f5c3fa
-  RNCAsyncStorage: db711e29e5e0500d9bd21aa0c2e397efa45302b1
+  RNCAsyncStorage: 3eea36d9460c5159b592f9ecbe5a77f8aca98006
   RNCClipboard: 5f3218dcdc28405aa2ae72b78e388f150b826dd3
   RNCMaskedView: f5c7d14d6847b7b44853f7acb6284c1da30a3459
   RNCPushNotificationIOS: f4a1a20fe1d70bbb1fab6abf86ffec2996012b12
diff --git a/screen/wallets/reorderWallets.js b/screen/wallets/reorderWallets.js
index 59527fdd6..695747e8f 100644
--- a/screen/wallets/reorderWallets.js
+++ b/screen/wallets/reorderWallets.js
@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useRef } from 'react';
 import { View, ActivityIndicator, Image, Text, StyleSheet, StatusBar, ScrollView } from 'react-native';
-import { SafeBlueArea, BlueNavigationStyle } from '../../BlueComponents';
+import { BlueNavigationStyle } from '../../BlueComponents';
 import SortableList from 'react-native-sortable-list';
 import LinearGradient from 'react-native-linear-gradient';
 import { PlaceholderWallet, LightningCustodianWallet } from '../../class';
@@ -168,12 +168,11 @@ const ReorderWallets = () => {
       <ActivityIndicator />
     </View>
   ) : (
-    <SafeBlueArea>
+    <View style={[styles.root, stylesHook.root]}>
       <StatusBar barStyle="light-content" />
       <ScrollView scrollEnabled={scrollEnabled}>
         <SortableList
           ref={sortableList}
-          style={[styles.root, stylesHook.root]}
           data={data}
           renderRow={renderItem}
           scrollEnabled={false}
@@ -182,7 +181,7 @@ const ReorderWallets = () => {
           onReleaseRow={onReleaseRow}
         />
       </ScrollView>
-    </SafeBlueArea>
+    </View>
   );
 };