Skip to content

Commit 3352cc8

Browse files
BeamanatorBeamanator
committed
Merge branch 'main' of github.com:Expensify/App into beaman-removePolicyExpenseChatBeta
2 parents 0364988 + 6609308 commit 3352cc8

File tree

77 files changed

+2417
-822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2417
-822
lines changed

‎.github/actions/composite/buildAndroidAPK/action.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ runs:
1111
steps:
1212
- uses: Expensify/App/.github/actions/composite/setupNode@main
1313

14-
- name: Setup credentails for Mapbox SDK
15-
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
16-
shell: bash
17-
1814
- uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
1915
with:
2016
ruby-version: '2.7'

‎.github/workflows/README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ The GitHub workflows require a large list of secrets to deploy, notify and test
104104
1. `APPLE_DEMO_PASSWORD` - Demo account password used for https://appstoreconnect.apple.com/
105105
1. `BROWSERSTACK` - Used to access Browserstack's API
106106

107+
### Important note about Secrets
108+
Secrets are available by default in most workflows. The exception to the rule is callable workflows. If a workflow is triggered by the `workflow_call` event, it will only have access to repo secrets if the workflow that called it passed in the secrets explicitly (for example, using `secrets: inherit`).
109+
110+
Furthermore, secrets are not accessible in actions. If you need to access a secret in an action, you must declare it as an input and pass it in. GitHub _should_ still obfuscate the value of the secret in workflow run logs.
111+
107112
## Actions
108113

109114
All these _workflows_ are comprised of atomic _actions_. Most of the time, we can use pre-made and independently maintained actions to create powerful workflows that meet our needs. However, when we want to do something very specific or have a more complex or robust action in mind, we can create our own _actions_.
@@ -144,4 +149,4 @@ In order to bundle actions with their dependencies into a single Node.js executa
144149
Do not try to use a relative path.
145150
- Confusingly, paths in action metadata files (`action.yml`) _must_ use relative paths.
146151
- You can't use any dynamic values or environment variables in a `uses` statement
147-
- In general, it is a best practice to minimize any side-effects of each action. Using atomic ("dumb") actions that have a clear and simple purpose will promote reuse and make it easier to understand the workflows that use them.
152+
- In general, it is a best practice to minimize any side-effects of each action. Using atomic ("dumb") actions that have a clear and simple purpose will promote reuse and make it easier to understand the workflows that use them.

‎.github/workflows/deployExpensifyHelp.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,27 @@ jobs:
2828
steps:
2929
- name: Checkout
3030
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
31+
3132
- name: Setup NodeJS
3233
uses: Expensify/App/.github/actions/composite/setupNode@main
34+
3335
- name: Setup Pages
3436
uses: actions/configure-pages@f156874f8191504dae5b037505266ed5dda6c382
37+
3538
- name: Create docs routes file
3639
run: ./.github/scripts/createDocsRoutes.sh
40+
3741
- name: Build with Jekyll
3842
uses: actions/jekyll-build-pages@0143c158f4fa0c5dcd99499a5d00859d79f70b0e
3943
with:
4044
source: ./docs/
4145
destination: ./docs/_site
46+
4247
- name: Upload artifact
4348
uses: actions/upload-pages-artifact@64bcae551a7b18bcb9a09042ddf1960979799187
4449
with:
4550
path: ./docs/_site
4651

47-
4852
# Deployment job
4953
deploy:
5054
environment:

‎.github/workflows/e2ePerformanceTests.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ jobs:
4646
git fetch origin tag ${{ steps.getMostRecentRelease.outputs.VERSION }} --no-tags --depth=1
4747
git switch --detach ${{ steps.getMostRecentRelease.outputs.VERSION }}
4848
49+
- name: Configure MapBox SDK
50+
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
51+
4952
- name: Build APK
5053
if: ${{ !fromJSON(steps.checkForExistingArtifact.outputs.exists) }}
5154
uses: Expensify/App/.github/actions/composite/buildAndroidAPK@main
@@ -112,6 +115,9 @@ jobs:
112115
- name: Checkout "delta ref"
113116
run: git checkout ${{ steps.getDeltaRef.outputs.DELTA_REF }}
114117

118+
- name: Configure MapBox SDK
119+
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
120+
115121
- name: Build APK
116122
uses: Expensify/App/.github/actions/composite/buildAndroidAPK@main
117123
with:

‎.github/workflows/platformDeploy.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ jobs:
3636
steps:
3737
- uses: actions/checkout@v3
3838

39+
- name: Configure MapBox SDK
40+
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
41+
3942
- uses: Expensify/App/.github/actions/composite/setupNode@main
4043

4144
- uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
@@ -144,16 +147,16 @@ jobs:
144147
steps:
145148
- uses: actions/checkout@v3
146149

150+
- name: Configure MapBox SDK
151+
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
152+
147153
- uses: Expensify/App/.github/actions/composite/setupNode@main
148154

149155
- uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
150156
with:
151157
ruby-version: '2.7'
152158
bundler-cache: true
153159

154-
- name: Setup credentails for Mapbox SDK
155-
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
156-
157160
- name: Install cocoapods
158161
uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
159162
with:
@@ -244,9 +247,6 @@ jobs:
244247
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
245248
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
246249

247-
- name: Setup credentails for Mapbox SDK
248-
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
249-
250250
- name: Build web for production
251251
if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
252252
run: npm run build

‎.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ jobs:
4242
name: Storybook tests
4343
steps:
4444
- uses: actions/checkout@v3
45+
4546
- uses: Expensify/App/.github/actions/composite/setupNode@main
47+
4648
- name: Storybook run
4749
run: npm run storybook -- --smoke-test --ci
4850

‎.github/workflows/testBuild.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
104104
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
105105

106-
- name: Setup credentails for Mapbox SDK
106+
- name: Configure MapBox SDK
107107
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
108108

109109
- name: Run Fastlane beta test
@@ -151,9 +151,6 @@ jobs:
151151
ruby-version: '2.7'
152152
bundler-cache: true
153153

154-
- name: Setup credentails for Mapbox SDK
155-
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
156-
157154
- name: Install cocoapods
158155
uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
159156
with:
@@ -177,6 +174,9 @@ jobs:
177174
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
178175
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
179176

177+
- name: Configure MapBox SDK
178+
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
179+
180180
- name: Run Fastlane
181181
run: bundle exec fastlane ios build_internal
182182
env:

‎.github/workflows/verifyPodfile.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,7 @@ jobs:
1515
runs-on: macos-latest
1616
steps:
1717
- uses: actions/checkout@v3
18+
1819
- uses: Expensify/App/.github/actions/composite/setupNode@main
20+
1921
- run: ./.github/scripts/verifyPodfile.sh

‎android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ android {
9090
minSdkVersion rootProject.ext.minSdkVersion
9191
targetSdkVersion rootProject.ext.targetSdkVersion
9292
multiDexEnabled rootProject.ext.multiDexEnabled
93-
versionCode 1001035507
94-
versionName "1.3.55-7"
93+
versionCode 1001035602
94+
versionName "1.3.56-2"
9595
}
9696

9797
flavorDimensions "default"

‎docs/context.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<search_restrict_args lr="" cr="" gl="" filter="0" sort="" as_siteseach="" as_oq=""></search_restrict_args>
2626
</image_advanced_options>
2727
<search_options link_target=""></search_options>
28-
<custom_search_control_options no_results_string="Oops no results found, Please try again..."></custom_search_control_options>
28+
<custom_search_control_options no_results_string="Oops, I couldn't find that. Please try again!"></custom_search_control_options>
2929
</cse_advance_settings>
3030
<sort_by_keys label="Relevance" key=""></sort_by_keys>
3131
<sort_by_keys label="Date" key="date"></sort_by_keys>

‎ios/NewExpensify/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>1.3.55</string>
22+
<string>1.3.56</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
4040
</dict>
4141
</array>
4242
<key>CFBundleVersion</key>
43-
<string>1.3.55.7</string>
43+
<string>1.3.56.2</string>
4444
<key>ITSAppUsesNonExemptEncryption</key>
4545
<false/>
4646
<key>LSApplicationQueriesSchemes</key>

‎ios/NewExpensifyTests/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.3.55</string>
18+
<string>1.3.56</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1.3.55.7</string>
22+
<string>1.3.56.2</string>
2323
</dict>
2424
</plist>

‎package-lock.json

Lines changed: 10 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "1.3.55-7",
3+
"version": "1.3.56-2",
44
"author": "Expensify, Inc.",
55
"homepage": "https://new.expensify.com",
66
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -147,13 +147,13 @@
147147
"react-native-web-linear-gradient": "^1.1.2",
148148
"react-native-web-lottie": "^1.4.4",
149149
"react-native-webview": "^11.17.2",
150-
"react-native-x-maps": "1.0.6",
150+
"react-native-x-maps": "^1.0.9",
151151
"react-pdf": "^6.2.2",
152152
"react-plaid-link": "3.3.2",
153153
"react-web-config": "^1.0.0",
154154
"react-window": "^1.8.9",
155155
"save": "^2.4.0",
156-
"semver": "^7.3.8",
156+
"semver": "^7.5.2",
157157
"shim-keyboard-event-key": "^1.0.3",
158158
"underscore": "^1.13.1"
159159
},

‎src/CONST.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,14 @@ const CONST = {
128128
MOMENT_FORMAT_STRING: 'YYYY-MM-DD',
129129
SQL_DATE_TIME: 'YYYY-MM-DD HH:mm:ss',
130130
FNS_FORMAT_STRING: 'yyyy-MM-dd',
131+
LOCAL_TIME_FORMAT: 'hh:mm a',
132+
WEEKDAY_TIME_FORMAT: 'eeee',
133+
MONTH_DAY_ABBR_FORMAT: 'MMM d',
134+
SHORT_DATE_FORMAT: 'MM-dd',
135+
MONTH_DAY_YEAR_ABBR_FORMAT: 'MMM d, yyyy',
136+
FNS_TIMEZONE_FORMAT_STRING: "yyyy-MM-dd'T'HH:mm:ssXXX",
137+
FNS_DB_FORMAT_STRING: 'yyyy-MM-dd HH:mm:ss.SSS',
138+
LONG_DATE_FORMAT_WITH_WEEKDAY: 'eeee, MMMM d, yyyy',
131139
UNIX_EPOCH: '1970-01-01 00:00:00.000',
132140
MAX_DATE: '9999-12-31',
133141
MIN_DATE: '0001-01-01',
@@ -1028,6 +1036,9 @@ const CONST = {
10281036
AMOUNT_MAX_LENGTH: 10,
10291037
RECEIPT_STATE: {
10301038
SCANREADY: 'SCANREADY',
1039+
SCANNING: 'SCANNING',
1040+
SCANCOMPLETE: 'SCANCOMPLETE',
1041+
SCANFAILED: 'SCANFAILED',
10311042
},
10321043
FILE_TYPES: {
10331044
HTML: 'html',
@@ -2552,6 +2563,7 @@ const CONST = {
25522563
},
25532564
STATUS_TEXT_MAX_LENGTH: 100,
25542565
SF_COORDINATES: [-122.4194, 37.7749],
2566+
MAPBOX_STYLE_URL: 'mapbox://styles/expensify/cllcoiqds00cs01r80kp34tmq',
25552567
NAVIGATION: {
25562568
TYPE: {
25572569
FORCED_UP: 'FORCED_UP',

‎src/ONYXKEYS.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default {
3333
// Credentials to authenticate the user
3434
CREDENTIALS: 'credentials',
3535

36-
// Contains loading data for the IOU feature (MoneyRequestModal, IOUDetail, & IOUPreview Components)
36+
// Contains loading data for the IOU feature (MoneyRequestModal, IOUDetail, & MoneyRequestPreview Components)
3737
IOU: 'iou',
3838

3939
// Keeps track if there is modal currently visible or not
@@ -221,8 +221,9 @@ export default {
221221
NEW_TASK_FORM: 'newTaskForm',
222222
EDIT_TASK_FORM: 'editTaskForm',
223223
MONEY_REQUEST_DESCRIPTION_FORM: 'moneyRequestDescriptionForm',
224+
MONEY_REQUEST_MERCHANT_FORM: 'moneyRequestMerchantForm',
224225
MONEY_REQUEST_AMOUNT_FORM: 'moneyRequestAmountForm',
225-
MONEY_REQUEST_CREATED_FORM: 'moneyRequestCreatedForm',
226+
MONEY_REQUEST_DATE_FORM: 'moneyRequestCreatedForm',
226227
NEW_CONTACT_METHOD_FORM: 'newContactMethodForm',
227228
PAYPAL_FORM: 'payPalForm',
228229
WAYPOINT_FORM: 'waypointForm',

0 commit comments

Comments
 (0)