Merge branch 'Expensify:main' into arrow-feature-signed

Expensify · Jan 15, 2023 · 77eb354 · 77eb354
2 parents d286d16 + 7ca2979
commit 77eb354
Show file tree

Hide file tree

Showing 92 changed files with 915 additions and 627 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -82,6 +82,7 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
     - [ ] I verified that comments were added to code that is not self explanatory
     - [ ] I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
     - [ ] I verified any copy / text shown in the product is localized by adding it to `src/languages/*` files and using the [translation method](https://github.com/Expensify/App/blob/4bd99402cebdf4d7394e0d1f260879ea238197eb/src/components/withLocalize.js#L60)
+      - [ ] If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
     - [ ] I verified all numbers, amounts, dates and phone numbers shown in the product are using the [localization methods](https://github.com/Expensify/App/blob/4bd99402cebdf4d7394e0d1f260879ea238197eb/src/components/withLocalize.js#L60-L68)
     - [ ] I verified any copy / text that was added to the app is correct English and approved by marketing by adding the `Waiting for Copy` label for a copy review on the original GH to get the correct copy.
     - [ ] I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001025204
-        versionName "1.2.52-4"
+        versionCode 1001025402
+        versionName "1.2.54-2"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/contributingGuides/CONTRIBUTING.md b/contributingGuides/CONTRIBUTING.md
@@ -59,6 +59,8 @@ 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. 
+
 ## 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:
 

diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
@@ -211,7 +211,9 @@ GEM
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.16.2)
-    nokogiri (1.13.6-x86_64-darwin)
+    nokogiri (1.13.10-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.10-x86_64-darwin)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
@@ -253,7 +255,7 @@ GEM
     zeitwerk (2.6.0)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
   x86_64-darwin-20
   x86_64-darwin-21
 
@@ -268,4 +270,4 @@ DEPENDENCIES
   webrick (~> 1.7)
 
 BUNDLED WITH
-   2.3.17
+   2.4.3
diff --git a/docs/_includes/lhn-article-link.html b/docs/_includes/lhn-article-link.html
@@ -1,5 +1,5 @@
 <li>
-    <a href="/articles/{{ include.hub }}/{{ include.href }}">
+    <a href="/articles/{{ include.hub }}/{{ include.href }}" class="link">
         {{ include.title }}
     </a>
 </li>
diff --git a/docs/_includes/lhn-template.html b/docs/_includes/lhn-template.html
@@ -5,7 +5,7 @@
         {% if page.url == "/" %}
             <div class="selected">Home</div>
         {% else %}
-            <a href="/">Home</a>
+            <a href="/" class="link">Home</a>
         {% endif %}
     </li>
 
@@ -20,7 +20,7 @@
                     <!-- First display sections with nested articles -->
                     {% for section in hub.sections %}
                         <li>
-                            <a href="#{{ section.href }}">{{ section.title }}</a>
+                            <a href="#{{ section.href }}" class="link">{{ section.title }}</a>
                             <ul>
                                 {% for article in section.articles %}
                                     {% include lhn-article-link.html hub=hub.href href=article.href title=article.title %}
@@ -37,7 +37,7 @@
             </li>
         {% else %}
             <li>
-                <a href="/hubs/{{ hub.href }}" class="icon-with-link">
+                <a href="/hubs/{{ hub.href }}" class="icon-with-link link">
                     <i class="fa-solid fa-angle-right icon"></i>
                     {{ hub.title }}
                 </a>

diff --git a/docs/_sass/_colors.scss b/docs/_sass/_colors.scss
@@ -12,3 +12,6 @@ $color-dark-green: #1B5744;
 $color-darker-green: #002E22;
 $color-super-dark-green: #061B09;
 $color-light-blue: #8DC8FF;
+
+$color-link: #5AB0FF;
+$color-link-hovered: #B0D9FF;
diff --git a/docs/_sass/_fonts.scss b/docs/_sass/_fonts.scss
@@ -12,6 +12,20 @@
   src: url('/assets/fonts/ExpensifyNeue-Bold.woff2') format('woff2'), url('/assets/fonts/ExpensifyNeue-Bold.woff') format('woff');
 }
 
+@font-face {
+  font-family: ExpensifyNewKansas;
+  font-weight: 500;
+  font-style: normal;
+  src: url('/assets/fonts/ExpensifyNewKansas-Medium.woff2') format('woff2'), url('/assets/fonts/ExpensifyNewKansas-Medium.woff') format('woff');
+}
+
+@font-face {
+  font-family: ExpensifyNewKansas;
+  font-weight: 500;
+  font-style: italic;
+  src: url('/assets/fonts/ExpensifyNewKansas-MediumItalic.woff2') format('woff2'), url('/assets/fonts/ExpensifyNewKansas-MediumItalic.woff') format('woff');
+}
+
 * {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
@@ -112,6 +112,8 @@ h6 {
 }
 
 h1 {
+    font-family: "ExpensifyNewKansas", "Helvetica Neue", "Helvetica", Arial, sans-serif;
+    font-weight: 500;
     font-size: larger;
 }
 
@@ -350,8 +352,12 @@ button {
 
 .link {
     display: inline;
-    color: $color-light-blue;
+    color: $color-link;
     cursor: pointer;
+
+    &:hover {
+        color: $color-link-hovered;
+    }
 }
 
 .lhn-items {
@@ -395,13 +401,13 @@ button {
     padding-bottom: 20px;
 
     @include breakpoint($breakpoint-desktop) {
-        grid-template-columns: auto auto;
+        grid-template-columns: 50% 50%;
     }
 }
 
 .card {
     display: flex;
-    flex-wrap: wrap;
+    flex-wrap: nowrap;
     border-radius: 16px;
     padding: 28px;
     font-weight: 700;
@@ -569,6 +575,7 @@ button {
 }
 
 .get-help {
+    flex-wrap: wrap;
     margin-top: auto;
 }
 

diff --git a/docs/assets/fonts/ExpensifyNewKansas-Medium.woff b/docs/assets/fonts/ExpensifyNewKansas-Medium.woff
diff --git a/docs/assets/fonts/ExpensifyNewKansas-Medium.woff2 b/docs/assets/fonts/ExpensifyNewKansas-Medium.woff2
diff --git a/docs/assets/fonts/ExpensifyNewKansas-MediumItalic.woff b/docs/assets/fonts/ExpensifyNewKansas-MediumItalic.woff
diff --git a/docs/assets/fonts/ExpensifyNewKansas-MediumItalic.woff2 b/docs/assets/fonts/ExpensifyNewKansas-MediumItalic.woff2
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.52</string>
+	<string>1.2.54</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.52.4</string>
+	<string>1.2.54.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</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.2.52</string>
+	<string>1.2.54</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.52.4</string>
+	<string>1.2.54.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.52-4",
+  "version": "1.2.54-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -69,7 +69,7 @@
     "babel-polyfill": "^6.26.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "git+https://github.com/Expensify/expensify-common.git#55c208315e04246b548a4009d35466c100d9de7c",
+    "expensify-common": "git+https://github.com/Expensify/expensify-common.git#6657a014d9c295c998d98562806b4df8bc9fd17e",
     "fbjs": "^3.0.2",
     "file-loader": "^6.0.0",
     "html-entities": "^1.3.1",

diff --git a/src/CONST.js b/src/CONST.js
@@ -46,6 +46,7 @@ const CONST = {
     DATE: {
         MOMENT_FORMAT_STRING: 'YYYY-MM-DD',
         UNIX_EPOCH: '1970-01-01 00:00:00.000',
+        MAX_DATE: '9999-12-31',
     },
     SMS: {
         DOMAIN: '@expensify.sms',
@@ -253,6 +254,7 @@ const CONST = {
     FEES_URL: `${USE_EXPENSIFY_URL}/fees`,
     CFPB_PREPAID_URL: 'https://cfpb.gov/prepaid',
     STAGING_NEW_EXPENSIFY_URL: 'https://staging.new.expensify.com',
+    NEWHELP_URL: 'https://help.expensify.com',
 
     // Use Environment.getEnvironmentURL to get the complete URL with port number
     DEV_NEW_EXPENSIFY_URL: 'http://localhost:',

diff --git a/src/Expensify.js b/src/Expensify.js
@@ -120,23 +120,18 @@ class Expensify extends PureComponent {
         this.appStateChangeListener = AppState.addEventListener('change', this.initializeClient);
     }
 
-    componentDidUpdate(prevProps) {
-        const previousAccountID = lodashGet(prevProps, 'session.accountID', null);
-        const currentAccountID = lodashGet(this.props, 'session.accountID', null);
-
-        if (currentAccountID && (currentAccountID !== previousAccountID)) {
-            PushNotification.register(currentAccountID);
+    componentDidUpdate() {
+        if (!this.state.isNavigationReady || !this.state.isSplashShown) {
+            return;
         }
 
-        if (this.state.isNavigationReady && this.state.isSplashShown) {
-            const shouldHideSplash = !this.isAuthenticated() || this.props.isSidebarLoaded;
+        const shouldHideSplash = !this.isAuthenticated() || this.props.isSidebarLoaded;
 
-            if (shouldHideSplash) {
-                BootSplash.hide();
+        if (shouldHideSplash) {
+            BootSplash.hide();
 
-                // eslint-disable-next-line react/no-did-update-set-state
-                this.setState({isSplashShown: false});
-            }
+            // eslint-disable-next-line react/no-did-update-set-state
+            this.setState({isSplashShown: false});
         }
     }
 

diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js
@@ -112,9 +112,6 @@ export default {
     // Stores information about additional details form entry
     WALLET_ADDITIONAL_DETAILS: 'walletAdditionalDetails',
 
-    // Stores values put into the additional details step of the wallet KYC flow
-    WALLET_ADDITIONAL_DETAILS_DRAFT: 'walletAdditionalDetailsDraft',
-
     // Object containing Wallet terms step state
     WALLET_TERMS: 'walletTerms',