Merge branch 'Expensify:main' into openPolicyCompanyCardsFeed-emailList

Author: fedirjh

.github/workflows/buildAdHoc.yml

@@ -113,8 +113,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009031802
-        versionName "9.3.18-2"
+        versionCode 1009031806
+        versionName "9.3.18-6"
         // 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"

.github/workflows/testBuild.yml

@@ -16,6 +16,7 @@
 import com.expensify.chat.R;
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -30,7 +31,7 @@
 import java.util.TimerTask;
 
 @ReactModule(name = BootSplashModule.NAME)
-public class BootSplashModule extends ReactContextBaseJavaModule {
+public class BootSplashModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
 
   public static final String NAME = "BootSplash";
   private static final BootSplashQueue<Promise> mPromiseQueue = new BootSplashQueue<>();
@@ -41,6 +42,26 @@ public class BootSplashModule extends ReactContextBaseJavaModule {
 
   public BootSplashModule(ReactApplicationContext reactContext) {
     super(reactContext);
+    reactContext.addLifecycleEventListener(this);
+  }
+
+  @Override
+  public void onHostResume() {}
+
+  @Override
+  public void onHostPause() {}
+
+  @Override
+  public void onHostDestroy() {
+    mShouldKeepOnScreen = false;
+    clearPromiseQueue();
+
+    if (mDialog != null) {
+      try {
+        mDialog.dismiss();
+      } catch (Exception ignored) {}
+      mDialog = null;
+    }
   }
 
   @Override
@@ -123,19 +144,63 @@ public void onSplashScreenExit(@NonNull SplashScreenView view) {
 
     mDialog = new BootSplashDialog(activity, R.style.BootTheme);
 
-    mDialog.setOnShowListener(new DialogInterface.OnShowListener() {
+    UiThreadUtil.runOnUiThread(new Runnable() {
       @Override
-      public void onShow(DialogInterface dialog) {
-        mShouldKeepOnScreen = false;
+      public void run() {
+        showDialog(mDialog, new Runnable() {
+          @Override
+          public void run() {
+            mShouldKeepOnScreen = false;
+          }
+        });
       }
     });
+  }
 
-    UiThreadUtil.runOnUiThread(new Runnable() {
+  private static void showDialog(
+    @NonNull final BootSplashDialog dialog,
+    @NonNull final Runnable callback
+  ) {
+    if (dialog.isShowing()) {
+      callback.run();
+      return;
+    }
+
+    dialog.setOnShowListener(new DialogInterface.OnShowListener() {
       @Override
-      public void run() {
-        mDialog.show();
+      public void onShow(DialogInterface d) {
+        callback.run();
+      }
+    });
+
+    try {
+      dialog.show();
+    } catch (Exception exception) {
+      callback.run();
+    }
+  }
+
+  private static void dismissDialog(
+    @Nullable final BootSplashDialog dialog,
+    @NonNull final Runnable callback
+  ) {
+    if (dialog == null || !dialog.isShowing()) {
+      callback.run();
+      return;
+    }
+
+    dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+      @Override
+      public void onDismiss(DialogInterface d) {
+        callback.run();
       }
     });
+
+    try {
+      dialog.dismiss();
+    } catch (Exception exception) {
+      callback.run();
+    }
   }
 
   private void clearPromiseQueue() {
@@ -153,7 +218,7 @@ private void hideAndClearPromiseQueue() {
       public void run() {
         final Activity activity = getReactApplicationContext().getCurrentActivity();
 
-        if (mShouldKeepOnScreen ||  activity == null || activity.isFinishing()) {
+        if (mShouldKeepOnScreen || activity == null || activity.isFinishing() || activity.isDestroyed()) {
           final Timer timer = new Timer();
 
           timer.schedule(new TimerTask() {
@@ -166,15 +231,13 @@ public void run() {
         } else if (mDialog == null) {
           clearPromiseQueue();
         } else {
-          mDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+          dismissDialog(mDialog, new Runnable() {
             @Override
-            public void onDismiss(DialogInterface dialog) {
+            public void run() {
               mDialog = null;
               clearPromiseQueue();
             }
           });
-
-          mDialog.dismiss();
         }
       }
     });

.github/workflows/testBuildOnPush.yml

@@ -1,39 +1,91 @@
 ---
 title: How to access Expensify’s SOC 1, SOC 2, and compliance documentation
-description: Learn how to access Expensify’s SOC 1 and SOC 2 reports, bridge letter, and key legal policies.
-keywords: SOC 1, SOC 2, security report, compliance, bridge letter, Expensify privacy policy, Expensify subprocessors, Expensify terms of service
+description: Learn how to request compliance documents through the Expensify Trust Center.
+keywords: SOC, SOC 1 Type 2, SOC 2 Type 2, bridge letter, W-9, COI, Certificate of Insurance, compliance documentation, security report, vendor security review
+internalScope: Audience is security reviewers, procurement teams, and customers evaluating Expensify. Covers how to obtain SOC reports and compliance documentation from the Trust Center. Does not cover technical security architecture details or audit control explanations.
 ---
 
-Expensify is committed to keeping your data secure and transparent. You can access our latest SOC reports and compliance documentation below.
+Expensify is committed to protecting your data and maintaining transparency around our security practices.
 
-# Expensify SOC 1 and SOC 2 reports
+All compliance documentation, including SOC reports and insurance certificates — is available through our Trust Center.
 
-You can view or download the following audit documents to verify our security and operational controls:
+---
+
+# How to access Expensify compliance documentation
+
+You can request and download the latest compliance documents directly from the Expensify Trust Center:
+
+https://trust.expensify.com/
+
+The Trust Center includes:
+
+- SOC 1 Type 2 Report
+- SOC 2 Type 2 Report
+- SOC 1 and SOC 2 Bridge Letter
+- Certificate of Insurance
+- W-9
+- Additional security and compliance resources
+
+You may be asked to submit a short access request form before downloading certain documents. 
+
+---
+
+# How to request Expensify’s SOC 1 Type 2 Report or SOC 2 Type 2 Report
+
+If you need a SOC report for a vendor security review or procurement process:
+
+1. Go to https://trust.expensify.com/
+2. Select the SOC 1 Type 2 Report or SOC 2 Type 2 Report
+3. Click Request access
+4. Complete the request form
+5. Submit the form to receive access instructions
 
-- [Bridge Letter for SOC 1 and SOC 2 – June 2025](https://drive.google.com/file/d/1kxttniCMLFah4uPNjhknxs0Zor6tWGWE/view?usp=drive_link)
-- [SOC 1 Type 2 Report – September 30, 2024](https://s3-us-west-1.amazonaws.com/concierge-responses-expensify-com/uploads%2F1733950182002-SOC+1+Type+2+Report+09-30-24+-+Expensify.pdf)
-- [SOC 2 Type 2 Report – September 30, 2024](https://s3-us-west-1.amazonaws.com/concierge-responses-expensify-com/uploads%2F1733950193162-SOC+2+Type+2+Report+09-30-24+-+Expensify.pdf)
+---
+
+# How to get Expensify’s SOC 1 and SOC 2 Bridge Letter
+
+The SOC bridge letter provides coverage between the end of the last audit period and the current date.
+
+To access the bridge letter:
+
+1. Visit https://trust.expensify.com/
+2. Select SOC 1 and SOC 2 Bridge Letter
+3. Click Request access (if prompted)
+4. Download the document once approved
+
+---
+
+# How to get Expensify’s W-9 or Certificate of Insurance
+
+For accounting, tax setup, or vendor onboarding:
 
-**Note:** If you need additional details for vendor security reviews or procurement, reach out to your Account Manager or [Concierge](mailto:concierge@expensify.com). 
+1. Go to https://trust.expensify.com/
+2. Select W-9 or Certificate of Insurance
+3. Request or download the document
 
 ---
 
-# Additional Expensify legal resources
+# When to contact Expensify about compliance documentation
 
-You can find more information about our legal and compliance commitments here:
+If you’re unable to access a document in the Trust Center, or if your organization requires additional documentation for a vendor security review, reach out to your Account Manager or Concierge.
 
-- [Expensify Terms of Service](https://www.expensify.com/terms)
-- [Expensify Privacy Policy](https://www.expensify.com/privacy)
-- [List of Subprocessors](https://use.expensify.com/subprocessors)
+Include details about:
+
+- The document you need
+- Your company name
+- Any required deadline
+
+This helps us respond as quickly as possible.
 
 ---
 
 # FAQ
 
-## Who can access Expensify’s SOC 1 and SOC 2 reports?
+## Who can access Expensify’s SOC 1 Type 2 and SOC 2 Type 2 reports?
+
+Anyone conducting a vendor security review or procurement evaluation can request access through the Trust Center. Approval may be required before downloading.
 
-Anyone evaluating Expensify for security and compliance purposes can access these reports using the links above. If you're a current customer, you can also request them from your Account Manager.
+## What is the SOC bridge letter used for?
 
-## What is the bridge letter for?
+The bridge letter provides coverage between the end date of the most recent SOC audit and the present date. It confirms there have been no material changes affecting control effectiveness.
 
-The bridge letter explains the period between the last audit date and the current date to maintain coverage while a new audit is underway.

Mobile-Expensify

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.3.18.2</string>
+	<string>9.3.18.6</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

android/app/build.gradle

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.18</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.18.2</string>
+	<string>9.3.18.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

android/app/src/main/java/com/expensify/chat/bootsplash/BootSplashModule.java

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.18</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.18.2</string>
+	<string>9.3.18.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>