Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into t…

…s-migration/LinearGradient/component

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001039503
-        versionName "1.3.95-3"
+        versionCode 1001039505
+        versionName "1.3.95-5"
     }
 
     flavorDimensions "default"

assets/css/fonts.css

@@ -54,6 +54,11 @@
     src: url('/fonts/ExpensifyNewKansas-MediumItalic.woff2') format('woff2'),  url('/fonts/ExpensifyNewKansas-MediumItalic.woff') format('woff');
 }
 
+@font-face {
+    font-family: Windows Segoe UI Emoji;
+    src: url('/fonts/seguiemj.ttf');
+}
+
 * {
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;

docs/articles/expensify-classic/expense-and-report-features/Attendee-Tracking.md

@@ -11,12 +11,14 @@ Every expense has an Attendees field and will list the expense creator’s name
 ## How to Add Additional Attendees to an Expense
 * Go to the attendees field
 * Search for the names of the attendees
-    * The default list will be of internal attendees belonging to your workspace and domain.
+    * The default list will be of internal attendees belonging to your workspace and domain
     * External attendees are not part of your workspace or domain, so you will need to enter their name or email 
 * Select the attendees you would like to add 
 * Save the expense 
-* Once added, the list of attendees for each expense will be visible on the expense line.
-* An amount per employee expense will also be displayed on the report for easy viewing 
+* Once added, the list of attendees for each expense will be visible on the expense line
+* An amount per employee expense will also be displayed on the report for easy viewing
+
+![image of an expense with attendee tracking]({{site.url}}/assets/images/attendee-tracking.png){:width="100%"}
 
 # FAQ
 

docs/articles/expensify-classic/integrations/HR-integrations/Workday.md

@@ -64,6 +64,8 @@ Before completing the steps below, you will need Workday Report Writer access to
     - Note: _if there is field data you want to import that is not listed above, or you have any special requests, let your Expensify Account Manager know and we will work with you to accommodate the request._
 4. Rename the columns so they match Expensify's API key names (The full list of names are found here):
     - employeeID
+    - customField1
+    - customField2
     - firstName
     - lastName
     - employeeEmail

docs/articles/expensify-classic/manage-employees-and-report-approvals/Adding-Users.md → docs/articles/expensify-classic/manage-employees-and-report-approvals/Add-Members-to-your-Workspace.md

@@ -1,5 +1,5 @@
 ---
-title: Coming Soon
+title: Add Members to your Workspace
 description: Coming Soon
 ---
 ## Resource Coming Soon!

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.95.3</string>
+	<string>1.3.95.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.95.3</string>
+	<string>1.3.95.5</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.95-3",
+  "version": "1.3.95-5",
   "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.",
@@ -144,7 +144,7 @@
     "react-native-linear-gradient": "^2.8.1",
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "1.0.100",
+    "react-native-onyx": "1.0.111",
     "react-native-pager-view": "^6.2.0",
     "react-native-pdf": "^6.7.1",
     "react-native-performance": "^5.1.0",

src/CONST.ts

@@ -1312,6 +1312,7 @@ const CONST = {
 
         TAX_ID: /^\d{9}$/,
         NON_NUMERIC: /\D/g,
+        ANY_SPACE: /\s/g,
 
         // Extract attachment's source from the data's html string
         ATTACHMENT_DATA: /(data-expensify-source|data-name)="([^"]+)"/g,

src/components/DatePicker/index.android.js

@@ -1,5 +1,5 @@
 import RNDatePicker from '@react-native-community/datetimepicker';
-import {format} from 'date-fns';
+import {format, parseISO} from 'date-fns';
 import React, {forwardRef, useCallback, useImperativeHandle, useRef, useState} from 'react';
 import {Keyboard} from 'react-native';
 import TextInput from '@components/TextInput';
@@ -39,7 +39,7 @@ function DatePicker({value, defaultValue, label, placeholder, errorText, contain
     );
 
     const date = value || defaultValue;
-    const dateAsText = date ? format(new Date(date), CONST.DATE.FNS_FORMAT_STRING) : '';
+    const dateAsText = date ? format(parseISO(date), CONST.DATE.FNS_FORMAT_STRING) : '';
 
     return (
         <>

src/components/DatePicker/index.ios.js

@@ -1,5 +1,5 @@
 import RNDatePicker from '@react-native-community/datetimepicker';
-import {format} from 'date-fns';
+import {format, parseISO} from 'date-fns';
 import isFunction from 'lodash/isFunction';
 import React, {useCallback, useEffect, useRef, useState} from 'react';
 import {Button, Keyboard, View} from 'react-native';
@@ -77,7 +77,7 @@ function DatePicker({value, defaultValue, innerRef, onInputChange, preferredLoca
         setSelectedDate(date);
     };
 
-    const dateAsText = dateValue ? format(new Date(dateValue), CONST.DATE.FNS_FORMAT_STRING) : '';
+    const dateAsText = dateValue ? format(parseISO(dateValue), CONST.DATE.FNS_FORMAT_STRING) : '';
 
     return (
         <>

src/components/DatePicker/index.js

@@ -1,4 +1,4 @@
-import {format, isValid} from 'date-fns';
+import {format, isValid, parseISO} from 'date-fns';
 import React, {useEffect, useRef} from 'react';
 import _ from 'underscore';
 import TextInput from '@components/TextInput';
@@ -29,7 +29,7 @@ function DatePicker({maxDate, minDate, onInputChange, innerRef, label, value, pl
             return;
         }
 
-        const date = new Date(text);
+        const date = parseISO(text);
         if (isValid(date)) {
             onInputChange(format(date, CONST.DATE.FNS_FORMAT_STRING));
         }