From e885e9160584db0d41438d88463d21d0ce9a7381 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 9 Mar 2023 06:51:22 -0500
Subject: [PATCH 1/2] Merge pull request #15773 from
Expensify/version-BUILD-1640B829-A06B-4DEB-900F-6E809D53EA82
Update version to 1.2.81-1 on main
(cherry picked from commit 3dffcc589fa8fd5fa40ee73a28fd191a92b33077)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/Info.plist | 2 +-
package-lock.json | 4 ++--
package.json | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index fc33dbe46373..1e8f1194acaf 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001028100
- versionName "1.2.81-0"
+ versionCode 1001028101
+ versionName "1.2.81-1"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 46cd23113d25..745d32f67222 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.81.0
+ 1.2.81.1
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index fc7e0ae14189..860de808f000 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.81.0
+ 1.2.81.1
diff --git a/package-lock.json b/package-lock.json
index e1b55c1a17e5..b0f6df92b8b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.81-0",
+ "version": "1.2.81-1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.81-0",
+ "version": "1.2.81-1",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 5dcbbb04bc81..b43d2f834751 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.81-0",
+ "version": "1.2.81-1",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
From b586593ca56612eebcf61935251416fd260f11ca Mon Sep 17 00:00:00 2001
From: Jules
Date: Thu, 9 Mar 2023 11:46:04 +0000
Subject: [PATCH 2/2] Merge pull request #15771 from
Expensify/jules-revertPR15656
Revert "Make status bar transparent on android"
(cherry picked from commit 743bfa66f4c4c9156c2cd3897df52b6ee48863e7)
---
src/components/CustomStatusBar/index.android.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/CustomStatusBar/index.android.js b/src/components/CustomStatusBar/index.android.js
index 2d3579dbfeba..fa3f8921e82a 100644
--- a/src/components/CustomStatusBar/index.android.js
+++ b/src/components/CustomStatusBar/index.android.js
@@ -1,5 +1,6 @@
import React from 'react';
import {StatusBar} from 'react-native';
+import themeColors from '../../styles/themes/default';
/**
* Only the Android platform supports "setBackgroundColor"
@@ -8,8 +9,7 @@ import {StatusBar} from 'react-native';
export default class CustomStatusBar extends React.Component {
componentDidMount() {
StatusBar.setBarStyle('light-content');
- StatusBar.setBackgroundColor('transparent');
- StatusBar.setTranslucent(true);
+ StatusBar.setBackgroundColor(themeColors.appBG);
}
render() {