From 30912da9fd4fd25ce07141054ce80f4c52cd68da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Rodriguez=20Ve=CC=81lez?= <marcospr@pm.me>
Date: Sun, 30 Sep 2018 04:51:52 -0400
Subject: [PATCH] FIX: Fixed weird transition animation from wallets to
 settings

---
 BlueComponents.js      | 82 ++++++++++++++++++------------------------
 screen/wallets/list.js | 21 +++++------
 2 files changed, 45 insertions(+), 58 deletions(-)

diff --git a/BlueComponents.js b/BlueComponents.js
index 624b85217..91a796dbb 100644
--- a/BlueComponents.js
+++ b/BlueComponents.js
@@ -358,54 +358,40 @@ export class BlueHeaderDefaultMain extends Component {
   render() {
     return (
       <SafeAreaView style={{ backgroundColor: '#FFFFFF' }}>
-        <View style={{ height: 120 }}>
-          <TouchableOpacity
-            onPress={() => {
-              // eslint-disable-next-line
-              if (this.props.onClose) this.props.onClose();
-            }}
-          >
-            <View style={stylesBlueIcon.box}>
-              <View style={stylesBlueIcon.ballTransparrent}>
-                <Icon name="kebab-horizontal" size={22} type="octicon" color={BlueApp.settings.foregroundColor} />
-              </View>
-            </View>
-          </TouchableOpacity>
-          <Header
-            {...this.props}
-            backgroundColor="#FFFFFF"
-            outerContainerStyles={{
-              borderBottomColor: 'transparent',
-              borderBottomWidth: 0,
-            }}
-            statusBarProps={{ barStyle: 'default' }}
-            leftComponent={
-              <Text
-                style={{
-                  fontWeight: 'bold',
-                  fontSize: 34,
-                  color: BlueApp.settings.foregroundColor,
-                }}
-              >
-                {
-                  // eslint-disable-next-line
-                  this.props.leftText
-                }
-              </Text>
-            }
-            rightComponent={
-              <TouchableOpacity
-                onPress={this.props.onNewWalletPress}
-                style={{
-                  height: 48,
-                  alignSelf: 'flex-end',
-                }}
-              >
-                <BluePlusIcon />
-              </TouchableOpacity>
-            }
-          />
-        </View>
+        <Header
+          {...this.props}
+          backgroundColor="#FFFFFF"
+          outerContainerStyles={{
+            borderBottomColor: 'transparent',
+            borderBottomWidth: 0,
+          }}
+          statusBarProps={{ barStyle: 'default' }}
+          leftComponent={
+            <Text
+              style={{
+                fontWeight: 'bold',
+                fontSize: 34,
+                color: BlueApp.settings.foregroundColor,
+              }}
+            >
+              {
+                // eslint-disable-next-line
+                this.props.leftText
+              }
+            </Text>
+          }
+          rightComponent={
+            <TouchableOpacity
+              onPress={this.props.onNewWalletPress}
+              style={{
+                height: 48,
+                alignSelf: 'flex-end',
+              }}
+            >
+              <BluePlusIcon />
+            </TouchableOpacity>
+          }
+        />
       </SafeAreaView>
     );
   }
diff --git a/screen/wallets/list.js b/screen/wallets/list.js
index 02c069355..8df65068e 100644
--- a/screen/wallets/list.js
+++ b/screen/wallets/list.js
@@ -28,17 +28,17 @@ let BlueApp = require('../../BlueApp');
 let loc = require('../../loc');
 
 export default class WalletsList extends Component {
-  static navigationOptions = {
-    header: ({ navigation }) => {
-      return (
-        <BlueHeaderDefaultMain
-          leftText={loc.wallets.list.title}
-          onNewWalletPress={() => navigation.navigate('AddWallet')}
-          onClose={() => navigation.navigate('Settings')}
-        />
-      );
+  static navigationOptions = ({ navigation }) => ({
+    headerStyle: {
+      backgroundColor: '#FFFFFF',
+      borderBottomWidth: 0,
     },
-  };
+    headerRight: (
+      <TouchableOpacity style={{ marginHorizontal: 16 }} onPress={() => navigation.navigate('Settings')}>
+        <Icon name="kebab-horizontal" size={22} type="octicon" color={BlueApp.settings.foregroundColor} />
+      </TouchableOpacity>
+    ),
+  });
 
   constructor(props) {
     super(props);
@@ -269,6 +269,7 @@ export default class WalletsList extends Component {
 
     return (
       <SafeBlueArea>
+        <BlueHeaderDefaultMain leftText={loc.wallets.list.title} onNewWalletPress={() => this.props.navigation.navigate('AddWallet')} />
         <WalletsCarousel
           data={BlueApp.getWallets().concat(false)}
           handleClick={index => {