merge main

.gitignore

@@ -94,3 +94,4 @@ storybook-static
 
 # E2E test reports
 tests/e2e/results/
+.reassure

.prettierignore

@@ -1,4 +1,17 @@
 # The GH actions don't seem to compile and verify themselves well when Prettier is applied to them
 .github/actions/javascript/**/index.js
+.well-known
 desktop/dist/**/*.js
 dist/**/*.js
+assets/animations
+android
+ios
+vendor
+package.json
+package-lock.json
+*.html
+*.yml
+*.yaml
+*.css
+*.scss
+*.md

android/app/build.gradle

@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001031801
-        versionName "1.3.18-1"
+        versionCode 1001032100
+        versionName "1.3.21-0"
     }
 
     splits {

android/app/src/main/java/com/expensify/chat/MainActivity.java

@@ -3,6 +3,9 @@
 import android.os.Bundle;
 import android.content.pm.ActivityInfo;
 import android.view.KeyEvent;
+import android.view.View;
+import android.view.WindowInsets;
+
 import com.expensify.chat.bootsplash.BootSplash;
 import com.expensify.reactnativekeycommand.KeyCommandModule;
 import com.facebook.react.ReactActivity;
@@ -45,6 +48,19 @@ protected void onCreate(Bundle savedInstanceState) {
     if (getResources().getBoolean(R.bool.portrait_only)) {
       setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
     }
+
+    // Sets translucent status bar. This code is based on what the react-native StatusBar
+    // module does, but we need to do it here to avoid the splash screen jumping on app start.
+    View decorView = getWindow().getDecorView();
+    decorView.setOnApplyWindowInsetsListener(
+            (v, insets) -> {
+              WindowInsets defaultInsets = v.onApplyWindowInsets(insets);
+              return defaultInsets.replaceSystemWindowInsets(
+                      defaultInsets.getSystemWindowInsetLeft(),
+                      0,
+                      defaultInsets.getSystemWindowInsetRight(),
+                      defaultInsets.getSystemWindowInsetBottom());
+            });
   }
 
   /**
@@ -54,26 +70,26 @@ protected void onCreate(Bundle savedInstanceState) {
   @Override
   public boolean onKeyDown(int keyCode, KeyEvent event) {
     // Disabling hardware ESCAPE support which is handled by Android
-    if (event.getKeyCode() == KeyEvent.KEYCODE_ESCAPE) { 
-        return false; 
+    if (event.getKeyCode() == KeyEvent.KEYCODE_ESCAPE) {
+        return false;
     }
     KeyCommandModule.getInstance().onKeyDownEvent(keyCode, event);
     return super.onKeyDown(keyCode, event);
   }
 
   @Override
-  public boolean onKeyLongPress(int keyCode, KeyEvent event) {    
+  public boolean onKeyLongPress(int keyCode, KeyEvent event) {
     // Disabling hardware ESCAPE support which is handled by Android
     if (event.getKeyCode() == KeyEvent.KEYCODE_ESCAPE) { return false; }
     KeyCommandModule.getInstance().onKeyDownEvent(keyCode, event);
     return super.onKeyLongPress(keyCode, event);
   }
 
   @Override
-  public boolean onKeyUp(int keyCode, KeyEvent event) {    
+  public boolean onKeyUp(int keyCode, KeyEvent event) {
     // Disabling hardware ESCAPE support which is handled by Android
     if (event.getKeyCode() == KeyEvent.KEYCODE_ESCAPE) { return false; }
     KeyCommandModule.getInstance().onKeyDownEvent(keyCode, event);
     return super.onKeyUp(keyCode, event);
   }
-}
+}

android/app/src/main/res/values/colors.xml

@@ -1,6 +1,5 @@
 <resources>
     <color name="bootsplash_background">#03D47C</color>
-    <color name="status_bar_background">#061B09</color>
     <color name="white">#FFFFFF</color>
     <color name="accent">#03D47C</color>
     <color name="dark">#0b1b34</color>

android/app/src/main/res/values/styles.xml

@@ -6,7 +6,7 @@
     <!-- Base application theme. Applied to all Android versions -->
     <style name="BaseAppTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:colorEdgeEffect">@color/gray4</item>
-        <item name="android:statusBarColor">@color/status_bar_background</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="colorAccent">@color/accent</item>
         <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
         <item name="popupTheme">@style/AppTheme.Popup</item>
@@ -71,7 +71,7 @@
     </style>
 
     <style name="BootTheme" parent="Theme.SplashScreen">
-        <item name="android:statusBarColor">@color/status_bar_background</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="windowSplashScreenAnimatedIcon">@mipmap/bootsplash_logo</item>
         <item name="windowSplashScreenBackground">@color/bootsplash_background</item>
     </style>

contributingGuides/FORMS.md

@@ -272,6 +272,7 @@ Form.js will automatically provide the following props to any input with the inp
 - value: The input value.
 - errorText: The translated error text that is returned by validate for that specific input.
 - onBlur: An onBlur handler that calls validate.
+- onTouched: An onTouched handler that marks the input as touched.
 - onInputChange: An onChange handler that saves draft values and calls validate for that input (inputA). Passing an inputID as a second param allows inputA to manipulate the input value of the provided inputID (inputB).
 
 ## Dynamic Form Inputs

dangerfile.js

@@ -0,0 +1,7 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import path from 'path';
+import {dangerReassure} from 'reassure';
+
+dangerReassure({
+    inputFilePath: path.join(__dirname, './.reassure/output.md'),
+});

docs/articles/playbooks/Expensify-Playbook-for-Small-to-Medium-Sized-Businesses.md

@@ -14,7 +14,7 @@ As a small to medium-sized business owner, your main aim is to achieve success a
 This playbook is built on best practices we’ve developed after processing expenses for tens of thousands of companies around the world. As such, use this playbook as your starting point, knowing that you can customize Expensify to suit your business needs. Every company is different, and your dedicated Setup Specialist is always one chat away with any questions you may have.
 
 ### Step 1: Create your Expensify account
-If you don't already have one, go to [Expensify.com](https://expensify.com) and sign up for an account with your work email address. The account is free so don’t worry about the cost at this stage.
+If you don't already have one, go to *[new.expensify.com](https://new.expensify.com)* and sign up for an account with your work email address. The account is free so don’t worry about the cost at this stage.
 
 > _Employees really appreciate how easy it is to use, and the fact that the reimbursement drops right into their bank account. Since most employees are submitting expenses from their phones, the ease of use of the app is critical_
 >
@@ -37,7 +37,7 @@ To create your Control Policy:
 2. Select *Group* and click the button that says *New Policy*
 3. Click *Select* under Control
 
-The Control Plan also gives you access to a dedicated Setup Specialist. You can find yours by looking at your policy's *#admins* room in [new.expensify.com](https://new.expensify.com), and in your company’s policy settings in the *Overview* tab, where you can chat with them and schedule an onboarding call to walk through any setup questions. The Control Plan bundled with the Expensify Card is only *$9 per user per month* (not taking into account cash back your earn) when you commit annually. That’s a 75% discount off the unbundled price point if you choose to use a different Corporate Card (or no) provider.
+The Control Plan also gives you access to a dedicated Setup Specialist. You can find yours by looking at your policy's *#admins* room in *[new.expensify.com](https://new.expensify.com)*, and in your company’s policy settings in the *Overview* tab, where you can chat with them and schedule an onboarding call to walk through any setup questions. The Control Plan bundled with the Expensify Card is only *$9 per user per month* (not taking into account cash back your earn) when you commit annually. That’s a 75% discount off the unbundled price point if you choose to use a different Corporate Card (or no) provider.
 
 ### Step 3: Connect your accounting system
 As a small to medium-sized business, it's important to maintain proper spend management to ensure the success and stability of your organization. This requires paying close attention to your expenses, streamlining your financial processes, and making sure that your financial information is accurate, compliant, and transparent. Include best practices such as:
@@ -280,4 +280,4 @@ Now that we’ve gone through all of the steps for setting up your account, let
 4. Click *Accept Terms*
 
 ## You’re all set!
-Congrats, you are all set up! If you need any assistance with anything mentioned above or would like to understand other features available in Expensify, reach out to your Setup Specialist directly in new.expensify.com. Don’t have one yet? Create a Control Policy, and we’ll automatically assign a dedicated Setup Specialist to you. 
+Congrats, you are all set up! If you need any assistance with anything mentioned above or would like to understand other features available in Expensify, reach out to your Setup Specialist directly in *[new.expensify.com](https://new.expensify.com)*. Don’t have one yet? Create a Control Policy, and we’ll automatically assign a dedicated Setup Specialist to you. 

docs/articles/playbooks/Expensify-Playbook-for-US-Based-Bootstrapped-Startups.md

@@ -5,7 +5,7 @@ description: Best practices for how to deploy Expensify for your business
 
 This playbook details best practices on how Bootstrapped Startups with less than 5 employees can use Expensify to prioritize product development while capturing business-related receipts for future reimbursement.
 - See our *[Playbook for VC-Backed Startups](https://help.expensify.com/articles/playbooks/Expensify-Playbook-for-US-based-VC-Backed-Startups)* if you have taken venture capital investment and are more concerned with prioritizing top-line revenue growth than achieving near-term profitability
-- See our *[Playbook for Small to Medium-Sized Businesses]([url](https://help.expensify.com/articles/playbooks/Expensify-Playbook-for-Small-to-Medium-Sized-Businesses))* if you are more concerned with maintaining profitability than growing top-line revenue.
+- See our *[Playbook for Small to Medium-Sized Businesses](https://help.expensify.com/articles/playbooks/Expensify-Playbook-for-Small-to-Medium-Sized-Businesses)* if you are more concerned with maintaining profitability than growing top-line revenue.
 
 # Who you are
 As a bootstrapped startup, you have surrounded yourself with a small handful of people you trust, and are focused on developing your concept to officially launch and possibly take to outside investors. You are likely running your business with your own money, and possibly a small amount of funding from friends and family. You are either paying yourself a little, or not at all, but at this stage, the company isn’t profitable. And for now, you are capturing receipts so that you can reimburse yourself for startup costs when you either take on investment or start to turn a profit.
@@ -14,7 +14,7 @@ As a bootstrapped startup, you have surrounded yourself with a small handful of
 This playbook is built based on best practices we’ve developed after processing expenses for tens of thousands of companies around the world. As such, use this playbook as your starting point, knowing that you can customize Expensify to suit your business needs. Every company is different, and we’re always one chat away with any questions you may have.
 
 ## Step 1: Create your Expensify account
-If you don't already have one, go to *[new.expensify.com](new.expensifiy.com)* and sign up for an account with your business email address.
+If you don't already have one, go to *[new.expensify.com](https://new.expensify.com)* and sign up for an account with your business email address.
 
 ## Step 2: Create a Free Plan Workspace
 There are three plans (Free, Collect, and Control), but for your needs, we recommend the *Free Plan* for the following reasons:
@@ -25,13 +25,13 @@ There are three plans (Free, Collect, and Control), but for your needs, we recom
 
 To create your Free Plan Workspace:
 
-1. Go to *new.expensify.com*
+1. Go to *[new.expensify.com](https://new.expensify.com)*
 2. Select *New Workspace*
 3. Select the avatar in the top left corner
 4. Click on the workspace name and rename it
 5. Express yourself by adding an avatar image, preferably an image of yourself
 
-The Free Plan also gives you direct access to lightning-fast 24/7 support via Concierge. Within new.expensify.com, you can start a direct message (DM) with Concierge anytime.
+The Free Plan also gives you direct access to lightning-fast 24/7 support via Concierge. Within *[new.expensify.com](https://new.expensify.com/concierge)*, you can start a direct message (DM) with Concierge anytime.
 
 ## Step 3: Invite Your Team
 As a bootstrapped startup, you communicate with your team all day. Similarly, if you are a co-founder, you will have multiple people that will need to capture receipts for your project.
@@ -87,5 +87,5 @@ To view and pay bills:
 When you have bills to pay you can click *View all bills* under the *Manage your bills* box and we’ll keep a neatly organized list of all of the bills you can pay via ACH directly from your Expensify account.
 
 # You’re all set!
-Congrats, you are all set up! If you need any assistance with anything mentioned above, reach out to either your Concierge directly in new.expensify.com, or email [email protected]. Create a Collect or Control Policy, and we’ll automatically assign a dedicated Setup Specialist to you.
+Congrats, you are all set up! If you need any assistance with anything mentioned above, reach out to either your Concierge directly in *[new.expensify.com](https://new.expensify.com/concierge)*, or email [email protected]. Create a Collect or Control Policy, and we’ll automatically assign a dedicated Setup Specialist to you.