From 7b12673e59097506bb11c99dc2f844b3adbe7a3e Mon Sep 17 00:00:00 2001
From: etoledom <etoledom@icloud.com>
Date: Fri, 30 Aug 2019 18:09:31 +0200
Subject: [PATCH] Recover border colors (#17269)

---
 .../block-editor/src/components/block-list/block.native.js     | 2 +-
 .../block-editor/src/components/block-list/index.native.js     | 2 +-
 packages/edit-post/src/components/layout/index.native.js       | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/block-editor/src/components/block-list/block.native.js b/packages/block-editor/src/components/block-list/block.native.js
index b87f95445e11f..69503bf7151e2 100644
--- a/packages/block-editor/src/components/block-list/block.native.js
+++ b/packages/block-editor/src/components/block-list/block.native.js
@@ -131,7 +131,7 @@ class BlockListBlock extends Component {
 					>
 						{ isValid && this.getBlockForType() }
 						{ ! isValid &&
-						<BlockInvalidWarning blockTitle={ title } icon={ icon } />
+							<BlockInvalidWarning blockTitle={ title } icon={ icon } />
 						}
 					</View>
 					{ isSelected && <BlockMobileToolbar clientId={ clientId } /> }
diff --git a/packages/block-editor/src/components/block-list/index.native.js b/packages/block-editor/src/components/block-list/index.native.js
index 7c67de71c342f..5a78753c1249b 100644
--- a/packages/block-editor/src/components/block-list/index.native.js
+++ b/packages/block-editor/src/components/block-list/index.native.js
@@ -140,7 +140,7 @@ export class BlockList extends Component {
 						rootClientId={ this.props.rootClientId }
 						onCaretVerticalPositionChange={ this.onCaretVerticalPositionChange }
 						borderStyle={ this.blockHolderBorderStyle() }
-						focusedBorderColor={ blockHolderFocusedStyle }
+						focusedBorderColor={ blockHolderFocusedStyle.borderColor }
 					/> ) }
 			</ReadableContentView>
 		);
diff --git a/packages/edit-post/src/components/layout/index.native.js b/packages/edit-post/src/components/layout/index.native.js
index 5b6813067211d..5a10ed14cb9a5 100644
--- a/packages/edit-post/src/components/layout/index.native.js
+++ b/packages/edit-post/src/components/layout/index.native.js
@@ -118,8 +118,7 @@ class Layout extends Component {
 				<View style={ useStyle( styles.background, styles.backgroundDark, this.props.theme ) }>
 					{ isHtmlView ? this.renderHTML() : this.renderVisual() }
 				</View>
-				<View style={ { flex: 0, flexBasis: marginBottom, height: marginBottom } }>
-				</View>
+				<View style={ { flex: 0, flexBasis: marginBottom, height: marginBottom } } />
 				{ ! isHtmlView && (
 					<KeyboardAvoidingView
 						parentHeight={ this.state.rootViewHeight }