From e8398cb880d8f15aded63fdb5e1dbd059c53bfcf Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Mon, 20 Jan 2020 16:53:34 +0100
Subject: [PATCH] MM-21634 Fix keyboard glitch when returning to channel screen
 from the code screen (#3824)

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
---
 .../markdown/markdown_code_block/markdown_code_block.js     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/components/markdown/markdown_code_block/markdown_code_block.js b/app/components/markdown/markdown_code_block/markdown_code_block.js
index 692cf3a6c..46a1aa6c7 100644
--- a/app/components/markdown/markdown_code_block/markdown_code_block.js
+++ b/app/components/markdown/markdown_code_block/markdown_code_block.js
@@ -6,6 +6,7 @@ import React from 'react';
 import {intlShape} from 'react-intl';
 import {
     Clipboard,
+    Keyboard,
     StyleSheet,
     Text,
     View,
@@ -66,7 +67,10 @@ export default class MarkdownCodeBlock extends React.PureComponent {
             });
         }
 
-        goToScreen(screen, title, passProps);
+        Keyboard.dismiss();
+        requestAnimationFrame(() => {
+            goToScreen(screen, title, passProps);
+        });
     });
 
     handleLongPress = async () => {