Merge pull request #16332 from tienifr/fix/15373

Fix/15373 last message in the report shows for a brief moment
Expensify · Mar 22, 2023 · 95d7990 · 95d7990
2 parents e9cfaaa + 0befe08
commit 95d7990
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 13 deletions.
diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
@@ -248,7 +248,6 @@ class AttachmentModal extends PureComponent {
         return (
             <>
                 <Modal
-                    statusBarTranslucent={false}
                     type={this.state.modalType}
                     onSubmit={this.submitAndClose}
                     onClose={() => this.setState({isModalOpen: false})}

diff --git a/src/components/AvatarCropModal/AvatarCropModal.js b/src/components/AvatarCropModal/AvatarCropModal.js
@@ -363,7 +363,6 @@ const AvatarCropModal = (props) => {
             isVisible={props.isVisible}
             type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
             onModalHide={resetState}
-            statusBarTranslucent={false}
         >
             {props.isSmallScreenWidth && <HeaderGap />}
             <HeaderWithCloseButton

diff --git a/src/components/Modal/BaseModal.js b/src/components/Modal/BaseModal.js
@@ -139,7 +139,7 @@ class BaseModal extends PureComponent {
                             paddingBottom: safeAreaPaddingBottom,
                             paddingLeft: safeAreaPaddingLeft,
                             paddingRight: safeAreaPaddingRight,
-                        } = StyleUtils.getSafeAreaPadding(insets);
+                        } = StyleUtils.getSafeAreaPadding(insets, this.props.statusBarTranslucent);
 
                         const modalPaddingStyles = StyleUtils.getModalPaddingStyles({
                             safeAreaPaddingTop,

diff --git a/src/libs/getSafeAreaPaddingTop/index.android.js b/src/libs/getSafeAreaPaddingTop/index.android.js
@@ -0,0 +1,12 @@
+import {StatusBar} from 'react-native';
+
+/**
+ * Returns safe area padding top to use for a View
+ *
+ * @param {Object} insets
+ * @param {Boolean} statusBarTranslucent
+ * @returns {Number}
+ */
+export default function getSafeAreaPaddingTop(insets, statusBarTranslucent) {
+    return (statusBarTranslucent && StatusBar.currentHeight) || 0;
+}
diff --git a/src/libs/getSafeAreaPaddingTop/index.js b/src/libs/getSafeAreaPaddingTop/index.js
@@ -0,0 +1,9 @@
+/**
+ * Takes safe area insets and returns padding top to use for a View
+ *
+ * @param {Object} insets
+ * @returns {Number}
+ */
+export default function getSafeAreaPaddingTop(insets) {
+    return insets.top;
+}
diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js
@@ -7,6 +7,7 @@ import colors from './colors';
 import positioning from './utilities/positioning';
 import styles from './styles';
 import * as ReportUtils from '../libs/ReportUtils';
+import getSafeAreaPaddingTop from '../libs/getSafeAreaPaddingTop';
 
 const workspaceColorOptions = [
     {backgroundColor: colors.blue200, fill: colors.blue700},
@@ -125,11 +126,12 @@ function getDefaultWorspaceAvatarColor(workspaceName) {
  * Takes safe area insets and returns padding to use for a View
  *
  * @param {Object} insets
+ * @param {Boolean} statusBarTranslucent
  * @returns {Object}
  */
-function getSafeAreaPadding(insets) {
+function getSafeAreaPadding(insets, statusBarTranslucent) {
     return {
-        paddingTop: insets.top,
+        paddingTop: getSafeAreaPaddingTop(insets, statusBarTranslucent),
         paddingBottom: insets.bottom * variables.safeInsertPercentage,
         paddingLeft: insets.left * variables.safeInsertPercentage,
         paddingRight: insets.right * variables.safeInsertPercentage,

diff --git a/src/styles/getModalStyles/index.android.js b/src/styles/getModalStyles/index.android.js