Merge branch 'main' into georgia-addLightTheme

Expensify · Sep 13, 2023 · f2282b2 · f2282b2
2 parents d69265c + 1baf33a
commit f2282b2
Show file tree

Hide file tree

Showing 63 changed files with 912 additions and 259 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
  minSdkVersion rootProject.ext.minSdkVersion
  targetSdkVersion rootProject.ext.targetSdkVersion
  multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001036815
- versionName "1.3.68-15"
+ versionCode 1001036900
+ versionName "1.3.69-0"
  }
 
  flavorDimensions "default"

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
- <string>1.3.68</string>
+ <string>1.3.69</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
  </dict>
  </array>
  <key>CFBundleVersion</key>
- <string>1.3.68.15</string>
+ <string>1.3.69.0</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.3.68</string>
+ <string>1.3.69</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>
- <string>1.3.68.15</string>
+ <string>1.3.69.0</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.3.68-15",
+ "version": "1.3.69-0",
  "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.",
@@ -51,6 +51,7 @@
  },
  "dependencies": {
  "@expensify/react-native-web": "0.18.15",
+ "@formatjs/intl-datetimeformat": "^6.10.0",
  "@formatjs/intl-getcanonicallocales": "^2.2.0",
  "@formatjs/intl-listformat": "^7.2.2",
  "@formatjs/intl-locale": "^3.3.0",
@@ -88,6 +89,7 @@
  "domhandler": "^4.3.0",
  "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#35bff866a8d345b460ea6256f0a0f0a8a7f81086",
  "fbjs": "^3.0.2",
+ "focus-trap-react": "^10.2.1",
  "htmlparser2": "^7.2.0",
  "idb-keyval": "^6.2.1",
  "jest-when": "^3.5.2",
@@ -125,7 +127,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.72",
+ "react-native-onyx": "1.0.76",
  "react-native-pager-view": "^6.2.0",
  "react-native-pdf": "^6.7.1",
  "react-native-performance": "^4.0.0",

diff --git a/src/CONST.ts b/src/CONST.ts
@@ -1090,6 +1090,29 @@ const CONST = {
  DEFAULT: 'en',
  },
 
+ LANGUAGES: ['en', 'es'],
+
+ PRONOUNS_LIST: [
+ 'coCos',
+ 'eEyEmEir',
+ 'heHimHis',
+ 'heHimHisTheyThemTheirs',
+ 'sheHerHers',
+ 'sheHerHersTheyThemTheirs',
+ 'merMers',
+ 'neNirNirs',
+ 'neeNerNers',
+ 'perPers',
+ 'theyThemTheirs',
+ 'thonThons',
+ 'veVerVis',
+ 'viVir',
+ 'xeXemXyr',
+ 'zeZieZirHir',
+ 'zeHirHirs',
+ 'callMeByMyName',
+ ],
+
  POLICY: {
  TYPE: {
  FREE: 'free',
@@ -1661,6 +1684,61 @@ const CONST = {
  ZW: 'Zimbabwe',
  },
 
+ ALL_US_ISO_STATES: [
+ 'AK',
+ 'AL',
+ 'AR',
+ 'AZ',
+ 'CA',
+ 'CO',
+ 'CT',
+ 'DE',
+ 'FL',
+ 'GA',
+ 'HI',
+ 'IA',
+ 'ID',
+ 'IL',
+ 'IN',
+ 'KS',
+ 'KY',
+ 'LA',
+ 'MA',
+ 'MD',
+ 'ME',
+ 'MI',
+ 'MN',
+ 'MO',
+ 'MS',
+ 'MT',
+ 'NC',
+ 'ND',
+ 'NE',
+ 'NH',
+ 'NJ',
+ 'NM',
+ 'NV',
+ 'NY',
+ 'OH',
+ 'OK',
+ 'OR',
+ 'PA',
+ 'PR',
+ 'RI',
+ 'SC',
+ 'SD',
+ 'TN',
+ 'TX',
+ 'UT',
+ 'VA',
+ 'VT',
+ 'WA',
+ 'WI',
+ 'WV',
+ 'WY',
+ 'DC',
+ ],
+
  // Sources: https://github.com/Expensify/App/issues/14958#issuecomment-1442138427
  // https://github.com/Expensify/App/issues/14958#issuecomment-1456026810
  COUNTRY_ZIP_REGEX_DATA: {

diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
@@ -25,7 +25,6 @@ import HeaderGap from './HeaderGap';
 import SafeAreaConsumer from './SafeAreaConsumer';
 import addEncryptedAuthTokenToURL from '../libs/addEncryptedAuthTokenToURL';
 import reportPropTypes from '../pages/reportPropTypes';
-import tryResolveUrlFromApiRoot from '../libs/tryResolveUrlFromApiRoot';
 
 /**
  * Modal render prop component that exposes modal launching triggers that can be used
@@ -351,7 +350,7 @@ function AttachmentModal(props) {
  <AttachmentCarousel
  report={props.report}
  onNavigate={onNavigate}
- source={tryResolveUrlFromApiRoot(props.source)}
+ source={props.source}
  onClose={closeModal}
  onToggleKeyboard={updateConfirmButtonVisibility}
  setDownloadButtonVisibility={setDownloadButtonVisibility}