From 1e822d3c0f1f4fbc0398ade9d4295a6f2c6aa27f Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 12 Sep 2022 12:33:58 -0400
Subject: [PATCH 1/2] Merge pull request #10944 from
Expensify/version-BUILD-0D6105A7-9C1A-4F92-918F-EB72FB8B1CA7
Update version to 1.1.99-4 on main
(cherry picked from commit 68c50096675e02882e639107215e0920cdcbb77e)
---
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 8162023eac29..04063749361a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001019902
- versionName "1.1.99-2"
+ versionCode 1001019904
+ versionName "1.1.99-4"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 8f9d4cd1bef0..a19a074d3d49 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.1.99.2
+ 1.1.99.4
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 08257f239398..890a0ad794b6 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.99.2
+ 1.1.99.4
diff --git a/package-lock.json b/package-lock.json
index 986804658b17..b13378e833d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.1.99-2",
+ "version": "1.1.99-4",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.1.99-2",
+ "version": "1.1.99-4",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 79801c1101cf..f9a67bfa8cee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.99-2",
+ "version": "1.1.99-4",
"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 33317297883946615d6a378879bb08aee7a34e6d Mon Sep 17 00:00:00 2001
From: Jules
Date: Mon, 12 Sep 2022 17:27:46 +0100
Subject: [PATCH 2/2] Merge pull request #10942 from
Expensify/jules-uselessCommitToFixRelease
CP a useless commit to fix failed release
(cherry picked from commit 77dc685b7b60b37ba4b47cfdfecaf05022b32034)
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index c0f9e32884d9..fb3a256efd22 100644
--- a/README.md
+++ b/README.md
@@ -221,9 +221,9 @@ created to house a collection of items in plural form and using camelCase (eg: p
- components: React native components that are re-used in several places.
- libs: Library classes/functions, these are not React native components (ie: they are not UI)
- pages: These are components that define pages in the app. The component that defines the page itself should be named
-`Page` if there are components used only inside one page, they should live in its own directory named after the ``.
+`Page` if there are components used only inside one page, they should live in its own directory named after the ``
- styles: These files define styles used among components/pages
-- contributingGuides: This is just a set of markdown files providing guides and insights to aid developers in learning how to contribute to this repo.
+- contributingGuides: This is just a set of markdown files providing guides and insights to aid developers in learning how to contribute to this repo
**Note:** There is also a directory called `/docs`, which houses the Expensify Help site. It's a static site that's built with Jekyll and hosted on GitHub Pages.