diff --git a/app/containers/MessageBox/index.js b/app/containers/MessageBox/index.js index a54705664..f39839059 100644 --- a/app/containers/MessageBox/index.js +++ b/app/containers/MessageBox/index.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { - View, Alert, Keyboard, NativeModules, Text + View, Alert, Keyboard, NativeModules, Text, InteractionManager } from 'react-native'; import { connect } from 'react-redux'; import { KeyboardAccessoryView } from 'react-native-ui-lib/keyboard'; @@ -222,9 +222,14 @@ class MessageBox extends Component { } this.unsubscribeFocus = navigation.addListener('focus', () => { - if (this.tracking && this.tracking.resetTracking) { - this.tracking.resetTracking(); - } + // didFocus + // We should wait pushed views be dismissed + InteractionManager.runAfterInteractions(() => { + if (this.tracking && this.tracking.resetTracking) { + // Reset messageBox keyboard tracking + this.tracking.resetTracking(); + } + }); }); this.unsubscribeBlur = navigation.addListener('blur', () => { this.component?.blur();