Merge remote-tracking branch 'upstream/main' into update-translation-…

…pluralization-example
brandonhenry · Jun 4, 2024 · 17c8998 · 17c8998
2 parents 445e063 + 287cd6a
commit 17c8998
Show file tree

Hide file tree

Showing 180 changed files with 2,800 additions and 839 deletions.
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -352,6 +352,16 @@ jobs:
         env:
           CF_API_KEY: ${{ secrets.CLOUDFLARE_TOKEN }}
 
+  # Build a version of iOS and Android HybridApp if we are deploying to staging
+  hybridApp:
+    runs-on: ubuntu-latest
+    needs: validateActor
+    if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
+    steps:
+      - name: 'Deploy HybridApp'
+        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        uses: Expensify/Mobile-Deploy/.github/workflows/deploy.yml@main
+
   postSlackMessageOnFailure:
     name: Post a Slack message when any platform fails to build or deploy
     runs-on: ubuntu-latest

diff --git a/__mocks__/react-native-permissions.ts b/__mocks__/react-native-permissions.ts
@@ -35,30 +35,30 @@ const requestNotifications: jest.Mock<Notification> = jest.fn((options: Record<s
     status: RESULTS.GRANTED,
     settings: Object.keys(options)
         .filter((option: string) => notificationOptions.includes(option))
-        .reduce((acc: NotificationSettings, option: string) => ({...acc, [option]: true}), {
-            lockScreen: true,
-            notificationCenter: true,
-        }),
+        .reduce(
+            (acc: NotificationSettings, option: string) => {
+                acc[option] = true;
+                return acc;
+            },
+            {
+                lockScreen: true,
+                notificationCenter: true,
+            },
+        ),
 }));
 
 const checkMultiple: jest.Mock<ResultsCollection> = jest.fn((permissions: string[]) =>
-    permissions.reduce(
-        (acc: ResultsCollection, permission: string) => ({
-            ...acc,
-            [permission]: RESULTS.GRANTED,
-        }),
-        {},
-    ),
+    permissions.reduce((acc: ResultsCollection, permission: string) => {
+        acc[permission] = RESULTS.GRANTED;
+        return acc;
+    }, {}),
 );
 
 const requestMultiple: jest.Mock<ResultsCollection> = jest.fn((permissions: string[]) =>
-    permissions.reduce(
-        (acc: ResultsCollection, permission: string) => ({
-            ...acc,
-            [permission]: RESULTS.GRANTED,
-        }),
-        {},
-    ),
+    permissions.reduce((acc: ResultsCollection, permission: string) => {
+        acc[permission] = RESULTS.GRANTED;
+        return acc;
+    }, {}),
 );
 
 export {

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001047802
-        versionName "1.4.78-2"
+        versionCode 1001047900
+        versionName "1.4.79-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

diff --git a/assets/images/check-circle.svg b/assets/images/check-circle.svg
diff --git a/assets/images/checkmark-circle.svg b/assets/images/checkmark-circle.svg
diff --git a/assets/images/crosshair.svg b/assets/images/crosshair.svg
diff --git a/assets/images/simple-illustrations/simple-illustration__checkmarkcircle.svg b/assets/images/simple-illustrations/simple-illustration__checkmarkcircle.svg
diff --git a/assets/images/simple-illustrations/simple-illustration__sendmoney.svg b/assets/images/simple-illustrations/simple-illustration__sendmoney.svg
diff --git a/babel.config.js b/babel.config.js
@@ -10,6 +10,9 @@ const defaultPlugins = [
     '@babel/transform-runtime',
     '@babel/plugin-proposal-class-properties',
 
+    // This will serve to map the classes correctly in FullStory
+    '@fullstory/babel-plugin-annotate-react',
+
     // We use `transform-class-properties` for transforming ReactNative libraries and do not use it for our own
     // source code transformation as we do not use class property assignment.
     'transform-class-properties',

diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
@@ -941,8 +941,8 @@ button {
 }
 
 #platform-tabs > .active {
-    color: var(--color-button-text);
-    background-color: var(--color-button-success-background);
+    color: var(--color-text);
+    background-color: var(--color-button-background);
 }
 
 .hidden {

diff --git a/docs/articles/new-expensify/chat/Expensify-Chat-For-Admins.md b/docs/articles/new-expensify/chat/Expensify-Chat-For-Admins.md
diff --git a/...les/new-expensify/expensify-card/Upgrade-to-the-new-Expensify-Card-from-Visa.md b/...les/new-expensify/expensify-card/Upgrade-to-the-new-Expensify-Card-from-Visa.md
@@ -31,7 +31,7 @@ Before completing this process, you’ll want to:
 New cards will have the same limit as the existing cards. Each cardholder’s current physical and virtual cards will remain active until a Domain Admin or the cardholder deactivates it.
 
 {% include info.html %}
-Cards won’t be issued to any employees who don’t currently have them. In this case, you’ll need to <a href="[url](https://help.expensify.com/articles/expensify-classic/expensify-card/Set-Up-the-Expensify-Visa%C2%AE-Commercial-Card-for-your-Company#:~:text=we%20have%20them.-,How%20to%20issue%20cards,-After%20you%E2%80%99ve%20been)">issue a new card</a>. 
+Cards won’t be issued to any employees who don’t currently have them. In this case, you’ll need to [issue a new card](https://help.expensify.com/articles/expensify-classic/expensify-card/Set-Up-the-Expensify-Visa%C2%AE-Commercial-Card-for-your-Company)
 {% include end-info.html %}
 
 {% include faq-begin.md %}

diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js
@@ -196,6 +196,30 @@ const tocbotOptions = {
     scrollContainer: 'content-area',
 };
 
+function selectNewExpensify(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent) {
+    newExpensifyTab.classList.add('active');
+    newExpensifyContent.classList.remove('hidden');
+
+    expensifyClassicTab.classList.remove('active');
+    expensifyClassicContent.classList.add('hidden');
+    window.tocbot.refresh({
+        ...tocbotOptions,
+        contentSelector: '#new-expensify',
+    });
+}
+
+function selectExpensifyClassic(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent) {
+    expensifyClassicTab.classList.add('active');
+    expensifyClassicContent.classList.remove('hidden');
+
+    newExpensifyTab.classList.remove('active');
+    newExpensifyContent.classList.add('hidden');
+    window.tocbot.refresh({
+        ...tocbotOptions,
+        contentSelector: '#expensify-classic',
+    });
+}
+
 window.addEventListener('DOMContentLoaded', () => {
     injectFooterCopywrite();
 
@@ -219,8 +243,10 @@ window.addEventListener('DOMContentLoaded', () => {
     let contentSelector = '.article-toc-content';
     if (expensifyClassicContent) {
         contentSelector = '#expensify-classic';
+        selectExpensifyClassic(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent);
     } else if (newExpensifyContent) {
         contentSelector = '#new-expensify';
+        selectNewExpensify(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent);
     }
 
     if (window.tocbot) {
@@ -232,28 +258,12 @@ window.addEventListener('DOMContentLoaded', () => {
 
     // eslint-disable-next-line es/no-optional-chaining
     expensifyClassicTab?.addEventListener('click', () => {
-        expensifyClassicTab.classList.add('active');
-        expensifyClassicContent.classList.remove('hidden');
-
-        newExpensifyTab.classList.remove('active');
-        newExpensifyContent.classList.add('hidden');
-        window.tocbot.refresh({
-            ...tocbotOptions,
-            contentSelector: '#expensify-classic',
-        });
+        selectExpensifyClassic(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent);
     });
 
     // eslint-disable-next-line es/no-optional-chaining
     newExpensifyTab?.addEventListener('click', () => {
-        newExpensifyTab.classList.add('active');
-        newExpensifyContent.classList.remove('hidden');
-
-        expensifyClassicTab.classList.remove('active');
-        expensifyClassicContent.classList.add('hidden');
-        window.tocbot.refresh({
-            ...tocbotOptions,
-            contentSelector: '#new-expensify',
-        });
+        selectNewExpensify(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent);
     });
 
     document.getElementById('header-button').addEventListener('click', toggleHeaderMenu);

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.78</string>
+	<string>1.4.79</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.78.2</string>
+	<string>1.4.79.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.78</string>
+	<string>1.4.79</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.78.2</string>
+	<string>1.4.79.0</string>
 </dict>
 </plist>