From 4adc9b30fb543e42c13887a0c3e6bf3bc9c0f4c1 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Mon, 10 Jul 2017 22:44:55 +0100
Subject: [PATCH] Dismiss keyboard

---
 ReactNativeClient/lib/components/screens/onedrive-login.js | 2 --
 ReactNativeClient/root.js                                  | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ReactNativeClient/lib/components/screens/onedrive-login.js b/ReactNativeClient/lib/components/screens/onedrive-login.js
index fcb7b33ed8..2daa6ff899 100644
--- a/ReactNativeClient/lib/components/screens/onedrive-login.js
+++ b/ReactNativeClient/lib/components/screens/onedrive-login.js
@@ -89,11 +89,9 @@ class OneDriveLoginScreenComponent extends React.Component {
 				<ScreenHeader navState={this.props.navigation.state} />
 				<WebView
 					source={source}
-					style={{marginTop: 20}}
 					onNavigationStateChange={(o) => { this.webview_load(o); }}
 					onError={(error) => { this.webview_error(error); }}
 				/>
-
 				<Button title="Retry" onPress={() => { this.retryButton_click(); }}></Button>
 			</View>
 		);
diff --git a/ReactNativeClient/root.js b/ReactNativeClient/root.js
index 4dc1672323..82e10de9bf 100644
--- a/ReactNativeClient/root.js
+++ b/ReactNativeClient/root.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { BackHandler } from 'react-native';
+import { BackHandler, Keyboard } from 'react-native';
 import { connect, Provider } from 'react-redux'
 import { createStore } from 'redux';
 import { StackNavigator, addNavigationHelpers } from 'react-navigation';
@@ -104,6 +104,8 @@ const reducer = (state = defaultState, action) => {
 			}
 
 			newState.historyCanGoBack = navHistory.length >= 2;
+
+			Keyboard.dismiss(); // TODO: should probably be in some middleware
 			break;
 
 		// Replace all the notes with the provided array