Merge branch 'main' into marco-approveButtonCollectPolicies

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,8 +18,8 @@ $ https://github.com/Expensify/App/issues/<issueID(comment)>
 
 Do NOT only link the issue number like this: $ #<issueID>
 --->
-$ 
-PROPOSAL: 
+$
+PROPOSAL:
 
 
 ### Tests
@@ -98,7 +98,7 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
     - [ ] The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
 - [ ] If a new CSS style is added I verified that:
     - [ ] A similar style doesn't already exist
-    - [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)`)
+    - [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/utils/index.ts) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)`)
 - [ ] If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
 - [ ] If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like `Avatar` is modified, I verified that `Avatar` is working as expected in all cases)
 - [ ] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.

.imgbotconfig

@@ -1,7 +1,7 @@
 {
     "ignoredFiles": [
-        "assets/images/empty-state_background-fade-dark.png", // Caused an issue with colour gradients, https://github.com/Expensify/App/issues/30499
-        "assets/images/empty-state_background-fade-light.png"
+        "assets/images/themeDependent/empty-state_background-fade-dark.png", // Caused an issue with colour gradients, https://github.com/Expensify/App/issues/30499
+        "assets/images/themeDependent/empty-state_background-fade-light.png"
     ],
     "aggressiveCompression": "false"
 }

.storybook/public/index.css

@@ -24,5 +24,5 @@ a.sidebar-item[data-selected="true"], a.sidebar-item[data-selected="true"]:focus
 }
 
 .sidebar-container {
-    background: #07271f;
+    background: #072419;
 }

.storybook/theme.js

@@ -7,17 +7,17 @@ export default create({
     fontBase: 'ExpensifyNeue-Regular',
     fontCode: 'monospace',
     base: 'dark',
-    appBg: colors.darkHighlightBackground,
-    colorPrimary: colors.darkDefaultButton,
+    appBg: colors.productDark200,
+    colorPrimary: colors.productDark400,
     colorSecondary: colors.green,
-    appContentBg: colors.darkAppBackground,
-    textColor: colors.darkPrimaryText,
-    barTextColor: colors.darkPrimaryText,
+    appContentBg: colors.productDark100,
+    textColor: colors.productDark900,
+    barTextColor: colors.productDark900,
     barSelectedColor: colors.green,
-    barBg: colors.darkAppBackground,
-    appBorderColor: colors.darkBorders,
-    inputBg: colors.darkHighlightBackground,
-    inputBorder: colors.darkBorders,
+    barBg: colors.productDark100,
+    appBorderColor: colors.productDark400,
+    inputBg: colors.productDark200,
+    inputBorder: colors.productDark400,
     appBorderRadius: 8,
     inputBorderRadius: 8,
 });

android/app/build.gradle

@@ -91,8 +91,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001040902
-        versionName "1.4.9-2"
+        versionCode 1001041101
+        versionName "1.4.11-1"
     }
 
     flavorDimensions "default"

contributingGuides/NAVIGATION.md

@@ -40,7 +40,17 @@ When creating RHP flows, you have to remember a couple things:
 
 An example of adding `Settings_Workspaces` page:
 
-1. Add path to `ROUTES.ts`: https://github.com/Expensify/App/blob/main/src/ROUTES.ts
+1. Add the page name to `SCREENS.ts` which will be reused throughout the app (linkingConfig, navigators, etc.):
+
+```ts
+const SCREENS = {
+    SETTINGS: {
+        WORKSPACES: 'Settings_Workspaces',
+    },
+} as const;
+```
+
+2. Add path to `ROUTES.ts`: https://github.com/Expensify/App/blob/main/src/ROUTES.ts
 
 ```ts
 export const ROUTES = {
@@ -55,11 +65,11 @@ export const ROUTES = {
 
 ```
 
-2. Add `Settings_Workspaces` page to proper RHP flow in `linkingConfig.ts`: https://github.com/Expensify/App/blob/3531af22dcadaa94ed11eccf370517dca0b8c305/src/libs/Navigation/linkingConfig.js#L40-L42
+3. Add `Settings_Workspaces` page to proper RHP flow in `linkingConfig.ts`: https://github.com/Expensify/App/blob/fbc11ca729ffa4676fb3bc8cd110ac3890debff6/src/libs/Navigation/linkingConfig.ts#L47-L50
 
-3. Add your page to proper navigator (it should be aligned with where you've put it in the previous step) https://github.com/Expensify/App/blob/3531af22dcadaa94ed11eccf370517dca0b8c305/src/libs/Navigation/AppNavigator/ModalStackNavigators.js#L334-L338
+4. Add your page to proper navigator (it should be aligned with where you've put it in the previous step) https://github.com/Expensify/App/blob/fbc11ca729ffa4676fb3bc8cd110ac3890debff6/src/libs/Navigation/AppNavigator/ModalStackNavigators.js#L141
 
-4. Make sure `HeaderWithBackButton` leads to the previous page in navigation flow of your page: https://github.com/Expensify/App/blob/3531af22dcadaa94ed11eccf370517dca0b8c305/src/pages/workspace/WorkspacesListPage.js#L186
+5. Make sure `HeaderWithBackButton` leads to the previous page in navigation flow of your page: https://github.com/Expensify/App/blob/3531af22dcadaa94ed11eccf370517dca0b8c305/src/pages/workspace/WorkspacesListPage.js#L186
 
 ## Performance solutions
 

contributingGuides/REVIEWER_CHECKLIST.md

@@ -46,7 +46,7 @@
     - [ ] The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
 - [ ] If a new CSS style is added I verified that:
     - [ ] A similar style doesn't already exist
-    - [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(theme.componentBG`)
+    - [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/utils/index.ts) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(theme.componentBG`)
 - [ ] If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
 - [ ] If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like `Avatar` is modified, I verified that `Avatar` is working as expected in all cases)
 - [ ] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.

docs/_includes/footer.html

@@ -111,6 +111,8 @@ <h3>Get Started</h3>
             </div>
         </div>
 
+        <p class="page-footer__fine-print">The Expensify Visa® Commercial Card is issued by The Bancorp Bank, N.A., Member FDIC, pursuant to a license from Visa U.S.A. Inc. and may not be used at all merchants that accept Visa cards. Apple® and the Apple logo® are trademarks of Apple Inc., registered in the U.S. and other countries. App Store is a service mark of Apple Inc. Google Play and the Google Play logo are trademarks of Google LLC.</p>
+
         <div class="page-footer__logo">
             <img src="/assets/images/expensify-footer-logo.svg" alt="Expensify" />
         </div>

docs/_sass/_colors.scss

@@ -1,14 +1,36 @@
-$color-green400: #03D47C;
-$color-green-icons: #8B9C8F;
-$color-green-borders: #1A3D32;
-$color-button-background: #1A3D32;
-$color-button-hovered: #2C6755;
-$color-green-highlightBG: #07271F;
-$color-green-highlightBG-hover: #06231c;
-$color-green-appBG: #061B09;
-$color-green-hover: #00a862;
-$color-light-gray-green: #AFBBB0;
-$color-blue300: #5AB0FF;
+// Product Color Spectrum
+$color-product-dark-100: #061B09;
+$color-product-dark-200: #072419;
+$color-product-dark-300: #0A2E25;
+$color-product-dark-400: #1A3D32;
+$color-product-dark-500: #224F41;
+$color-product-dark-600: #2A604F;
+$color-product-dark-700: #8B9C8F;
+$color-product-dark-800: #AFBBB0;
+$color-product-dark-900: #E7ECE9;
+
+// Colors for Links and Success
 $color-blue200: #B0D9FF;
-$color-white: #E7ECE9;
-$color-gray-label: #afbbb0;
+$color-blue300: #5AB0FF;
+$color-green400: #03D47C;
+$color-green500: #00a862;
+
+// Overlay BG color
+$color-overlay-background: rgba(26, 61, 50, 0.72);
+
+// UI Colors
+$color-text: $color-product-dark-900;
+$color-text-supporting: $color-product-dark-800;
+$color-icons: $color-product-dark-700;
+$color-borders: $color-product-dark-400;
+$color-highlightBG: $color-product-dark-200;
+$color-row-hover: $color-product-dark-300;
+$color-appBG: $color-product-dark-100;
+$color-success: $color-green400;
+$color-accent : $color-green400;
+$color-link: $color-blue300;
+$color-link-hovered: $color-blue200;
+$color-button-background: $color-product-dark-400;
+$color-button-background-hover: $color-product-dark-500;
+$color-button-success-background: $color-green400;
+$color-button-success-background-hover: $color-green500;

docs/_sass/_main.scss

@@ -3,19 +3,6 @@
 @import 'fonts';
 @import 'search-bar';
 
-$color-appBG: $color-green-appBG;
-$color-highlightBG: $color-green-highlightBG;
-$color-accent : $color-green400;
-$color-borders: $color-green-borders;
-$color-icons: $color-green-icons;
-$color-text: $color-white;
-$color-link: $color-blue300;
-$color-link-hovered: $color-blue200;
-$color-success: $color-green400;
-$color-text-supporting: $color-light-gray-green;
-$color-green-hover: $color-green-hover;
-$color-gray-label: $color-gray-label;
-
 * {
     margin: 0;
     padding: 0;
@@ -78,6 +65,7 @@ body {
     height: 100%;
     min-height: 100%;
     background: $color-appBG;
+    color: $color-text-supporting;
 }
 
 hr {
@@ -148,7 +136,7 @@ textarea {
     font-weight: 400;
     font-family: "ExpensifyNeue", "Helvetica Neue", "Helvetica", Arial, sans-serif;
     font-size: 16px;
-    color: $color-text;
+    color: $color-text-supporting;
 }
 
 button {
@@ -159,15 +147,15 @@ button {
     font-weight: bold;
 
     &.success {
-        background-color: $color-success;
+        background-color: $color-button-success-background;
         color: $color-text;
         width: 100%;
         border-radius: 100px;
         padding-left: 20px;
         padding-right: 20px;
 
         &:hover {
-            background-color: desaturate($color-success, 15%);
+            background-color: $color-button-success-background-hover;
             cursor: pointer;
         }
 
@@ -262,13 +250,15 @@ button {
 
     .lhn-header {
         padding: 24px;
+
         @include breakpoint($breakpoint-tablet) {
             padding: 44px;
         }
 
         #header-button {
             display: block;
             padding-right: 24px;
+
             @include breakpoint($breakpoint-tablet) {
                 display: none;
             }
@@ -282,7 +272,7 @@ button {
             margin-right: auto;
 
             @include breakpoint($breakpoint-desktop) {
-                width: 210px;
+                width: 180px;
                 align-content: normal;
                 display: flex;
                 margin-left: 0;
@@ -372,7 +362,7 @@ button {
             // Box shadow is used here because border-radius and border-collapse don't work together. It leads to double borders.
             // https://stackoverflow.com/questions/628301/the-border-radius-property-and-border-collapsecollapse-dont-mix-how-can-i-use
             border-style: hidden;
-            box-shadow: 0 0 0 1px $color-green-borders;
+            box-shadow: 0 0 0 1px $color-borders;
         }
 
         th:first-child {
@@ -394,12 +384,12 @@ button {
         th,
         td {
             padding: 6px 13px;
-            border: 1px solid $color-green-borders;
+            border: 1px solid $color-borders;
         }
 
         thead tr th {
             font-weight: bold;
-            background-color: $color-green-highlightBG;
+            background-color: $color-highlightBG;
         }
 
         .img-wrap {
@@ -457,11 +447,11 @@ button {
 
 .link {
     display: inline;
-    color: $color-link;
+    color: $color-text-supporting;
     cursor: pointer;
 
     &:hover {
-        color: $color-link-hovered;
+        color: $color-link;
     }
 }
 
@@ -530,7 +520,7 @@ button {
     background-color: $color-highlightBG;
 
     &:hover {
-        background-color: darken($color-highlightBG, 1%);
+        background-color: $color-row-hover;
     }
 
     .row {
@@ -629,13 +619,14 @@ button {
     }
 
     p.description {
+        color: $color-text-supporting;
         padding: 20px 0 20px 0;
     }
 
     p.url {
         padding: 0;
         font-size: 0.8em;
-        color: $color-gray-label;
+        color: $color-text-supporting;
     }
 }
 
@@ -739,7 +730,7 @@ button {
 
 .get-help {
     flex-wrap: wrap;
-    margin-top: auto;
+    margin-top: 40px;
 }
 
 .floating-concierge-button {
@@ -773,9 +764,12 @@ button {
 
     h3 {
         color: $color-success;
+        font-family: "ExpensifyNewKansas", "Helvetica Neue", "Helvetica", Arial, sans-serif;
         font-size: 17px;
-        font-weight: 700;
+        font-weight: 500;
+        padding: 0;
         margin-bottom: 16px;
+        margin-top: 0;
     }
 
     ul {
@@ -787,13 +781,13 @@ button {
             margin: 0 0 8px;
 
             a {
-                color: $color-text;
+                color: $color-text-supporting;
                 display: block;
                 padding: 4px 0;
                 word-break: break-word;
 
                 &:hover {
-                    color: $color-success;
+                    color: $color-link;
                 }
             }
         }
@@ -803,11 +797,11 @@ button {
         padding-bottom: 20px;
 
         a {
-            color: $color-text;
+            color: $color-text-supporting;
             display: inline-block;
 
             &:hover {
-                color: $color-success;
+                color: $color-link;
             }
         }
     }