Merge pull request #18016 from Expensify/update-staging-from-main

Update version to 1.3.6-0 on staging

.storybook/public/index.css

@@ -1,24 +1,28 @@
 .search-field *, .sidebar-item, .search-result-item--label {
-    color: #fff !important;
+    color: #E7ECE9 !important;
 }
 
 .sidebar-subheading *, .search-result-item {
-    color: #fff;
+    color: #E7ECE9;
 }
 
 a.sidebar-item > svg {
     color: #03d47c;
 }
 
+a.sidebar-item[data-selected="true"], a.sidebar-item[data-selected="true"]:focus, a.sidebar-item[data-selected="true"]:hover {
+    background: #1A3D32;
+}
+
 .search-result-item--label span {
-    color: #ffffffaa !important;
+    color: #E7ECE9aa !important;
 }
 
 #panel-tab-content :is(input:checked ~ span:last-of-type, input:not(:checked) ~ span:first-of-type) {
-    background: #ff7101;
-    color: #fff;
+    background: #03D47C;
+    color: #E7ECE9;
 }
 
 .sidebar-container {
-    background: #0b1b34;
+    background: #07271f;
 }

.storybook/theme.js

@@ -2,14 +2,22 @@ import {create} from '@storybook/theming';
 import colors from '../src/styles/colors';
 
 export default create({
-    appBg: colors.dark,
-    barSelectedColor: colors.blue,
-    base: 'light',
-    brandTitle: 'Expensify UI Docs',
+    brandTitle: 'New Expensify UI Docs',
     brandImage: 'logomark.svg',
-    colorPrimary: colors.dark,
-    colorSecondary: colors.orange,
     fontBase: 'ExpensifyNeue-Regular',
     fontCode: 'monospace',
-    textInverseColor: colors.black,
+    base: 'dark',
+    appBg: colors.greenHighlightBackground,
+    colorPrimary: colors.greenDefaultButton,
+    colorSecondary: colors.green,
+    appContentBg: colors.greenAppBackground,
+    textColor: colors.white,
+    barTextColor: colors.white,
+    barSelectedColor: colors.green,
+    barBg: colors.greenAppBackground,
+    appBorderColor: colors.greenBorders,
+    inputBg: colors.greenHighlightBackground,
+    inputBorder: colors.greenBorders,
+    appBorderRadius: 8,
+    inputBorderRadius: 8,
 });

android/app/build.gradle

@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001030506
-        versionName "1.3.5-6"
+        versionCode 1001030600
+        versionName "1.3.6-0"
     }
 
     splits {

contributingGuides/CONTRIBUTING.md

@@ -59,7 +59,7 @@ Please be aware that compensation for any support in solving an issue is provide
 - Merged PR within 9 business days - 50% **penalty**  
 - No PR within 12 business days - **Contract terminated**  
 
-If the PR causes a regression within 7 days of being deployed to production, contributors are not eligible for the 50% bonus. 
+If the PR causes a regression at any point within the regression period (starting when the code is merged and ending 7 days after being deployed to production), contributors are not eligible for the 50% bonus. 
 
 ## Finding Jobs
 A job could be fixing a bug or working on a new feature. There are two ways you can find a job that you can contribute to:

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

@@ -10,8 +10,6 @@ This guide provides practical tips and recommendations for small businesses with
 ## Who you are
 As a small to medium-sized business owner, your main aim is to achieve success and grow your business. To achieve your goals, it is crucial that you make worthwhile investments in both your workforce and your business processes. This means providing your employees with the resources they need to generate revenue effectively, while also adopting measures to guarantee that expenses are compliant.
 
-![Expense Basics](http://127.0.0.1:4000/assets/images/playbook-expense-basics.png)
-
 ## Step-by-step instructions for setting up Expensify
 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.
 
@@ -102,6 +100,8 @@ This is essentially like setting a daily or individual expense limitation on any
 *Receipt Required Amount: $75*
 Receipts are important, and in most cases you prefer an itemized receipt. However, Expensify will generate an IRS-compliant electronic receipt (not itemized) for every expense not tied to hotels expense. For this reason, it’s important to enforce a rule where anytime an employee is on the road, and making business-related purchases at hotel (which happens a lot!), they are required to attach a physical receipt. 
 
+![Expense Basics](https://help.expensify.com/assets/images/playbook-expense-basics.png)
+
 At this point, you’ve set enough compliance controls around categorical spend and general expenses for all employees, such that you can put trust in our solution to audit all expenses up front so you don’t have to. Next, let’s dive into how we can comfortably take on more automation, while relying on compliance controls to capture bad behavior (or better yet, instill best practices in our employees).
 
 ### Step 7: Set up scheduled submit
@@ -115,10 +115,14 @@ For an efficient company, we recommend setting up [Scheduled Submit](https://com
 
 Between Expensify's SmartScan technology, automatic categorization, and [DoubleCheck](https://community.expensify.com/discussion/5738/deep-dive-how-does-concierge-receipt-audit-work) features, your employees shouldn't need to do anything more than swipe their Expensify Card or take a photo of  their receipt.
 
-Expenses with violations will stay behind for the employee to fix, while expenses that are “in-policy” will move into an approver’s queue to mitigate any potential for delays. Scheduled Submit will ensure all expenses are submitted automatically for approval. 
+Expenses with violations will stay behind for the employee to fix, while expenses that are “in-policy” will move into an approver’s queue to mitigate any potential for delays. Scheduled Submit will ensure all expenses are submitted automatically for approval.
 
-*“We spent twice as much time and effort on expenses without getting nearly as accurate of results as with Expensify.”*
-- Kevin Valuska. AP/AR at Road Trippers
+![Scheduled submit](https://help.expensify.com/assets/images/playbook-scheduled-submit.png)
+
+> _We spent twice as much time and effort on expenses without getting nearly as accurate of results as with Expensify._
+> 
+> Kevin Valuska  
+> AP/AR at Road Trippers
 
 ### Step 8: Connect your business bank account (US only)
 If you’re located in the US, you can utilize Expensify’s payment processing and reimbursement features. 
@@ -147,6 +151,8 @@ We recommend you select *Advanced Approval* as your Approval Mode to set up a mi
 *Import your employees in bulk via CSV*
 Given the amount of employees you have, it’s best you import employees in bulk via CSV. You can learn more about using a CSV file to bulk upload employees with *Advanced Approval [here](https://community.expensify.com/discussion/5735/deep-dive-the-ins-and-outs-of-advanced-approval)*
 
+![Bulk import your employees](https://help.expensify.com/assets/images/playbook-impoort-employees.png)
+
 *Manually Approve All Reports*
 In most cases, at this stage, approvers prefer to review all expenses for a few reasons. 1) We want to make sure expense coding is accurate, and 2) We want to make sure there are no bad actors before we export transactions to our accounting system. 
 
@@ -176,6 +182,8 @@ Expensify supports direct card feeds from most financial institutions. Setting u
 3. Next, assign the corporate cards to your employees by selecting the employee’s email address and the corresponding card number from the two drop-down menus under the *Assign a Card* section
 4. Set a transaction start date (this is really important to avoid pulling in multiple outdated historical expenses that you don’t want employees to submit)
 
+![If you have existing corporate cards](https://help.expensify.com/assets/images/playbook-existing-corporate-card.png)
+
 As mentioned above, we’ll be able to pull in transactions as they post (daily) and handle receipt matching for you and your employees. One benefit of the Expensify Card for your company is being able to see transactions at the point of purchase which provides you with real-time compliance. We even send users push notifications to SmartScan their receipt when it’s required and generate IRS-compliant e-receipts as a backup wherever applicable. 
 
 #### If you don't have a corporate card, use the Expensify Card (US only)
@@ -227,6 +235,8 @@ Similarly, you can send bills directly from Expensify as well.
 3. At this point, you can also upload an attachment to further validate the bill if necessary
 4. Click *Submit*, we’ll forward the newly created bill directly to your Supplier.
 
+![Send bills directly from Expensify](https://help.expensify.com/assets/images/playbook-new-bill.png)
+
 Reports, invoices, and bills are largely the same, in theory, just with different rules. As such, creating a customer invoice is just like creating an expense report and even a bill.
 
 1. From the *Reports* tab, select the down arrow next to *New Report* and select *Invoice*.
@@ -248,7 +258,7 @@ We recommend reporting:
 - *Quarterly* - for budget comparison reporting. Pull up your BI tool and compare your active budgets with your spend reporting here in Expensify
 - *Annually* - Run annual spend trend reports with month-over-month spend analysis, and prepare yourself for the upcoming fiscal year.
 
-
+![Expenses!](https://help.expensify.com/assets/images/playbook-expenses.png)
 
 ### Step 14: Set your Subscription Size and Add a Payment card
 Our pricing model is unique in the sense that you are in full control of your billing. Meaning, you have the ability to set a minimum number of employees you know will be active each month and you can choose which level of commitment fits best. We recommend setting your subscription to *Annual* to get an additional 50% off on your monthly Expensify bill. In the end, you've spent enough time getting your company fully set up with Expensify, and you've seen how well it supports you and your employees. Committing annually just makes sense. 

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 Businesses* if you are more concerned with maintaining profitability than growing top-line revenue. [Coming soon…]
+- 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.
 
 # 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.

ios/NewExpensify/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.5</string>
+	<string>1.3.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.5.6</string>
+	<string>1.3.6.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.5</string>
+	<string>1.3.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.5.6</string>
+	<string>1.3.6.0</string>
 </dict>
 </plist>