diff --git a/.eslintrc.js b/.eslintrc.js
index 35a4a333f8af..4909a24fe797 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -79,6 +79,7 @@ module.exports = {
},
],
curly: 'error',
+ 'react/display-name': 'error',
},
},
{
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
index 9a314079362c..cd19a46b6a88 100644
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -3,3 +3,4 @@ self-hosted-runner:
labels:
- ubuntu-latest-xl
- macos-12-xl
+ - macos-13-xlarge
diff --git a/.github/actions/composite/buildAndroidAPK/action.yml b/.github/actions/composite/buildAndroidAPK/action.yml
index fc280ab2a223..4f466be84a68 100644
--- a/.github/actions/composite/buildAndroidAPK/action.yml
+++ b/.github/actions/composite/buildAndroidAPK/action.yml
@@ -11,7 +11,7 @@ runs:
steps:
- uses: Expensify/App/.github/actions/composite/setupNode@main
- - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+ - uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
with:
ruby-version: "2.7"
bundler-cache: true
diff --git a/.github/actions/composite/setupGitForOSBotifyApp/action.yml b/.github/actions/composite/setupGitForOSBotifyApp/action.yml
index bd5b5139bc6b..52fb097d254e 100644
--- a/.github/actions/composite/setupGitForOSBotifyApp/action.yml
+++ b/.github/actions/composite/setupGitForOSBotifyApp/action.yml
@@ -24,6 +24,21 @@ outputs:
runs:
using: composite
steps:
+ - name: Check if gpg encrypted private key is present
+ id: key_check
+ shell: bash
+ run: |
+ if [[ -f .github/workflows/OSBotify-private-key.asc.gpg ]]; then
+ echo "::set-output name=key_exists::true"
+ fi
+
+ - name: Checkout
+ uses: actions/checkout@v3
+ if: steps.key_check.outputs.key_exists != 'true'
+ with:
+ sparse-checkout: |
+ .github
+
- name: Decrypt OSBotify GPG key
run: cd .github/workflows && gpg --quiet --batch --yes --decrypt --passphrase=${{ inputs.GPG_PASSPHRASE }} --output OSBotify-private-key.asc OSBotify-private-key.asc.gpg
shell: bash
@@ -47,7 +62,7 @@ runs:
- name: Generate a token
id: generateToken
- uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
+ uses: actions/create-github-app-token@9d97a4282b2c51a2f4f0465b9326399f53c890d4
with:
- app_id: ${{ inputs.OS_BOTIFY_APP_ID }}
- private_key: ${{ inputs.OS_BOTIFY_PRIVATE_KEY }}
+ app-id: ${{ inputs.OS_BOTIFY_APP_ID }}
+ private-key: ${{ inputs.OS_BOTIFY_PRIVATE_KEY }}
diff --git a/.github/workflows/authorChecklist.yml b/.github/workflows/authorChecklist.yml
index 33916d7bd10d..6cd881d18c29 100644
--- a/.github/workflows/authorChecklist.yml
+++ b/.github/workflows/authorChecklist.yml
@@ -9,7 +9,7 @@ jobs:
# then you also need to go into PHP and update the name of this job in the GH_JOB_NAME_CHECKLIST constant
checklist:
runs-on: ubuntu-latest
- if: github.actor != 'OSBotify'
+ if: github.actor != 'OSBotify' && github.actor != 'imgbot[bot]'
steps:
- name: authorChecklist.js
uses: Expensify/App/.github/actions/javascript/authorChecklist@main
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index 54ae1048b57b..4031d6c0c119 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
# This job only runs for pull request comments or pull request target events (not issue comments)
# It does not run for pull requests created by OSBotify
- if: ${{ github.event.issue.pull_request || (github.event_name == 'pull_request_target' && github.event.pull_request.user.login != 'OSBotify') }}
+ if: ${{ github.event.issue.pull_request || (github.event_name == 'pull_request_target' && github.event.pull_request.user.login != 'OSBotify' && github.event.pull_request.user.login != 'imgbot[bot]') }}
steps:
- name: CLA comment check
uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
diff --git a/.github/workflows/deployExpensifyHelp.yml b/.github/workflows/deployExpensifyHelp.yml
index ca7345ef9462..4a53e75354c6 100644
--- a/.github/workflows/deployExpensifyHelp.yml
+++ b/.github/workflows/deployExpensifyHelp.yml
@@ -1,20 +1,23 @@
-# Deploying the ExpensifyHelp Jekyll site by dynamically generating routes file
name: Deploy ExpensifyHelp
on:
- # Runs on pushes targeting the default branch
+ # Run on any push to main that has changes to the docs directory
push:
- branches: ["main"]
-
- # Allows you to run this workflow manually from the Actions tab
+ branches:
+ - main
+ paths:
+ - 'docs/**'
+
+ # Run on any pull request (except PRs against staging or production) that has changes to the docs directory
+ pull_request:
+ types: [opened, synchronize]
+ branches-ignore: [staging, production]
+ paths:
+ - 'docs/**'
+
+ # Run on any manual trigger
workflow_dispatch:
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
- contents: read
- pages: write
- id-token: write
-
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
@@ -22,7 +25,6 @@ concurrency:
cancel-in-progress: false
jobs:
- # Build job
build:
runs-on: ubuntu-latest
steps:
@@ -32,9 +34,6 @@ jobs:
- name: Setup NodeJS
uses: Expensify/App/.github/actions/composite/setupNode@main
- - name: Setup Pages
- uses: actions/configure-pages@f156874f8191504dae5b037505266ed5dda6c382
-
- name: Create docs routes file
run: ./.github/scripts/createDocsRoutes.sh
@@ -44,19 +43,18 @@ jobs:
source: ./docs/
destination: ./docs/_site
- - name: Upload artifact
- uses: actions/upload-pages-artifact@64bcae551a7b18bcb9a09042ddf1960979799187
+ - name: Deploy to Cloudflare Pages
+ uses: cloudflare/pages-action@f0a1cd58cd66095dee69bfa18fa5efd1dde93bca
+ id: deploy
with:
- path: ./docs/_site
-
- # Deployment job
- deploy:
- environment:
- name: github-pages
- url: ${{ steps.deployment.outputs.page_url }}
- runs-on: ubuntu-latest
- needs: build
- steps:
- - name: Deploy to GitHub Pages
- id: deployment
- uses: actions/deploy-pages@af48cf94a42f2c634308b1c9dc0151830b6f190a
+ apiToken: ${{ secrets.CLOUDFLARE_PAGES_TOKEN }}
+ accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+ projectName: helpdot
+ directory: ./docs/_site
+
+ - name: Leave a comment on the PR
+ uses: actions-cool/maintain-one-comment@de04bd2a3750d86b324829a3ff34d47e48e16f4b
+ if: ${{ github.event_name == 'pull_request' }}
+ with:
+ token: ${{ secrets.OS_BOTIFY_TOKEN }}
+ body: ${{ format('A preview of your ExpensifyHelp changes have been deployed to {0} ⚡️', steps.deploy.outputs.alias) }}
diff --git a/.github/workflows/e2ePerformanceTests.yml b/.github/workflows/e2ePerformanceTests.yml
index 308404b74bc0..ff888c135be9 100644
--- a/.github/workflows/e2ePerformanceTests.yml
+++ b/.github/workflows/e2ePerformanceTests.yml
@@ -125,6 +125,9 @@ jobs:
steps:
- uses: actions/checkout@v3
+ - name: Setup Node
+ uses: Expensify/App/.github/actions/composite/setupNode@main
+
- name: Make zip directory for everything to send to AWS Device Farm
run: mkdir zip
@@ -137,7 +140,7 @@ jobs:
# The downloaded artifact will be a file named "app-e2e-release.apk" so we have to rename it
- name: Rename baseline APK
- run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-baseline.apk"
+ run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-main.apk"
- name: Download delta APK
uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b
@@ -147,7 +150,7 @@ jobs:
path: zip
- name: Rename delta APK
- run: mv "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2eRelease-compare.apk"
+ run: mv "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2eRelease-delta.apk"
- name: Copy e2e code into zip folder
run: cp -r tests/e2e zip
@@ -162,44 +165,72 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: us-west-2
- - name: Schedule AWS Device Farm test run
+ - name: Schedule AWS Device Farm test run on main branch
uses: realm/aws-devicefarm/test-application@7b9a91236c456c97e28d384c9e476035d5ea686b
+ id: schedule-awsdf-main
with:
name: App E2E Performance Regression Tests
project_arn: ${{ secrets.AWS_PROJECT_ARN }}
device_pool_arn: ${{ secrets.AWS_DEVICE_POOL_ARN }}
- app_file: zip/app-e2eRelease-baseline.apk
+ app_file: zip/app-e2eRelease-main.apk
app_type: ANDROID_APP
test_type: APPIUM_NODE
test_package_file: App.zip
test_package_type: APPIUM_NODE_TEST_PACKAGE
- test_spec_file: tests/e2e/TestSpec.yml
+ test_spec_file: tests/e2e/TestSpecMain.yml
test_spec_type: APPIUM_NODE_TEST_SPEC
remote_src: false
file_artifacts: Customer Artifacts.zip
+ log_artifacts: debug.log
cleanup: true
- - name: Unzip AWS Device Farm results
- if: ${{ always() }}
- run: unzip "Customer Artifacts.zip"
-
- - name: Print AWS Device Farm run results
- if: ${{ always() }}
- run: cat "./Host_Machine_Files/\$WORKING_DIRECTORY/output.md"
-
- - name: Print AWS Device Farm verbose run results
- if: ${{ always() && runner.debug != null && fromJSON(runner.debug) }}
- run: cat "./Host_Machine_Files/\$WORKING_DIRECTORY/debug.log"
-
-# TODO: Once tests are more reliable we should uncomment this
-# - name: Check if test failed, if so post the results and add the DeployBlocker label
-# run: |
-# if grep -q '🔴' ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md; then
-# gh pr edit ${{ inputs.PR_NUMBER }} --add-label DeployBlockerCash
-# gh pr comment ${{ inputs.PR_NUMBER }} -F ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md
-# gh pr comment ${{ inputs.PR_NUMBER }} -b "@Expensify/mobile-deployers 📣 Please look into this performance regression as it's a deploy blocker."
-# else
-# echo '✅ no performance regression detected'
-# fi
-# env:
-# GITHUB_TOKEN: ${{ github.token }}
+ - name: Print logs if run failed
+ if: failure()
+ run: |
+ echo ${{ steps.schedule-awsdf-main.outputs.data }}
+ unzip "Customer Artifacts.zip" -d mainResults
+ cat ./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/debug.log
+
+ - name: Unzip AWS Device Farm main results
+ run: unzip "Customer Artifacts.zip" -d mainResults
+
+ - name: Delete Customer Artifacts.zip
+ run: rm "Customer Artifacts.zip"
+
+ - name: Schedule AWS Device Farm test run on delta branch
+ uses: realm/aws-devicefarm/test-application@7b9a91236c456c97e28d384c9e476035d5ea686b
+ with:
+ name: App E2E Performance Regression Tests
+ project_arn: ${{ secrets.AWS_PROJECT_ARN }}
+ device_pool_arn: ${{ secrets.AWS_DEVICE_POOL_ARN }}
+ app_file: zip/app-e2eRelease-delta.apk
+ app_type: ANDROID_APP
+ test_type: APPIUM_NODE
+ test_package_file: App.zip
+ test_package_type: APPIUM_NODE_TEST_PACKAGE
+ test_spec_file: tests/e2e/TestSpecDelta.yml
+ test_spec_type: APPIUM_NODE_TEST_SPEC
+ remote_src: false
+ file_artifacts: Customer Artifacts.zip
+ cleanup: true
+
+ - name: Unzip AWS Device Farm delta results
+ run: unzip "Customer Artifacts.zip" -d deltaResults
+
+ - name: Compare results
+ run: node tests/e2e/merge.js --mainPath ./mainResults/Host_Machine_Files/\$WORKING_DIRECTORY/main.json --deltaPath ./deltaResults//Host_Machine_Files/\$WORKING_DIRECTORY/delta.json --outputPath ./output.md
+
+ - name: Print results
+ run: cat "./output.md"
+
+ - name: Check if test failed, if so post the results and add the DeployBlocker label
+ run: |
+ if grep -q '🔴' ./output.md; then
+ gh pr edit ${{ inputs.PR_NUMBER }} --add-label DeployBlockerCash
+ gh pr comment ${{ inputs.PR_NUMBER }} -F ./output.md
+ gh pr comment ${{ inputs.PR_NUMBER }} -b "@Expensify/mobile-deployers 📣 Please look into this performance regression as it's a deploy blocker."
+ else
+ echo '✅ no performance regression detected'
+ fi
+ env:
+ GITHUB_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/imgbot.yml b/.github/workflows/imgbot.yml
new file mode 100644
index 000000000000..5247fad8349e
--- /dev/null
+++ b/.github/workflows/imgbot.yml
@@ -0,0 +1,25 @@
+name: imgbot Image Optimization
+
+on: pull_request
+
+permissions:
+ pull-requests: write
+ # The two permissions below are supposedly needed to allow a pull request to be merged.
+ # See https://github.com/cli/cli/discussions/6379
+ issues: write
+ contents: write
+
+jobs:
+ approveAndMerge:
+ runs-on: ubuntu-latest
+ if: ${{ github.actor == 'imgbot[bot]' }}
+ steps:
+ - name: Approve imgbot PR
+ run: gh pr review --approve "${{ github.event.pull_request.html_url }}"
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Merge imgbot PR
+ run: gh pr merge --auto --merge "${{ github.event.pull_request.html_url }}"
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b403a1eb737c..9d7efc7d4c29 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,6 +5,7 @@ on:
pull_request:
types: [opened, synchronize]
branches-ignore: [staging, production]
+ paths: ['**.js', '**.ts', '**.tsx']
jobs:
lint:
@@ -12,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+ uses: actions/checkout@v3
- name: Setup Node
uses: Expensify/App/.github/actions/composite/setupNode@main
@@ -22,9 +23,6 @@ jobs:
env:
CI: true
- - name: Lint shell scripts with ShellCheck
- run: npm run shellcheck
-
- name: Verify there's no Prettier diff
run: |
npm run prettier -- --loglevel silent
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 1105f78da27a..d18a0a383ed6 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -67,7 +67,7 @@ jobs:
uses: Expensify/App/.github/actions/composite/setupNode@main
- name: Setup Ruby
- uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+ uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
with:
ruby-version: '2.7'
bundler-cache: true
@@ -178,7 +178,7 @@ jobs:
name: Build and deploy iOS
needs: validateActor
if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
- runs-on: macos-12-xl
+ runs-on: macos-13-xlarge
steps:
- name: Checkout
uses: actions/checkout@v3
@@ -190,7 +190,7 @@ jobs:
uses: Expensify/App/.github/actions/composite/setupNode@main
- name: Setup Ruby
- uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+ uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
with:
ruby-version: '2.7'
bundler-cache: true
diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml
index d7d372aa7948..bae843e74709 100644
--- a/.github/workflows/preDeploy.yml
+++ b/.github/workflows/preDeploy.yml
@@ -2,8 +2,8 @@ name: Process new code merged to main
on:
push:
- branches:
- - main
+ branches: [main]
+ paths-ignore: [docs/**, contributingGuides/**, jest/**, tests/**, workflow_tests/**]
jobs:
typecheck:
@@ -112,71 +112,6 @@ jobs:
with:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
- # Check if actor is member of Expensify organization by looking for Expensify/expensify team
- isExpensifyEmployee:
- runs-on: ubuntu-latest
-
- outputs:
- IS_EXPENSIFY_EMPLOYEE: ${{ fromJSON(steps.checkAuthor.outputs.IS_EXPENSIFY_EMPLOYEE) }}
-
- steps:
- - name: Get merged pull request
- id: getMergedPullRequest
- uses: roryabraham/action-get-merged-pull-request@7a7a194f6ff8f3eef58c822083695a97314ebec1
- with:
- github_token: ${{ secrets.GITHUB_TOKEN }}
-
- - name: Check whether the PR author is member of Expensify/expensify team
- id: checkAuthor
- run: |
- if gh api /orgs/Expensify/teams/expensify-expensify/memberships/${{ steps.getMergedPullRequest.outputs.author }} --silent; then
- echo "IS_EXPENSIFY_EMPLOYEE=true" >> "$GITHUB_OUTPUT"
- else
- echo "IS_EXPENSIFY_EMPLOYEE=false" >> "$GITHUB_OUTPUT"
- fi
- env:
- GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
-
- newContributorWelcomeMessage:
- runs-on: ubuntu-latest
- needs: isExpensifyEmployee
- if: ${{ github.actor != 'OSBotify' && !fromJSON(needs.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) }}
- steps:
- # Version: 2.3.4
- - name: Checkout
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
- with:
- token: ${{ secrets.OS_BOTIFY_TOKEN }}
-
- - name: Get merged pull request
- id: getMergedPullRequest
- # TODO: Point back action actions-ecosystem after https://github.com/actions-ecosystem/action-get-merged-pull-request/pull/223 is merged
- uses: roryabraham/action-get-merged-pull-request@7a7a194f6ff8f3eef58c822083695a97314ebec1
- with:
- github_token: ${{ secrets.GITHUB_TOKEN }}
-
- - name: Get PR count for ${{ steps.getMergedPullRequest.outputs.author }}
- run: echo "PR_COUNT=$(gh pr list --author ${{ steps.getMergedPullRequest.outputs.author }} --state any | grep -c '')" >> "$GITHUB_ENV"
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- - name: Comment on ${{ steps.getMergedPullRequest.outputs.author }}\'s first pull request!
- if: ${{ fromJSON(env.PR_COUNT) == 1 }}
- uses: actions-ecosystem/action-create-comment@cd098164398331c50e7dfdd0dfa1b564a1873fac
- with:
- github_token: ${{ secrets.OS_BOTIFY_TOKEN }}
- number: ${{ steps.getMergedPullRequest.outputs.number }}
- body: |
- @${{ steps.getMergedPullRequest.outputs.author }}, Great job getting your first Expensify/App pull request over the finish line! :tada:
-
- I know there's a lot of information in our [contributing guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md), so here are some points to take note of :memo::
-
- 1. Now that your first PR has been merged, you can be hired for another issue. Once you've completed a few issues, you may be eligible to work on more than one job at a time.
- 2. Once your PR is deployed to our staging servers, it will undergo quality assurance (QA) testing. If we find that it doesn't work as expected or causes a regression, you'll be responsible for fixing it. Typically, we would revert this PR and give you another chance to create a similar PR without causing a regression.
- 3. Once your PR is deployed to _production_, we start a 7-day timer :alarm_clock:. After it has been on production for 7 days without causing any regressions, then we pay out the Upwork job. :moneybag:
-
- So it might take a while before you're paid for your work, but we typically post multiple new jobs every day, so there's plenty of opportunity. I hope you've had a positive experience contributing to this repo! :blush:
-
e2ePerformanceTests:
needs: [chooseDeployActions]
if: ${{ needs.chooseDeployActions.outputs.SHOULD_DEPLOY }}
diff --git a/.github/workflows/reassurePerformanceTests.yml b/.github/workflows/reassurePerformanceTests.yml
index ab5e1d06e5a4..b259ff9052b6 100644
--- a/.github/workflows/reassurePerformanceTests.yml
+++ b/.github/workflows/reassurePerformanceTests.yml
@@ -4,6 +4,7 @@ on:
pull_request:
types: [opened, synchronize]
branches-ignore: [staging, production]
+ paths-ignore: [docs/**, .github/**, contributingGuides/**, tests/**, workflow_tests/**, '**.md', '**.sh']
jobs:
perf-tests:
diff --git a/.github/workflows/reviewerChecklist.yml b/.github/workflows/reviewerChecklist.yml
index 413fc88ff403..e86e08375269 100644
--- a/.github/workflows/reviewerChecklist.yml
+++ b/.github/workflows/reviewerChecklist.yml
@@ -7,7 +7,7 @@ jobs:
# then you also need to go into PHP and update the name of this job in the GH_JOB_NAME_CHECKLIST constant
checklist:
runs-on: ubuntu-latest
- if: github.actor != 'OSBotify'
+ if: github.actor != 'OSBotify' && github.actor != 'imgbot[bot]'
steps:
- name: reviewerChecklist.js
uses: Expensify/App/.github/actions/javascript/reviewerChecklist@main
diff --git a/.github/workflows/shellCheck.yml b/.github/workflows/shellCheck.yml
new file mode 100644
index 000000000000..609541e9a660
--- /dev/null
+++ b/.github/workflows/shellCheck.yml
@@ -0,0 +1,19 @@
+name: Lint shell code
+
+on:
+ workflow_call:
+ pull_request:
+ types: [opened, synchronize]
+ branches-ignore: [staging, production]
+ paths: ['**.sh']
+
+jobs:
+ lint:
+ if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+
+ - name: Lint shell scripts with ShellCheck
+ run: npm run shellcheck
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 72bdd0468fd2..fa47a2f61d4a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,10 +5,11 @@ on:
pull_request:
types: [opened, synchronize]
branches-ignore: [staging, production]
+ paths: ['**.js', '**.ts', '**.tsx', '**.sh', 'package.json', 'package-lock.json']
jobs:
jest:
- if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
+ if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
runs-on: ubuntu-latest
env:
CI: true
@@ -39,7 +40,7 @@ jobs:
run: npx jest --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --max-workers ${{ steps.cpu-cores.outputs.count }}
storybookTests:
- if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
+ if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
runs-on: ubuntu-latest
name: Storybook tests
steps:
@@ -51,7 +52,7 @@ jobs:
run: npm run storybook -- --smoke-test --ci
shellTests:
- if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
+ if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
runs-on: ubuntu-latest
name: Shell tests
steps:
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index 6ded44d7059f..beb5d4e2f530 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -86,7 +86,7 @@ jobs:
uses: Expensify/App/.github/actions/composite/setupNode@main
- name: Setup Ruby
- uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+ uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
with:
ruby-version: '2.7'
bundler-cache: true
@@ -133,7 +133,7 @@ jobs:
if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
env:
PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
- runs-on: macos-12-xl
+ runs-on: macos-13-xlarge
steps:
# This action checks-out the repository, so the workflow can access it.
- name: Checkout
@@ -157,7 +157,7 @@ jobs:
run: sudo xcode-select -switch /Applications/Xcode_14.2.app
- name: Setup Ruby
- uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+ uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
with:
ruby-version: '2.7'
bundler-cache: true
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index de433b2ae88a..776169fc6058 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -5,6 +5,7 @@ on:
pull_request:
types: [opened, synchronize]
branches-ignore: [staging, production]
+ paths: ['**.ts', '**.tsx', 'package.json', 'package-lock.json']
jobs:
typecheck:
diff --git a/.github/workflows/validateDocsRoutes.yml b/.github/workflows/validateDocsRoutes.yml
index 717560e19f5f..14c08e087565 100644
--- a/.github/workflows/validateDocsRoutes.yml
+++ b/.github/workflows/validateDocsRoutes.yml
@@ -8,7 +8,7 @@ on:
jobs:
verify:
- if: github.actor != 'OSBotify'
+ if: github.actor != 'OSBotify' && github.actor != 'imgbot[bot]'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
diff --git a/.github/workflows/validateGithubActions.yml b/.github/workflows/validateGithubActions.yml
index bcda941e1b05..2d3216fefe75 100644
--- a/.github/workflows/validateGithubActions.yml
+++ b/.github/workflows/validateGithubActions.yml
@@ -9,7 +9,7 @@ on:
jobs:
verify:
- if: github.actor != 'OSBotify'
+ if: github.actor != 'OSBotify' && github.actor != 'imgbot[bot]'
runs-on: ubuntu-latest
steps:
- name: Checkout
diff --git a/.github/workflows/verifyPodfile.yml b/.github/workflows/verifyPodfile.yml
index d8d931e476d1..d98780e3e829 100644
--- a/.github/workflows/verifyPodfile.yml
+++ b/.github/workflows/verifyPodfile.yml
@@ -11,7 +11,7 @@ on:
jobs:
verify:
- if: github.actor != 'OSBotify'
+ if: github.actor != 'OSBotify' && github.actor != 'imgbot[bot]'
runs-on: macos-latest
steps:
- name: Checkout
diff --git a/.github/workflows/welcome.yml b/.github/workflows/welcome.yml
new file mode 100644
index 000000000000..43e0e1650381
--- /dev/null
+++ b/.github/workflows/welcome.yml
@@ -0,0 +1,55 @@
+name: Post new contributor welcome message
+
+on:
+ push:
+ branches: [main]
+
+jobs:
+ newContributorWelcomeMessage:
+ runs-on: ubuntu-latest
+ if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' }}
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+
+ - name: Get merged pull request
+ id: getMergedPullRequest
+ run: |
+ read -r number author < <(gh pr list --search ${{ github.sha }} --state merged --json 'number,author' | jq -r '.[0] | [.number, .author.login] | join(" ")')
+ echo "number=$number" >> "$GITHUB_OUTPUT"
+ echo "author=$author" >> "$GITHUB_OUTPUT"
+ env:
+ GITHUB_TOKEN: ${{ github.token }}
+
+ - name: Check whether the PR author is member of Expensify/expensify team
+ id: isExpensifyEmployee
+ run: |
+ if gh api /orgs/Expensify/teams/expensify-expensify/memberships/${{ steps.getMergedPullRequest.outputs.author }} --silent; then
+ echo "IS_EXPENSIFY_EMPLOYEE=true" >> "$GITHUB_OUTPUT"
+ else
+ echo "IS_EXPENSIFY_EMPLOYEE=false" >> "$GITHUB_OUTPUT"
+ fi
+ env:
+ GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+
+ - name: Get PR count for ${{ steps.getMergedPullRequest.outputs.author }}
+ id: getPRCount
+ run: echo "PR_COUNT=$(gh pr list --author ${{ steps.getMergedPullRequest.outputs.author }} --state any | grep -c '')" >> "$GITHUB_OUTPUT"
+ env:
+ GITHUB_TOKEN: ${{ github.token }}
+
+ - name: Comment on ${{ steps.getMergedPullRequest.outputs.author }}\'s first pull request!
+ if: ${{ fromJSON(steps.getPRCount.outputs.PR_COUNT) == 1 }}
+ run: |
+ gh pr comment ${{ steps.getMergedPullRequest.outputs.number }} --body \
+ "@${{ steps.getMergedPullRequest.outputs.author }}, Great job getting your first Expensify/App pull request over the finish line! :tada:
+
+ I know there's a lot of information in our [contributing guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md), so here are some points to take note of :memo::
+
+ 1. Now that your first PR has been merged, you can be hired for another issue. Once you've completed a few issues, you may be eligible to work on more than one job at a time.
+ 2. Once your PR is deployed to our staging servers, it will undergo quality assurance (QA) testing. If we find that it doesn't work as expected or causes a regression, you'll be responsible for fixing it. Typically, we would revert this PR and give you another chance to create a similar PR without causing a regression.
+ 3. Once your PR is deployed to _production_, we start a 7-day timer :alarm_clock:. After it has been on production for 7 days without causing any regressions, then we pay out the Upwork job. :moneybag:
+
+ So it might take a while before you're paid for your work, but we typically post multiple new jobs every day, so there's plenty of opportunity. I hope you've had a positive experience contributing to this repo! :blush:"
+ env:
+ GITHUB_TOKEN: ${{ github.token }}
diff --git a/.storybook/public/logo.png b/.storybook/public/logo.png
index 23c909e83f0b..5ba694bac764 100644
Binary files a/.storybook/public/logo.png and b/.storybook/public/logo.png differ
diff --git a/.storybook/public/logomark.svg b/.storybook/public/logomark.svg
index d1ca5ca84d06..ae263af72c12 100644
--- a/.storybook/public/logomark.svg
+++ b/.storybook/public/logomark.svg
@@ -1,25 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/README.md b/README.md
index 9aad797ebb51..998f185939fa 100644
--- a/README.md
+++ b/README.md
@@ -59,8 +59,7 @@ For an M1 Mac, read this [SO](https://stackoverflow.com/questions/64901180/how-t
## Running the Android app 🤖
* Before installing Android dependencies, you need to obtain a token from Mapbox to download their SDKs. Please run `npm run configure-mapbox` and follow the instructions. If you already did this step for iOS, there is no need to repeat this step.
-* Go through the instructions on [this SO post](https://stackoverflow.com/c/expensify/questions/13283/13284#13284) to start running the app on android.
-* For more information, go through the official React-Native instructions on [this page](https://reactnative.dev/docs/environment-setup#development-os) for "React Native CLI Quickstart" > Mac OS > Android
+* Go through the official React-Native instructions on [this page](https://reactnative.dev/docs/environment-setup?guide=native&platform=android) to start running the app on android.
* If you are an Expensify employee and want to point the emulator to your local VM, follow [this](https://stackoverflow.com/c/expensify/questions/7699)
* To run a on a **Development Emulator**: `npm run android`
* Changes applied to Javascript will be applied automatically, any changes to native code will require a recompile
diff --git a/__mocks__/react-native-safe-area-context.js b/__mocks__/react-native-safe-area-context.js
index 4b4af7841c2c..b31ed670b81c 100644
--- a/__mocks__/react-native-safe-area-context.js
+++ b/__mocks__/react-native-safe-area-context.js
@@ -20,13 +20,18 @@ function withSafeAreaInsets(WrappedComponent) {
/>
);
}
- return forwardRef((props, ref) => (
+
+ const WithSafeAreaInsetsWithRef = forwardRef((props, ref) => (
));
+
+ WithSafeAreaInsetsWithRef.displayName = 'WithSafeAreaInsetsWithRef';
+
+ return WithSafeAreaInsetsWithRef;
}
const SafeAreaView = View;
diff --git a/android/app/build.gradle b/android/app/build.gradle
index fa2bd3865ca2..cf8097adc18f 100644
--- 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 1001038708
- versionName "1.3.87-8"
+ versionCode 1001039200
+ versionName "1.3.92-0"
}
flavorDimensions "default"
diff --git a/android/app/src/adhoc/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/adhoc/res/mipmap-hdpi/ic_launcher_foreground.png
index ecf9a8d7648a..f0cf22860e16 100644
Binary files a/android/app/src/adhoc/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/adhoc/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/adhoc/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/adhoc/res/mipmap-mdpi/ic_launcher_foreground.png
index ba8a2086138c..8070c42691fe 100644
Binary files a/android/app/src/adhoc/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/adhoc/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/adhoc/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/adhoc/res/mipmap-xhdpi/ic_launcher_foreground.png
index d1e6dbf34a18..06f3ee842084 100644
Binary files a/android/app/src/adhoc/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/adhoc/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher.png
index fe443ce3f696..7a69e882941e 100644
Binary files a/android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 2bb80c3d622b..692e5d1fac3f 100644
Binary files a/android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher_round.png
index fe443ce3f696..7a69e882941e 100644
Binary files a/android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/adhoc/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher.png
index 576097130442..d7d01c5f0c0a 100644
Binary files a/android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 576550530857..5b1e8667481b 100644
Binary files a/android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher_round.png
index 576097130442..d7d01c5f0c0a 100644
Binary files a/android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/adhoc/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/development/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/development/res/mipmap-xxhdpi/ic_launcher.png
index 474e8eca239a..a241d41d34fe 100644
Binary files a/android/app/src/development/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/development/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/development/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/development/res/mipmap-xxhdpi/ic_launcher_round.png
index 474e8eca239a..a241d41d34fe 100644
Binary files a/android/app/src/development/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/development/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher.png
index 37c8716987f7..996266b64f6e 100644
Binary files a/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher_round.png
index 37c8716987f7..996266b64f6e 100644
Binary files a/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/ic_notification.png b/android/app/src/main/res/drawable-hdpi/ic_notification.png
index 7612112d1bc5..1d7e563f77ad 100644
Binary files a/android/app/src/main/res/drawable-hdpi/ic_notification.png and b/android/app/src/main/res/drawable-hdpi/ic_notification.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_notification.png b/android/app/src/main/res/drawable-xhdpi/ic_notification.png
index a01f2c5e0dc9..e7fe54ede5d3 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/ic_notification.png and b/android/app/src/main/res/drawable-xhdpi/ic_notification.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/bootsplash_logo.png b/android/app/src/main/res/drawable-xxhdpi/bootsplash_logo.png
index 06b2bfc8447b..f123d07f59c2 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/bootsplash_logo.png and b/android/app/src/main/res/drawable-xxhdpi/bootsplash_logo.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_notification.png b/android/app/src/main/res/drawable-xxhdpi/ic_notification.png
index 3bb969329c79..c27e58558a92 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/ic_notification.png and b/android/app/src/main/res/drawable-xxhdpi/ic_notification.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png b/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png
index 697922b1e689..da1caf86e66f 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png and b/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 630ffa310345..f533b4e8d230 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index 630ffa310345..f533b4e8d230 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index d157a530d098..ee08d91ae4a7 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index d157a530d098..ee08d91ae4a7 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/assets/css/pdf.css b/assets/css/pdf.css
index 9cbbf31b074c..26c80a5baf27 100644
--- a/assets/css/pdf.css
+++ b/assets/css/pdf.css
@@ -11,12 +11,7 @@
border-image: url(../images/shadow.png) 9 9 repeat;
background-color: rgba(255, 255, 255, 1);
}
-.react-pdf__message {
- position: absolute;
- left: 50%;
- top: 50%;
- transform: translate(-50%, -50%);
-}
+
.react-pdf__Page__annotations {
height: 0;
}
diff --git a/assets/images/MCCGroupIcons/MCC-Airlines.svg b/assets/images/MCCGroupIcons/MCC-Airlines.svg
index b707faf9857e..a316bfbc0a8a 100644
--- a/assets/images/MCCGroupIcons/MCC-Airlines.svg
+++ b/assets/images/MCCGroupIcons/MCC-Airlines.svg
@@ -1,6 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/MCCGroupIcons/MCC-Commuter.svg b/assets/images/MCCGroupIcons/MCC-Commuter.svg
index d8f808cf463b..88ad3085b37a 100644
--- a/assets/images/MCCGroupIcons/MCC-Commuter.svg
+++ b/assets/images/MCCGroupIcons/MCC-Commuter.svg
@@ -1,6 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/MCCGroupIcons/MCC-Gas.svg b/assets/images/MCCGroupIcons/MCC-Gas.svg
index b13e657a1af4..efc417df2133 100644
--- a/assets/images/MCCGroupIcons/MCC-Gas.svg
+++ b/assets/images/MCCGroupIcons/MCC-Gas.svg
@@ -1,6 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/MCCGroupIcons/MCC-Goods.svg b/assets/images/MCCGroupIcons/MCC-Goods.svg
index e3ea39f77344..fe137a8fae18 100644
--- a/assets/images/MCCGroupIcons/MCC-Goods.svg
+++ b/assets/images/MCCGroupIcons/MCC-Goods.svg
@@ -1,6 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/MCCGroupIcons/MCC-Groceries.svg b/assets/images/MCCGroupIcons/MCC-Groceries.svg
index 349154ca5496..0b766abe1ef8 100644
--- a/assets/images/MCCGroupIcons/MCC-Groceries.svg
+++ b/assets/images/MCCGroupIcons/MCC-Groceries.svg
@@ -1,6 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/MCCGroupIcons/MCC-Hotel.svg b/assets/images/MCCGroupIcons/MCC-Hotel.svg
index 04be004b24bb..94f97659fd5d 100644
--- a/assets/images/MCCGroupIcons/MCC-Hotel.svg
+++ b/assets/images/MCCGroupIcons/MCC-Hotel.svg
@@ -1,6 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/MCCGroupIcons/MCC-Mail.svg b/assets/images/MCCGroupIcons/MCC-Mail.svg
index e554fa44f37f..96dff88527e0 100644
--- a/assets/images/MCCGroupIcons/MCC-Mail.svg
+++ b/assets/images/MCCGroupIcons/MCC-Mail.svg
@@ -1,7 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/MCCGroupIcons/MCC-Meals.svg b/assets/images/MCCGroupIcons/MCC-Meals.svg
index df3672cf52a6..6cc1ac414062 100644
--- a/assets/images/MCCGroupIcons/MCC-Meals.svg
+++ b/assets/images/MCCGroupIcons/MCC-Meals.svg
@@ -1,6 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/MCCGroupIcons/MCC-Misc.svg b/assets/images/MCCGroupIcons/MCC-Misc.svg
index a4ef1615d146..d8fd071043e5 100644
--- a/assets/images/MCCGroupIcons/MCC-Misc.svg
+++ b/assets/images/MCCGroupIcons/MCC-Misc.svg
@@ -1,6 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/MCCGroupIcons/MCC-RentalCar.svg b/assets/images/MCCGroupIcons/MCC-RentalCar.svg
index 789cb5bc3fe3..e8dd3f59954c 100644
--- a/assets/images/MCCGroupIcons/MCC-RentalCar.svg
+++ b/assets/images/MCCGroupIcons/MCC-RentalCar.svg
@@ -1,6 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/MCCGroupIcons/MCC-Services.svg b/assets/images/MCCGroupIcons/MCC-Services.svg
index 25c67065c105..265491c36eff 100644
--- a/assets/images/MCCGroupIcons/MCC-Services.svg
+++ b/assets/images/MCCGroupIcons/MCC-Services.svg
@@ -1,6 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/MCCGroupIcons/MCC-Taxi.svg b/assets/images/MCCGroupIcons/MCC-Taxi.svg
index 2cc31e4db079..6eb88b43c725 100644
--- a/assets/images/MCCGroupIcons/MCC-Taxi.svg
+++ b/assets/images/MCCGroupIcons/MCC-Taxi.svg
@@ -1,6 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/MCCGroupIcons/MCC-Utilities.svg b/assets/images/MCCGroupIcons/MCC-Utilities.svg
index 27e7290bf4e5..36b7fb392d79 100644
--- a/assets/images/MCCGroupIcons/MCC-Utilities.svg
+++ b/assets/images/MCCGroupIcons/MCC-Utilities.svg
@@ -1,7 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/add-reaction.svg b/assets/images/add-reaction.svg
index a576e2c84622..d70d0acec190 100644
--- a/assets/images/add-reaction.svg
+++ b/assets/images/add-reaction.svg
@@ -1,5 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/assets/images/android.svg b/assets/images/android.svg
index 0ee0daa9cc37..2599b0aed9fa 100644
--- a/assets/images/android.svg
+++ b/assets/images/android.svg
@@ -1,22 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/apple.svg b/assets/images/apple.svg
index 44e7f309f7ce..69e8d3b535c1 100644
--- a/assets/images/apple.svg
+++ b/assets/images/apple.svg
@@ -1,21 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/arrow-right-long.svg b/assets/images/arrow-right-long.svg
index 99be81fa9b36..6ab65ef779b8 100644
--- a/assets/images/arrow-right-long.svg
+++ b/assets/images/arrow-right-long.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/arrow-right.svg b/assets/images/arrow-right.svg
index c3bb5345d3f9..df13c75ca414 100644
--- a/assets/images/arrow-right.svg
+++ b/assets/images/arrow-right.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/arrow-up.svg b/assets/images/arrow-up.svg
index 60d03289d446..9183b18402d0 100644
--- a/assets/images/arrow-up.svg
+++ b/assets/images/arrow-up.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/arrows-updown.svg b/assets/images/arrows-updown.svg
index a1aa2c92ef87..2c8d2f788d33 100644
--- a/assets/images/arrows-updown.svg
+++ b/assets/images/arrows-updown.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/admin-room.svg b/assets/images/avatars/admin-room.svg
index aa25fe5bbb1d..486137d825dc 100644
--- a/assets/images/avatars/admin-room.svg
+++ b/assets/images/avatars/admin-room.svg
@@ -1,17 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/announce-room.svg b/assets/images/avatars/announce-room.svg
index 772a113fbc33..538d78d6a8f6 100644
--- a/assets/images/avatars/announce-room.svg
+++ b/assets/images/avatars/announce-room.svg
@@ -1,17 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/concierge-avatar.svg b/assets/images/avatars/concierge-avatar.svg
index d2a7cf31ac98..eb374a9a5a68 100644
--- a/assets/images/avatars/concierge-avatar.svg
+++ b/assets/images/avatars/concierge-avatar.svg
@@ -1,39 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/deleted-room.svg b/assets/images/avatars/deleted-room.svg
index a39c55d0e2b5..dafcb9d95a84 100644
--- a/assets/images/avatars/deleted-room.svg
+++ b/assets/images/avatars/deleted-room.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/domain-room.svg b/assets/images/avatars/domain-room.svg
index 1f9903539049..66d1d5ab96fc 100644
--- a/assets/images/avatars/domain-room.svg
+++ b/assets/images/avatars/domain-room.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/fallback-avatar.svg b/assets/images/avatars/fallback-avatar.svg
index 0d71e0fbc210..b4584d910190 100644
--- a/assets/images/avatars/fallback-avatar.svg
+++ b/assets/images/avatars/fallback-avatar.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/fallback-workspace-avatar.svg b/assets/images/avatars/fallback-workspace-avatar.svg
index 518627fafc19..74edba02f4b5 100644
--- a/assets/images/avatars/fallback-workspace-avatar.svg
+++ b/assets/images/avatars/fallback-workspace-avatar.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/room.png b/assets/images/avatars/room.png
index dca457fbfdf7..ef5073a9a6e1 100644
Binary files a/assets/images/avatars/room.png and b/assets/images/avatars/room.png differ
diff --git a/assets/images/avatars/room.svg b/assets/images/avatars/room.svg
index 0db866ad9160..f3b59a00bfbd 100644
--- a/assets/images/avatars/room.svg
+++ b/assets/images/avatars/room.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_1.svg b/assets/images/avatars/user/default-avatar_1.svg
index dd4d59b26158..971389c480cf 100644
--- a/assets/images/avatars/user/default-avatar_1.svg
+++ b/assets/images/avatars/user/default-avatar_1.svg
@@ -1,168 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_10.svg b/assets/images/avatars/user/default-avatar_10.svg
index 85979a5d1414..0f0484833f4b 100644
--- a/assets/images/avatars/user/default-avatar_10.svg
+++ b/assets/images/avatars/user/default-avatar_10.svg
@@ -1,192 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_11.svg b/assets/images/avatars/user/default-avatar_11.svg
index eb1ce99f43c9..1e1b3ca44e82 100644
--- a/assets/images/avatars/user/default-avatar_11.svg
+++ b/assets/images/avatars/user/default-avatar_11.svg
@@ -1,156 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_12.svg b/assets/images/avatars/user/default-avatar_12.svg
index fd5635c4e9c4..b066595be3ea 100644
--- a/assets/images/avatars/user/default-avatar_12.svg
+++ b/assets/images/avatars/user/default-avatar_12.svg
@@ -1,163 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_13.svg b/assets/images/avatars/user/default-avatar_13.svg
index b6850c8585ca..5e9779467fe0 100644
--- a/assets/images/avatars/user/default-avatar_13.svg
+++ b/assets/images/avatars/user/default-avatar_13.svg
@@ -1,229 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_14.svg b/assets/images/avatars/user/default-avatar_14.svg
index f888b5960b09..aa8d3b39327e 100644
--- a/assets/images/avatars/user/default-avatar_14.svg
+++ b/assets/images/avatars/user/default-avatar_14.svg
@@ -1,210 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_15.svg b/assets/images/avatars/user/default-avatar_15.svg
index 4a20f351c0dc..1748cda659ae 100644
--- a/assets/images/avatars/user/default-avatar_15.svg
+++ b/assets/images/avatars/user/default-avatar_15.svg
@@ -1,173 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_16.svg b/assets/images/avatars/user/default-avatar_16.svg
index a8edcb5540e1..8ca55805cec6 100644
--- a/assets/images/avatars/user/default-avatar_16.svg
+++ b/assets/images/avatars/user/default-avatar_16.svg
@@ -1,269 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_17.svg b/assets/images/avatars/user/default-avatar_17.svg
index b1fffeb4f508..1ce8f204c2ab 100644
--- a/assets/images/avatars/user/default-avatar_17.svg
+++ b/assets/images/avatars/user/default-avatar_17.svg
@@ -1,164 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_18.svg b/assets/images/avatars/user/default-avatar_18.svg
index d1a6c8dd2ddc..770095ecc654 100644
--- a/assets/images/avatars/user/default-avatar_18.svg
+++ b/assets/images/avatars/user/default-avatar_18.svg
@@ -1,155 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_19.svg b/assets/images/avatars/user/default-avatar_19.svg
index 10d1a864088c..9049a504514c 100644
--- a/assets/images/avatars/user/default-avatar_19.svg
+++ b/assets/images/avatars/user/default-avatar_19.svg
@@ -1,171 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_2.svg b/assets/images/avatars/user/default-avatar_2.svg
index 9b2b7a72f37a..dacfc5467b59 100644
--- a/assets/images/avatars/user/default-avatar_2.svg
+++ b/assets/images/avatars/user/default-avatar_2.svg
@@ -1,124 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_20.svg b/assets/images/avatars/user/default-avatar_20.svg
index 6b5751726843..b0adfa9fc311 100644
--- a/assets/images/avatars/user/default-avatar_20.svg
+++ b/assets/images/avatars/user/default-avatar_20.svg
@@ -1,179 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_21.svg b/assets/images/avatars/user/default-avatar_21.svg
index 6afea275de75..4764672b9e0c 100644
--- a/assets/images/avatars/user/default-avatar_21.svg
+++ b/assets/images/avatars/user/default-avatar_21.svg
@@ -1,163 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_22.svg b/assets/images/avatars/user/default-avatar_22.svg
index da9ab029d62b..428ae4207f76 100644
--- a/assets/images/avatars/user/default-avatar_22.svg
+++ b/assets/images/avatars/user/default-avatar_22.svg
@@ -1,206 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_23.svg b/assets/images/avatars/user/default-avatar_23.svg
index f2afe88238a7..5bef9f1c2221 100644
--- a/assets/images/avatars/user/default-avatar_23.svg
+++ b/assets/images/avatars/user/default-avatar_23.svg
@@ -1,196 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_24.svg b/assets/images/avatars/user/default-avatar_24.svg
index 1ea472d24d83..4400546c356f 100644
--- a/assets/images/avatars/user/default-avatar_24.svg
+++ b/assets/images/avatars/user/default-avatar_24.svg
@@ -1,241 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_3.svg b/assets/images/avatars/user/default-avatar_3.svg
index 6ddd44d51cb2..11657fcbb2b1 100644
--- a/assets/images/avatars/user/default-avatar_3.svg
+++ b/assets/images/avatars/user/default-avatar_3.svg
@@ -1,230 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_4.svg b/assets/images/avatars/user/default-avatar_4.svg
index 203c2f990d28..cda04362b4e5 100644
--- a/assets/images/avatars/user/default-avatar_4.svg
+++ b/assets/images/avatars/user/default-avatar_4.svg
@@ -1,216 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_5.svg b/assets/images/avatars/user/default-avatar_5.svg
index 7be508c86c6d..17b662838d43 100644
--- a/assets/images/avatars/user/default-avatar_5.svg
+++ b/assets/images/avatars/user/default-avatar_5.svg
@@ -1,185 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_6.svg b/assets/images/avatars/user/default-avatar_6.svg
index 67774100ca12..8f5575557154 100644
--- a/assets/images/avatars/user/default-avatar_6.svg
+++ b/assets/images/avatars/user/default-avatar_6.svg
@@ -1,193 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_7.svg b/assets/images/avatars/user/default-avatar_7.svg
index b1aad6c7c3f1..1136f086ade0 100644
--- a/assets/images/avatars/user/default-avatar_7.svg
+++ b/assets/images/avatars/user/default-avatar_7.svg
@@ -1,215 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_8.svg b/assets/images/avatars/user/default-avatar_8.svg
index 55a4828cc824..f0e7d8f288e6 100644
--- a/assets/images/avatars/user/default-avatar_8.svg
+++ b/assets/images/avatars/user/default-avatar_8.svg
@@ -1,184 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/user/default-avatar_9.svg b/assets/images/avatars/user/default-avatar_9.svg
index 1c65c8cc2916..4bbb156b7899 100644
--- a/assets/images/avatars/user/default-avatar_9.svg
+++ b/assets/images/avatars/user/default-avatar_9.svg
@@ -1,117 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_0.svg b/assets/images/avatars/workspace/default-avatar_0.svg
index c942281517f4..8ebc0bbe6001 100644
--- a/assets/images/avatars/workspace/default-avatar_0.svg
+++ b/assets/images/avatars/workspace/default-avatar_0.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_1.svg b/assets/images/avatars/workspace/default-avatar_1.svg
index e6b0c71b53d4..ba5e41639b4f 100644
--- a/assets/images/avatars/workspace/default-avatar_1.svg
+++ b/assets/images/avatars/workspace/default-avatar_1.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_2.svg b/assets/images/avatars/workspace/default-avatar_2.svg
index c7d469d662ba..4257049a1146 100644
--- a/assets/images/avatars/workspace/default-avatar_2.svg
+++ b/assets/images/avatars/workspace/default-avatar_2.svg
@@ -1,16 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_3.svg b/assets/images/avatars/workspace/default-avatar_3.svg
index 04c5d6d99372..ce049452aa83 100644
--- a/assets/images/avatars/workspace/default-avatar_3.svg
+++ b/assets/images/avatars/workspace/default-avatar_3.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_4.svg b/assets/images/avatars/workspace/default-avatar_4.svg
index e547481faefd..28c5b936cf1a 100644
--- a/assets/images/avatars/workspace/default-avatar_4.svg
+++ b/assets/images/avatars/workspace/default-avatar_4.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_5.svg b/assets/images/avatars/workspace/default-avatar_5.svg
index 6b8c654ee784..3821dd80bd89 100644
--- a/assets/images/avatars/workspace/default-avatar_5.svg
+++ b/assets/images/avatars/workspace/default-avatar_5.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_6.svg b/assets/images/avatars/workspace/default-avatar_6.svg
index c8f155995263..0eebd4c55280 100644
--- a/assets/images/avatars/workspace/default-avatar_6.svg
+++ b/assets/images/avatars/workspace/default-avatar_6.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_7.svg b/assets/images/avatars/workspace/default-avatar_7.svg
index 714725c62f2f..5563ae3941cc 100644
--- a/assets/images/avatars/workspace/default-avatar_7.svg
+++ b/assets/images/avatars/workspace/default-avatar_7.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_8.svg b/assets/images/avatars/workspace/default-avatar_8.svg
index edca9a464610..5cb8e1b6a500 100644
--- a/assets/images/avatars/workspace/default-avatar_8.svg
+++ b/assets/images/avatars/workspace/default-avatar_8.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_9.svg b/assets/images/avatars/workspace/default-avatar_9.svg
index 0cc78a5dae7e..a15970c7f27d 100644
--- a/assets/images/avatars/workspace/default-avatar_9.svg
+++ b/assets/images/avatars/workspace/default-avatar_9.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_a.svg b/assets/images/avatars/workspace/default-avatar_a.svg
index 5ea6d7a1dd0e..c29a681165d1 100644
--- a/assets/images/avatars/workspace/default-avatar_a.svg
+++ b/assets/images/avatars/workspace/default-avatar_a.svg
@@ -1,16 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_b.svg b/assets/images/avatars/workspace/default-avatar_b.svg
index dfdef9451455..e376df224c1a 100644
--- a/assets/images/avatars/workspace/default-avatar_b.svg
+++ b/assets/images/avatars/workspace/default-avatar_b.svg
@@ -1,16 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_building.svg b/assets/images/avatars/workspace/default-avatar_building.svg
index 69c0f0e73dc4..6175ce27d1af 100644
--- a/assets/images/avatars/workspace/default-avatar_building.svg
+++ b/assets/images/avatars/workspace/default-avatar_building.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_c.svg b/assets/images/avatars/workspace/default-avatar_c.svg
index d09cd384d458..cd8f585e4ce3 100644
--- a/assets/images/avatars/workspace/default-avatar_c.svg
+++ b/assets/images/avatars/workspace/default-avatar_c.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_d.svg b/assets/images/avatars/workspace/default-avatar_d.svg
index 2d8fb68adf58..98a87ceb2a59 100644
--- a/assets/images/avatars/workspace/default-avatar_d.svg
+++ b/assets/images/avatars/workspace/default-avatar_d.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_e.svg b/assets/images/avatars/workspace/default-avatar_e.svg
index a21981f244c5..1b8453ad6063 100644
--- a/assets/images/avatars/workspace/default-avatar_e.svg
+++ b/assets/images/avatars/workspace/default-avatar_e.svg
@@ -1,16 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_f.svg b/assets/images/avatars/workspace/default-avatar_f.svg
index 2f1323e2c7f9..9bf793bf49dd 100644
--- a/assets/images/avatars/workspace/default-avatar_f.svg
+++ b/assets/images/avatars/workspace/default-avatar_f.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_g.svg b/assets/images/avatars/workspace/default-avatar_g.svg
index 51ff96cdfb7b..fd9212faef4e 100644
--- a/assets/images/avatars/workspace/default-avatar_g.svg
+++ b/assets/images/avatars/workspace/default-avatar_g.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_h.svg b/assets/images/avatars/workspace/default-avatar_h.svg
index ddabaa42d06b..3fd678ddb2f9 100644
--- a/assets/images/avatars/workspace/default-avatar_h.svg
+++ b/assets/images/avatars/workspace/default-avatar_h.svg
@@ -1,16 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_i.svg b/assets/images/avatars/workspace/default-avatar_i.svg
index e9bc60254e2e..f565ea0bd01d 100644
--- a/assets/images/avatars/workspace/default-avatar_i.svg
+++ b/assets/images/avatars/workspace/default-avatar_i.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_j.svg b/assets/images/avatars/workspace/default-avatar_j.svg
index 9daf382ca8ef..35f709340cc0 100644
--- a/assets/images/avatars/workspace/default-avatar_j.svg
+++ b/assets/images/avatars/workspace/default-avatar_j.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_k.svg b/assets/images/avatars/workspace/default-avatar_k.svg
index 6018a9912f2c..b9b15c6b1b7e 100644
--- a/assets/images/avatars/workspace/default-avatar_k.svg
+++ b/assets/images/avatars/workspace/default-avatar_k.svg
@@ -1,16 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_l.svg b/assets/images/avatars/workspace/default-avatar_l.svg
index 4fd4e62ff93a..3cd5b6ef2b19 100644
--- a/assets/images/avatars/workspace/default-avatar_l.svg
+++ b/assets/images/avatars/workspace/default-avatar_l.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_m.svg b/assets/images/avatars/workspace/default-avatar_m.svg
index e2eea24f1af9..389f8dd12f89 100644
--- a/assets/images/avatars/workspace/default-avatar_m.svg
+++ b/assets/images/avatars/workspace/default-avatar_m.svg
@@ -1,16 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_n.svg b/assets/images/avatars/workspace/default-avatar_n.svg
index d1f036614c08..6abbde1c8b2b 100644
--- a/assets/images/avatars/workspace/default-avatar_n.svg
+++ b/assets/images/avatars/workspace/default-avatar_n.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_o.svg b/assets/images/avatars/workspace/default-avatar_o.svg
index 5f2c8e89fc89..2257cb9cd3ce 100644
--- a/assets/images/avatars/workspace/default-avatar_o.svg
+++ b/assets/images/avatars/workspace/default-avatar_o.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_p.svg b/assets/images/avatars/workspace/default-avatar_p.svg
index 4729bbc0afb9..4d09abfb08a1 100644
--- a/assets/images/avatars/workspace/default-avatar_p.svg
+++ b/assets/images/avatars/workspace/default-avatar_p.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_q.svg b/assets/images/avatars/workspace/default-avatar_q.svg
index ebdd318460e9..267e8a431346 100644
--- a/assets/images/avatars/workspace/default-avatar_q.svg
+++ b/assets/images/avatars/workspace/default-avatar_q.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_r.svg b/assets/images/avatars/workspace/default-avatar_r.svg
index 015869a190ad..76fb0e3dbebd 100644
--- a/assets/images/avatars/workspace/default-avatar_r.svg
+++ b/assets/images/avatars/workspace/default-avatar_r.svg
@@ -1,18 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_s.svg b/assets/images/avatars/workspace/default-avatar_s.svg
index 334af3a15636..1fe3d7dd20f8 100644
--- a/assets/images/avatars/workspace/default-avatar_s.svg
+++ b/assets/images/avatars/workspace/default-avatar_s.svg
@@ -1,16 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_t.svg b/assets/images/avatars/workspace/default-avatar_t.svg
index 9ab5962f9ba1..e4aad4cbdd4e 100644
--- a/assets/images/avatars/workspace/default-avatar_t.svg
+++ b/assets/images/avatars/workspace/default-avatar_t.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_u.svg b/assets/images/avatars/workspace/default-avatar_u.svg
index 04daa1bd4b04..b7cc5a0d50be 100644
--- a/assets/images/avatars/workspace/default-avatar_u.svg
+++ b/assets/images/avatars/workspace/default-avatar_u.svg
@@ -1,17 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_v.svg b/assets/images/avatars/workspace/default-avatar_v.svg
index a94242b787e0..fdb2d5e3030f 100644
--- a/assets/images/avatars/workspace/default-avatar_v.svg
+++ b/assets/images/avatars/workspace/default-avatar_v.svg
@@ -1,17 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_w.svg b/assets/images/avatars/workspace/default-avatar_w.svg
index a0756f443422..a8a04f28f976 100644
--- a/assets/images/avatars/workspace/default-avatar_w.svg
+++ b/assets/images/avatars/workspace/default-avatar_w.svg
@@ -1,20 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_x.svg b/assets/images/avatars/workspace/default-avatar_x.svg
index 516da8c1b563..16a125595699 100644
--- a/assets/images/avatars/workspace/default-avatar_x.svg
+++ b/assets/images/avatars/workspace/default-avatar_x.svg
@@ -1,20 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_y.svg b/assets/images/avatars/workspace/default-avatar_y.svg
index 435d0d79bc79..7bb286561588 100644
--- a/assets/images/avatars/workspace/default-avatar_y.svg
+++ b/assets/images/avatars/workspace/default-avatar_y.svg
@@ -1,18 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/avatars/workspace/default-avatar_z.svg b/assets/images/avatars/workspace/default-avatar_z.svg
index 48bb76f4a72a..5966eb43c74b 100644
--- a/assets/images/avatars/workspace/default-avatar_z.svg
+++ b/assets/images/avatars/workspace/default-avatar_z.svg
@@ -1,18 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/back-left.svg b/assets/images/back-left.svg
index c6730b492228..51164100ff59 100644
--- a/assets/images/back-left.svg
+++ b/assets/images/back-left.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bank.svg b/assets/images/bank.svg
index 87a75b644a3a..c23f578a708a 100644
--- a/assets/images/bank.svg
+++ b/assets/images/bank.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/american-express.svg b/assets/images/bankicons/american-express.svg
index 0ab8383d46ed..57696764f6cf 100644
--- a/assets/images/bankicons/american-express.svg
+++ b/assets/images/bankicons/american-express.svg
@@ -1,23 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/bank-of-america.svg b/assets/images/bankicons/bank-of-america.svg
index e4f87be611fc..7a8d43c545a1 100644
--- a/assets/images/bankicons/bank-of-america.svg
+++ b/assets/images/bankicons/bank-of-america.svg
@@ -1,22 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/bb-t.svg b/assets/images/bankicons/bb-t.svg
index 7e7bf1f29ee4..af36426d11f3 100644
--- a/assets/images/bankicons/bb-t.svg
+++ b/assets/images/bankicons/bb-t.svg
@@ -1,25 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/capital-one.svg b/assets/images/bankicons/capital-one.svg
index c37c8e3ca582..be25c3120d2d 100644
--- a/assets/images/bankicons/capital-one.svg
+++ b/assets/images/bankicons/capital-one.svg
@@ -1,53 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/charles-schwab.svg b/assets/images/bankicons/charles-schwab.svg
index 181a668965da..369f17822511 100644
--- a/assets/images/bankicons/charles-schwab.svg
+++ b/assets/images/bankicons/charles-schwab.svg
@@ -1,58 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/chase.svg b/assets/images/bankicons/chase.svg
index 70f0b911f147..2b73256b6427 100644
--- a/assets/images/bankicons/chase.svg
+++ b/assets/images/bankicons/chase.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/citibank.svg b/assets/images/bankicons/citibank.svg
index b03e1efe9bb6..e0bc5d44d9ba 100644
--- a/assets/images/bankicons/citibank.svg
+++ b/assets/images/bankicons/citibank.svg
@@ -1,18 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/citizens-bank.svg b/assets/images/bankicons/citizens-bank.svg
index a0cdc6c1df2b..76f650f59629 100644
--- a/assets/images/bankicons/citizens-bank.svg
+++ b/assets/images/bankicons/citizens-bank.svg
@@ -1,47 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/discover.svg b/assets/images/bankicons/discover.svg
index 75db16e4d1c1..52ead095ed48 100644
--- a/assets/images/bankicons/discover.svg
+++ b/assets/images/bankicons/discover.svg
@@ -1,47 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/expensify-background.png b/assets/images/bankicons/expensify-background.png
index ab7b71d34e11..c06ff4c2725f 100644
Binary files a/assets/images/bankicons/expensify-background.png and b/assets/images/bankicons/expensify-background.png differ
diff --git a/assets/images/bankicons/expensify.svg b/assets/images/bankicons/expensify.svg
index b61773e8d838..95c07b9de619 100644
--- a/assets/images/bankicons/expensify.svg
+++ b/assets/images/bankicons/expensify.svg
@@ -1,18 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/fidelity.svg b/assets/images/bankicons/fidelity.svg
index d49eca17c12d..bd865f145200 100644
--- a/assets/images/bankicons/fidelity.svg
+++ b/assets/images/bankicons/fidelity.svg
@@ -1,17 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/generic-bank-account.svg b/assets/images/bankicons/generic-bank-account.svg
index 493f06b335d8..52ed3f7a1dea 100644
--- a/assets/images/bankicons/generic-bank-account.svg
+++ b/assets/images/bankicons/generic-bank-account.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/huntington-bank.svg b/assets/images/bankicons/huntington-bank.svg
index 40909a273e19..de38785b6c4e 100644
--- a/assets/images/bankicons/huntington-bank.svg
+++ b/assets/images/bankicons/huntington-bank.svg
@@ -1,22 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/navy-federal-credit-union.svg b/assets/images/bankicons/navy-federal-credit-union.svg
index 898cd03768f0..4f57cedc5a6e 100644
--- a/assets/images/bankicons/navy-federal-credit-union.svg
+++ b/assets/images/bankicons/navy-federal-credit-union.svg
@@ -1,85 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/pnc.svg b/assets/images/bankicons/pnc.svg
index 3f78dbe94f47..bf4301979bba 100644
--- a/assets/images/bankicons/pnc.svg
+++ b/assets/images/bankicons/pnc.svg
@@ -1,17 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/regions-bank.svg b/assets/images/bankicons/regions-bank.svg
index bff045f0eb5a..f3d970e3a8a8 100644
--- a/assets/images/bankicons/regions-bank.svg
+++ b/assets/images/bankicons/regions-bank.svg
@@ -1,38 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/suntrust.svg b/assets/images/bankicons/suntrust.svg
index b5b94c105b14..184d04f1e5dd 100644
--- a/assets/images/bankicons/suntrust.svg
+++ b/assets/images/bankicons/suntrust.svg
@@ -1,217 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/td-bank.svg b/assets/images/bankicons/td-bank.svg
index 84675de5f2bf..63dba67711a7 100644
--- a/assets/images/bankicons/td-bank.svg
+++ b/assets/images/bankicons/td-bank.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/us-bank.svg b/assets/images/bankicons/us-bank.svg
index e091ba0a6f50..cf212c8f6464 100644
--- a/assets/images/bankicons/us-bank.svg
+++ b/assets/images/bankicons/us-bank.svg
@@ -1,27 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bankicons/usaa.svg b/assets/images/bankicons/usaa.svg
index 1e137fab626f..547209084ef4 100644
--- a/assets/images/bankicons/usaa.svg
+++ b/assets/images/bankicons/usaa.svg
@@ -1,36 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bill.svg b/assets/images/bill.svg
index 6d9e7bd74ee6..c60dbfcc2bfe 100644
--- a/assets/images/bill.svg
+++ b/assets/images/bill.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bolt.svg b/assets/images/bolt.svg
index c54c044a898e..c8ea05c0b447 100644
--- a/assets/images/bolt.svg
+++ b/assets/images/bolt.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/briefcase.svg b/assets/images/briefcase.svg
index c73734c6b124..eb35954cbb15 100644
--- a/assets/images/briefcase.svg
+++ b/assets/images/briefcase.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/bug.svg b/assets/images/bug.svg
index 8a33c1c17437..ca405caea9ac 100644
--- a/assets/images/bug.svg
+++ b/assets/images/bug.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/building.svg b/assets/images/building.svg
index 27efe759f4e4..0254da81f38f 100644
--- a/assets/images/building.svg
+++ b/assets/images/building.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/calendar.svg b/assets/images/calendar.svg
index 18885029a7c8..f855bbad61eb 100644
--- a/assets/images/calendar.svg
+++ b/assets/images/calendar.svg
@@ -1,16 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/camera.svg b/assets/images/camera.svg
index 966a185ae5d9..b40af157c275 100644
--- a/assets/images/camera.svg
+++ b/assets/images/camera.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/car.svg b/assets/images/car.svg
index 7172eb1db01e..6c765f34c2da 100644
--- a/assets/images/car.svg
+++ b/assets/images/car.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/american-express.svg b/assets/images/cardicons/american-express.svg
index 9e31f7c8a08e..201cc9262394 100644
--- a/assets/images/cardicons/american-express.svg
+++ b/assets/images/cardicons/american-express.svg
@@ -1,25 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/bank-of-america.svg b/assets/images/cardicons/bank-of-america.svg
index 62dd510b0649..20f180ebfdd6 100644
--- a/assets/images/cardicons/bank-of-america.svg
+++ b/assets/images/cardicons/bank-of-america.svg
@@ -1,25 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/bb-t.svg b/assets/images/cardicons/bb-t.svg
index ad3676458d21..f37d1fda7f8d 100644
--- a/assets/images/cardicons/bb-t.svg
+++ b/assets/images/cardicons/bb-t.svg
@@ -1,33 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/capital-one.svg b/assets/images/cardicons/capital-one.svg
index ee4f756e2600..6ac463b4193e 100644
--- a/assets/images/cardicons/capital-one.svg
+++ b/assets/images/cardicons/capital-one.svg
@@ -1,67 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/charles-schwab.svg b/assets/images/cardicons/charles-schwab.svg
index 39c894042cd3..b38ac495d779 100644
--- a/assets/images/cardicons/charles-schwab.svg
+++ b/assets/images/cardicons/charles-schwab.svg
@@ -1,76 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/chase.svg b/assets/images/cardicons/chase.svg
index 8e8ddb6d5378..7f0b8dfe62c2 100644
--- a/assets/images/cardicons/chase.svg
+++ b/assets/images/cardicons/chase.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/citibank.svg b/assets/images/cardicons/citibank.svg
index f9869aee7146..5bf890363378 100644
--- a/assets/images/cardicons/citibank.svg
+++ b/assets/images/cardicons/citibank.svg
@@ -1,22 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/citizens.svg b/assets/images/cardicons/citizens.svg
index 3b4bf9ea1af3..ec758b3c0935 100644
--- a/assets/images/cardicons/citizens.svg
+++ b/assets/images/cardicons/citizens.svg
@@ -1,57 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/discover.svg b/assets/images/cardicons/discover.svg
index 668e5634339d..a035727d3578 100644
--- a/assets/images/cardicons/discover.svg
+++ b/assets/images/cardicons/discover.svg
@@ -1,53 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/expensify-card-dark.svg b/assets/images/cardicons/expensify-card-dark.svg
index 4a65afeeda9d..7591a8abc29a 100644
--- a/assets/images/cardicons/expensify-card-dark.svg
+++ b/assets/images/cardicons/expensify-card-dark.svg
@@ -1,78 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/fidelity.svg b/assets/images/cardicons/fidelity.svg
index c87f9c4aa56c..385370d00060 100644
--- a/assets/images/cardicons/fidelity.svg
+++ b/assets/images/cardicons/fidelity.svg
@@ -1,21 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/generic-bank-card.svg b/assets/images/cardicons/generic-bank-card.svg
index f700691ac29b..6facb98577cb 100644
--- a/assets/images/cardicons/generic-bank-card.svg
+++ b/assets/images/cardicons/generic-bank-card.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/huntington-bank.svg b/assets/images/cardicons/huntington-bank.svg
index c108c7039898..6a1d50d998a6 100644
--- a/assets/images/cardicons/huntington-bank.svg
+++ b/assets/images/cardicons/huntington-bank.svg
@@ -1,26 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/navy-federal-credit-union.svg b/assets/images/cardicons/navy-federal-credit-union.svg
index 5abc1103cce1..b67aec1a1a5f 100644
--- a/assets/images/cardicons/navy-federal-credit-union.svg
+++ b/assets/images/cardicons/navy-federal-credit-union.svg
@@ -1,105 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/pnc.svg b/assets/images/cardicons/pnc.svg
index ae4d4aac8e41..839e630a1b85 100644
--- a/assets/images/cardicons/pnc.svg
+++ b/assets/images/cardicons/pnc.svg
@@ -1,18 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/regions-bank.svg b/assets/images/cardicons/regions-bank.svg
index 1837ad2be41b..1f660de06ea1 100644
--- a/assets/images/cardicons/regions-bank.svg
+++ b/assets/images/cardicons/regions-bank.svg
@@ -1,45 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/suntrust.svg b/assets/images/cardicons/suntrust.svg
index 32ea5096f876..32adeea64cc6 100644
--- a/assets/images/cardicons/suntrust.svg
+++ b/assets/images/cardicons/suntrust.svg
@@ -1,237 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/td-bank.svg b/assets/images/cardicons/td-bank.svg
index 19988e35bbbe..f75f610816d3 100644
--- a/assets/images/cardicons/td-bank.svg
+++ b/assets/images/cardicons/td-bank.svg
@@ -1,17 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/us-bank.svg b/assets/images/cardicons/us-bank.svg
index 321b4cb755b0..9a1af062c720 100644
--- a/assets/images/cardicons/us-bank.svg
+++ b/assets/images/cardicons/us-bank.svg
@@ -1,32 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cardicons/usaa.svg b/assets/images/cardicons/usaa.svg
index bb634f64e658..d58db9e750c8 100644
--- a/assets/images/cardicons/usaa.svg
+++ b/assets/images/cardicons/usaa.svg
@@ -1,40 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/cash.svg b/assets/images/cash.svg
index 7780e9be9eec..ff4f3fc69664 100644
--- a/assets/images/cash.svg
+++ b/assets/images/cash.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/chair.svg b/assets/images/chair.svg
index d8864d205b33..4ee59941e204 100644
--- a/assets/images/chair.svg
+++ b/assets/images/chair.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/chatbubble.svg b/assets/images/chatbubble.svg
index 23bc4b429ea0..e6863cbd502a 100644
--- a/assets/images/chatbubble.svg
+++ b/assets/images/chatbubble.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/chatbubbles.svg b/assets/images/chatbubbles.svg
index 6194c43e631e..9aca0a7dd8ed 100644
--- a/assets/images/chatbubbles.svg
+++ b/assets/images/chatbubbles.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/checkmark.svg b/assets/images/checkmark.svg
index 7ac28068ff56..8b50271e4419 100644
--- a/assets/images/checkmark.svg
+++ b/assets/images/checkmark.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/close.svg b/assets/images/close.svg
index f36b0714385a..849fce4abb8e 100644
--- a/assets/images/close.svg
+++ b/assets/images/close.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/closed-sign.svg b/assets/images/closed-sign.svg
index 6454e31cd35e..653abe86d2fc 100644
--- a/assets/images/closed-sign.svg
+++ b/assets/images/closed-sign.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/collapse.svg b/assets/images/collapse.svg
index 9b254182dbe2..ea917e4ee827 100644
--- a/assets/images/collapse.svg
+++ b/assets/images/collapse.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/concierge.svg b/assets/images/concierge.svg
index 2ed0becb61da..70c91bf3fbb5 100644
--- a/assets/images/concierge.svg
+++ b/assets/images/concierge.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/connect.svg b/assets/images/connect.svg
index e30231e46840..3460bafd5596 100644
--- a/assets/images/connect.svg
+++ b/assets/images/connect.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/copy.svg b/assets/images/copy.svg
index 87707f0be6c1..fa53b2b20ffc 100644
--- a/assets/images/copy.svg
+++ b/assets/images/copy.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/creditcard.svg b/assets/images/creditcard.svg
index f174472a63c4..d2fd84adaf58 100644
--- a/assets/images/creditcard.svg
+++ b/assets/images/creditcard.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/document.svg b/assets/images/document.svg
index 8ef6c5ec10ce..a4f3c248c266 100644
--- a/assets/images/document.svg
+++ b/assets/images/document.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/dot-indicator-unfilled.svg b/assets/images/dot-indicator-unfilled.svg
index ae131b1c2cba..d74c4dff1592 100644
--- a/assets/images/dot-indicator-unfilled.svg
+++ b/assets/images/dot-indicator-unfilled.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/dot-indicator.svg b/assets/images/dot-indicator.svg
index 9d808d91babe..b6565407807f 100644
--- a/assets/images/dot-indicator.svg
+++ b/assets/images/dot-indicator.svg
@@ -1,6 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/down.svg b/assets/images/down.svg
index e4bb5bea9b4d..28d80840f322 100644
--- a/assets/images/down.svg
+++ b/assets/images/down.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/download.svg b/assets/images/download.svg
index 581f504611cc..d3d3b554b990 100644
--- a/assets/images/download.svg
+++ b/assets/images/download.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/drag-and-drop.svg b/assets/images/drag-and-drop.svg
index 8e9251ff3ae5..154ad34f061d 100644
--- a/assets/images/drag-and-drop.svg
+++ b/assets/images/drag-and-drop.svg
@@ -1,17 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/drag-handles.svg b/assets/images/drag-handles.svg
index ec4fc4ccc672..9951d95cb612 100644
--- a/assets/images/drag-handles.svg
+++ b/assets/images/drag-handles.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/eReceipt-BGImage.svg b/assets/images/eReceipt-BGImage.svg
index 48aa548ad6ee..bf89dd853ac8 100644
--- a/assets/images/eReceipt-BGImage.svg
+++ b/assets/images/eReceipt-BGImage.svg
@@ -1,314 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/eReceiptBGs/eReceiptBG_blue.png b/assets/images/eReceiptBGs/eReceiptBG_blue.png
index f317b72dc4fc..602efe533162 100644
Binary files a/assets/images/eReceiptBGs/eReceiptBG_blue.png and b/assets/images/eReceiptBGs/eReceiptBG_blue.png differ
diff --git a/assets/images/eReceiptBGs/eReceiptBG_green.png b/assets/images/eReceiptBGs/eReceiptBG_green.png
index 55fe8886bca9..cf7ae9c58d87 100644
Binary files a/assets/images/eReceiptBGs/eReceiptBG_green.png and b/assets/images/eReceiptBGs/eReceiptBG_green.png differ
diff --git a/assets/images/eReceiptBGs/eReceiptBG_navy.png b/assets/images/eReceiptBGs/eReceiptBG_navy.png
index 2b9616d42c11..0f9449bb26a0 100644
Binary files a/assets/images/eReceiptBGs/eReceiptBG_navy.png and b/assets/images/eReceiptBGs/eReceiptBG_navy.png differ
diff --git a/assets/images/eReceiptBGs/eReceiptBG_pink.png b/assets/images/eReceiptBGs/eReceiptBG_pink.png
index 41b6492c3a35..0fd2ebdd5c6e 100644
Binary files a/assets/images/eReceiptBGs/eReceiptBG_pink.png and b/assets/images/eReceiptBGs/eReceiptBG_pink.png differ
diff --git a/assets/images/eReceiptBGs/eReceiptBG_tangerine.png b/assets/images/eReceiptBGs/eReceiptBG_tangerine.png
index 00a8cd6dd612..3f7e61b04969 100644
Binary files a/assets/images/eReceiptBGs/eReceiptBG_tangerine.png and b/assets/images/eReceiptBGs/eReceiptBG_tangerine.png differ
diff --git a/assets/images/eReceiptBGs/eReceiptBG_yellow.png b/assets/images/eReceiptBGs/eReceiptBG_yellow.png
index 7eb9d1f87fa6..c0c6df3d5748 100644
Binary files a/assets/images/eReceiptBGs/eReceiptBG_yellow.png and b/assets/images/eReceiptBGs/eReceiptBG_yellow.png differ
diff --git a/assets/images/eReceiptIcon.svg b/assets/images/eReceiptIcon.svg
index e54c3a106a48..9b0612a03231 100644
--- a/assets/images/eReceiptIcon.svg
+++ b/assets/images/eReceiptIcon.svg
@@ -1,6 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/eReceipt_background.svg b/assets/images/eReceipt_background.svg
index 5070ed3b2f24..6fadeb352d9b 100644
--- a/assets/images/eReceipt_background.svg
+++ b/assets/images/eReceipt_background.svg
@@ -1,1635 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/emoji.svg b/assets/images/emoji.svg
index 431f46962bd7..3b419b40fdf2 100644
--- a/assets/images/emoji.svg
+++ b/assets/images/emoji.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/emojiCategoryIcons/add-emoji.svg b/assets/images/emojiCategoryIcons/add-emoji.svg
index 5cec67508e4b..e7dd57a0c282 100644
--- a/assets/images/emojiCategoryIcons/add-emoji.svg
+++ b/assets/images/emojiCategoryIcons/add-emoji.svg
@@ -1,25 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/emojiCategoryIcons/calendar.svg b/assets/images/emojiCategoryIcons/calendar.svg
index 18885029a7c8..f855bbad61eb 100644
--- a/assets/images/emojiCategoryIcons/calendar.svg
+++ b/assets/images/emojiCategoryIcons/calendar.svg
@@ -1,16 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/emojiCategoryIcons/car.svg b/assets/images/emojiCategoryIcons/car.svg
index e5cde58b2615..6c765f34c2da 100644
--- a/assets/images/emojiCategoryIcons/car.svg
+++ b/assets/images/emojiCategoryIcons/car.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/emojiCategoryIcons/flag.svg b/assets/images/emojiCategoryIcons/flag.svg
index e72787c3665b..5a57ac004991 100644
--- a/assets/images/emojiCategoryIcons/flag.svg
+++ b/assets/images/emojiCategoryIcons/flag.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/emojiCategoryIcons/hamburger.svg b/assets/images/emojiCategoryIcons/hamburger.svg
index 52945988effc..adc0ff0ed089 100644
--- a/assets/images/emojiCategoryIcons/hamburger.svg
+++ b/assets/images/emojiCategoryIcons/hamburger.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/emojiCategoryIcons/heart.svg b/assets/images/emojiCategoryIcons/heart.svg
index 95e73f329cfa..761bf2770a1e 100644
--- a/assets/images/emojiCategoryIcons/heart.svg
+++ b/assets/images/emojiCategoryIcons/heart.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/emojiCategoryIcons/light-bulb.svg b/assets/images/emojiCategoryIcons/light-bulb.svg
index 0e6a33c041df..b3b8927786c3 100644
--- a/assets/images/emojiCategoryIcons/light-bulb.svg
+++ b/assets/images/emojiCategoryIcons/light-bulb.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/emojiCategoryIcons/peace-sign.svg b/assets/images/emojiCategoryIcons/peace-sign.svg
index ab76642fc48d..1015298d7b2c 100644
--- a/assets/images/emojiCategoryIcons/peace-sign.svg
+++ b/assets/images/emojiCategoryIcons/peace-sign.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/emojiCategoryIcons/plane.svg b/assets/images/emojiCategoryIcons/plane.svg
index 17aca931f8a3..7c989b2e802b 100644
--- a/assets/images/emojiCategoryIcons/plane.svg
+++ b/assets/images/emojiCategoryIcons/plane.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/emojiCategoryIcons/plant.svg b/assets/images/emojiCategoryIcons/plant.svg
index a17ed231e1df..b28f95109299 100644
--- a/assets/images/emojiCategoryIcons/plant.svg
+++ b/assets/images/emojiCategoryIcons/plant.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/emojiCategoryIcons/soccer-ball.svg b/assets/images/emojiCategoryIcons/soccer-ball.svg
index 40fa05516a11..d5eeb4bf9b7a 100644
--- a/assets/images/emojiCategoryIcons/soccer-ball.svg
+++ b/assets/images/emojiCategoryIcons/soccer-ball.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/empty-state_background-fade.png b/assets/images/empty-state_background-fade.png
index 816ff7343310..e449ca1efa23 100644
Binary files a/assets/images/empty-state_background-fade.png and b/assets/images/empty-state_background-fade.png differ
diff --git a/assets/images/emptystate__routepending.svg b/assets/images/emptystate__routepending.svg
index 7646917046cc..90f3296d37d6 100644
--- a/assets/images/emptystate__routepending.svg
+++ b/assets/images/emptystate__routepending.svg
@@ -1,43 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/example-check-image-en.png b/assets/images/example-check-image-en.png
index 2a4f32ade69a..903618776cdf 100644
Binary files a/assets/images/example-check-image-en.png and b/assets/images/example-check-image-en.png differ
diff --git a/assets/images/example-check-image-es.png b/assets/images/example-check-image-es.png
index 435151525a7e..de695a43833d 100644
Binary files a/assets/images/example-check-image-es.png and b/assets/images/example-check-image-es.png differ
diff --git a/assets/images/exclamation.svg b/assets/images/exclamation.svg
index ab70c6f3ca8f..8c55e9667a46 100644
--- a/assets/images/exclamation.svg
+++ b/assets/images/exclamation.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/exit.svg b/assets/images/exit.svg
index 07792548c8a5..8e466eea3608 100644
--- a/assets/images/exit.svg
+++ b/assets/images/exit.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/expand.svg b/assets/images/expand.svg
index 0d5d520e444a..25d79d849b58 100644
--- a/assets/images/expand.svg
+++ b/assets/images/expand.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/expensify-app-icon.svg b/assets/images/expensify-app-icon.svg
index a0adfe7dd952..f7ae8b487027 100644
--- a/assets/images/expensify-app-icon.svg
+++ b/assets/images/expensify-app-icon.svg
@@ -1,18 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/expensify-card.svg b/assets/images/expensify-card.svg
index f95e3ed20288..52f55778b2bd 100644
--- a/assets/images/expensify-card.svg
+++ b/assets/images/expensify-card.svg
@@ -1,69 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/expensify-footer-logo-vertical.svg b/assets/images/expensify-footer-logo-vertical.svg
index 58dc05ad2944..9cd5e26cc8f2 100644
--- a/assets/images/expensify-footer-logo-vertical.svg
+++ b/assets/images/expensify-footer-logo-vertical.svg
@@ -1,30 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/expensify-footer-logo.svg b/assets/images/expensify-footer-logo.svg
index e664651b84fd..9e3f837f7365 100644
--- a/assets/images/expensify-footer-logo.svg
+++ b/assets/images/expensify-footer-logo.svg
@@ -1,30 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/expensify-logo--adhoc.svg b/assets/images/expensify-logo--adhoc.svg
index 63b6f896e3a5..70d9526ee5f8 100644
--- a/assets/images/expensify-logo--adhoc.svg
+++ b/assets/images/expensify-logo--adhoc.svg
@@ -1,47 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/expensify-logo--dev.svg b/assets/images/expensify-logo--dev.svg
index f68fafbad806..92dad9f6d530 100644
--- a/assets/images/expensify-logo--dev.svg
+++ b/assets/images/expensify-logo--dev.svg
@@ -1,42 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/expensify-logo--staging.svg b/assets/images/expensify-logo--staging.svg
index 12b0b9bf6e79..22cbba2368e5 100644
--- a/assets/images/expensify-logo--staging.svg
+++ b/assets/images/expensify-logo--staging.svg
@@ -1,45 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/expensify-logo-round-clearspace.png b/assets/images/expensify-logo-round-clearspace.png
index da0f19dda770..2ccb9a39752d 100644
Binary files a/assets/images/expensify-logo-round-clearspace.png and b/assets/images/expensify-logo-round-clearspace.png differ
diff --git a/assets/images/expensify-logo-round-dark.png b/assets/images/expensify-logo-round-dark.png
index 106d28274fd3..a1de022315d9 100644
Binary files a/assets/images/expensify-logo-round-dark.png and b/assets/images/expensify-logo-round-dark.png differ
diff --git a/assets/images/expensify-logo-round-transparent.png b/assets/images/expensify-logo-round-transparent.png
index cfad187e38ef..b2ff00112590 100644
Binary files a/assets/images/expensify-logo-round-transparent.png and b/assets/images/expensify-logo-round-transparent.png differ
diff --git a/assets/images/expensify-logo-round.png b/assets/images/expensify-logo-round.png
index 59d29ed09530..bc97e70dd83b 100644
Binary files a/assets/images/expensify-logo-round.png and b/assets/images/expensify-logo-round.png differ
diff --git a/assets/images/expensify-wordmark.svg b/assets/images/expensify-wordmark.svg
index 69fbcbae6743..da9c93f21e8c 100644
--- a/assets/images/expensify-wordmark.svg
+++ b/assets/images/expensify-wordmark.svg
@@ -1,23 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/expensify_wordmark_white.svg b/assets/images/expensify_wordmark_white.svg
index 1ad7640b2602..008cfe625591 100644
--- a/assets/images/expensify_wordmark_white.svg
+++ b/assets/images/expensify_wordmark_white.svg
@@ -1,26 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/expensifycard.svg b/assets/images/expensifycard.svg
index c146a4709e94..8e20d27af48c 100644
--- a/assets/images/expensifycard.svg
+++ b/assets/images/expensifycard.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/eye-disabled.svg b/assets/images/eye-disabled.svg
index 4055ba7e78a0..2537205a19da 100644
--- a/assets/images/eye-disabled.svg
+++ b/assets/images/eye-disabled.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/eye.svg b/assets/images/eye.svg
index dd0a4fd532b8..79c9f18e68f9 100644
--- a/assets/images/eye.svg
+++ b/assets/images/eye.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/flag.svg b/assets/images/flag.svg
index 9b6737459fbd..5a57ac004991 100644
--- a/assets/images/flag.svg
+++ b/assets/images/flag.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/flag_level_01.svg b/assets/images/flag_level_01.svg
index a4259deb0d2c..e77b84819777 100644
--- a/assets/images/flag_level_01.svg
+++ b/assets/images/flag_level_01.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/flag_level_02.svg b/assets/images/flag_level_02.svg
index 9d7010dbb7f9..c31ac07e2886 100644
--- a/assets/images/flag_level_02.svg
+++ b/assets/images/flag_level_02.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/flag_level_03.svg b/assets/images/flag_level_03.svg
index 14fc80792cc2..a156e13c2c74 100644
--- a/assets/images/flag_level_03.svg
+++ b/assets/images/flag_level_03.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/gallery.svg b/assets/images/gallery.svg
index 21eb78059329..6d061e77c658 100644
--- a/assets/images/gallery.svg
+++ b/assets/images/gallery.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/gear.svg b/assets/images/gear.svg
index f7090075e0a4..234d60a31ae5 100644
--- a/assets/images/gear.svg
+++ b/assets/images/gear.svg
@@ -1,18 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/globe.svg b/assets/images/globe.svg
index f057bd36379b..b6f802d72435 100644
--- a/assets/images/globe.svg
+++ b/assets/images/globe.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/google-meet.svg b/assets/images/google-meet.svg
index 980cd102f67a..8def88aa6edc 100644
--- a/assets/images/google-meet.svg
+++ b/assets/images/google-meet.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/hand.svg b/assets/images/hand.svg
index e9a56d260ed0..047af1d67ed8 100644
--- a/assets/images/hand.svg
+++ b/assets/images/hand.svg
@@ -1,196 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/hashtag.svg b/assets/images/hashtag.svg
index 86324ffcdba8..00d0a253659a 100644
--- a/assets/images/hashtag.svg
+++ b/assets/images/hashtag.svg
@@ -1,16 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/heart.svg b/assets/images/heart.svg
index 95e73f329cfa..761bf2770a1e 100644
--- a/assets/images/heart.svg
+++ b/assets/images/heart.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/history.svg b/assets/images/history.svg
index 5eefb04b480d..09be03108312 100644
--- a/assets/images/history.svg
+++ b/assets/images/history.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/home-background--desktop.svg b/assets/images/home-background--desktop.svg
index c577609efb3b..4d1c18fb3ba7 100644
--- a/assets/images/home-background--desktop.svg
+++ b/assets/images/home-background--desktop.svg
@@ -1,8835 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/home-background--mobile.svg b/assets/images/home-background--mobile.svg
index 0af3aac59146..7c4d4d8289b7 100644
--- a/assets/images/home-background--mobile.svg
+++ b/assets/images/home-background--mobile.svg
@@ -1,6556 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/home-fade-gradient--mobile.svg b/assets/images/home-fade-gradient--mobile.svg
index ca03eb3323af..0b24b678a2e6 100644
--- a/assets/images/home-fade-gradient--mobile.svg
+++ b/assets/images/home-fade-gradient--mobile.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/home-fade-gradient.svg b/assets/images/home-fade-gradient.svg
index 6aada6633a8b..bfe04d545364 100644
--- a/assets/images/home-fade-gradient.svg
+++ b/assets/images/home-fade-gradient.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/hourglass.svg b/assets/images/hourglass.svg
index b04dc3589d73..a04084dca1f5 100644
--- a/assets/images/hourglass.svg
+++ b/assets/images/hourglass.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/image-crop-circle-mask.svg b/assets/images/image-crop-circle-mask.svg
index 8edded23218d..491adb0a7248 100644
--- a/assets/images/image-crop-circle-mask.svg
+++ b/assets/images/image-crop-circle-mask.svg
@@ -1,23 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/image-crop-square-mask.svg b/assets/images/image-crop-square-mask.svg
index 050998d576f8..947c99987f9b 100644
--- a/assets/images/image-crop-square-mask.svg
+++ b/assets/images/image-crop-square-mask.svg
@@ -1,24 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/info.svg b/assets/images/info.svg
index 7446622ab044..da3fa688b44e 100644
--- a/assets/images/info.svg
+++ b/assets/images/info.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/invoice.svg b/assets/images/invoice.svg
index 618aba9be614..0ea93b1b8e2b 100644
--- a/assets/images/invoice.svg
+++ b/assets/images/invoice.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/key.svg b/assets/images/key.svg
index 595a1541ce5e..b25879191ac9 100644
--- a/assets/images/key.svg
+++ b/assets/images/key.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/keyboard.svg b/assets/images/keyboard.svg
index 16df73f0026b..f6040430fcb4 100644
--- a/assets/images/keyboard.svg
+++ b/assets/images/keyboard.svg
@@ -1,20 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/link-copy.svg b/assets/images/link-copy.svg
index e153fbc49795..a23593e79eab 100644
--- a/assets/images/link-copy.svg
+++ b/assets/images/link-copy.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/link.svg b/assets/images/link.svg
index a284470a5c79..abfac3a2d180 100644
--- a/assets/images/link.svg
+++ b/assets/images/link.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/location.svg b/assets/images/location.svg
index ad8102051e26..fa00dafbcbfe 100644
--- a/assets/images/location.svg
+++ b/assets/images/location.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/lock.svg b/assets/images/lock.svg
index ab4bafc4724d..9b4c17c6dea9 100644
--- a/assets/images/lock.svg
+++ b/assets/images/lock.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/luggage.svg b/assets/images/luggage.svg
index 65edc1f31fb3..46453be7c392 100644
--- a/assets/images/luggage.svg
+++ b/assets/images/luggage.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/magnifying-glass.svg b/assets/images/magnifying-glass.svg
index c0e2465f0308..d8457b870bc8 100644
--- a/assets/images/magnifying-glass.svg
+++ b/assets/images/magnifying-glass.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/mail.svg b/assets/images/mail.svg
index 1a3d788288b9..9963b0cfb84a 100644
--- a/assets/images/mail.svg
+++ b/assets/images/mail.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/megaphone.svg b/assets/images/megaphone.svg
index a10a6d838558..45e905d3f3e3 100644
--- a/assets/images/megaphone.svg
+++ b/assets/images/megaphone.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/menu.svg b/assets/images/menu.svg
index 9995bb6d521b..c0a7e3aa7b68 100644
--- a/assets/images/menu.svg
+++ b/assets/images/menu.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/money-bag.svg b/assets/images/money-bag.svg
index e691635f9544..e02865e5aff9 100644
--- a/assets/images/money-bag.svg
+++ b/assets/images/money-bag.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/money-circle.svg b/assets/images/money-circle.svg
index f6c66e0a6dfb..28783d0f78a7 100644
--- a/assets/images/money-circle.svg
+++ b/assets/images/money-circle.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/money-stack.svg b/assets/images/money-stack.svg
index b9a93c76198c..587180bb11d6 100644
--- a/assets/images/money-stack.svg
+++ b/assets/images/money-stack.svg
@@ -1,125 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/monitor.svg b/assets/images/monitor.svg
index a8b99721a9cc..d5c74474b524 100644
--- a/assets/images/monitor.svg
+++ b/assets/images/monitor.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/new-expensify-adhoc.svg b/assets/images/new-expensify-adhoc.svg
index d3a926a097ec..f2603555fc38 100644
--- a/assets/images/new-expensify-adhoc.svg
+++ b/assets/images/new-expensify-adhoc.svg
@@ -1,25 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/new-expensify-dark.svg b/assets/images/new-expensify-dark.svg
index ad34f1d9dfce..01967175139b 100644
--- a/assets/images/new-expensify-dark.svg
+++ b/assets/images/new-expensify-dark.svg
@@ -1,10 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/new-expensify-dev.svg b/assets/images/new-expensify-dev.svg
index 423fe56c98b7..9c11ed02433c 100644
--- a/assets/images/new-expensify-dev.svg
+++ b/assets/images/new-expensify-dev.svg
@@ -1,25 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/new-expensify-stg.svg b/assets/images/new-expensify-stg.svg
index 61852bbb1932..f151d7c4c130 100644
--- a/assets/images/new-expensify-stg.svg
+++ b/assets/images/new-expensify-stg.svg
@@ -1,48 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/new-expensify.svg b/assets/images/new-expensify.svg
index dc8273e6aa99..38276ecd9385 100644
--- a/assets/images/new-expensify.svg
+++ b/assets/images/new-expensify.svg
@@ -1,29 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/new-window.svg b/assets/images/new-window.svg
index c1b9991558b7..5f8212a20197 100644
--- a/assets/images/new-window.svg
+++ b/assets/images/new-window.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/new-workspace.svg b/assets/images/new-workspace.svg
index 62f4717108e9..e50136e34355 100644
--- a/assets/images/new-workspace.svg
+++ b/assets/images/new-workspace.svg
@@ -1,19 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/offline-cloud.svg b/assets/images/offline-cloud.svg
index ae8305e52934..cb789b6ad5be 100644
--- a/assets/images/offline-cloud.svg
+++ b/assets/images/offline-cloud.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/offline.svg b/assets/images/offline.svg
index 21cb29d382c0..daf4370ab7c1 100644
--- a/assets/images/offline.svg
+++ b/assets/images/offline.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/paperclip.svg b/assets/images/paperclip.svg
index 29760284c687..6421040301a0 100644
--- a/assets/images/paperclip.svg
+++ b/assets/images/paperclip.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/paycheck.svg b/assets/images/paycheck.svg
index d54602d8b11b..f607e34833a1 100644
--- a/assets/images/paycheck.svg
+++ b/assets/images/paycheck.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/paypal.svg b/assets/images/paypal.svg
index 370a55b41284..4aaccc60c21c 100644
--- a/assets/images/paypal.svg
+++ b/assets/images/paypal.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/pencil.svg b/assets/images/pencil.svg
index 8673005d818a..2f1f8354d3b5 100644
--- a/assets/images/pencil.svg
+++ b/assets/images/pencil.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/phone.svg b/assets/images/phone.svg
index 38cc8c1319dc..22492a8a81c2 100644
--- a/assets/images/phone.svg
+++ b/assets/images/phone.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/pin.svg b/assets/images/pin.svg
index 048f95cbc929..7d2e62687344 100644
--- a/assets/images/pin.svg
+++ b/assets/images/pin.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/plus.svg b/assets/images/plus.svg
index 59a0b803dde4..9d658b6bbea7 100644
--- a/assets/images/plus.svg
+++ b/assets/images/plus.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/printer.svg b/assets/images/printer.svg
index ce0d725d4251..b231412ddebe 100644
--- a/assets/images/printer.svg
+++ b/assets/images/printer.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/abracadabra.svg b/assets/images/product-illustrations/abracadabra.svg
index dba7336cd11d..3eb20add6066 100644
--- a/assets/images/product-illustrations/abracadabra.svg
+++ b/assets/images/product-illustrations/abracadabra.svg
@@ -1,710 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/bank-arrow--pink.svg b/assets/images/product-illustrations/bank-arrow--pink.svg
index c561bfd2790d..a7d6668d4d9d 100644
--- a/assets/images/product-illustrations/bank-arrow--pink.svg
+++ b/assets/images/product-illustrations/bank-arrow--pink.svg
@@ -1,43 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/bank-mouse--green.svg b/assets/images/product-illustrations/bank-mouse--green.svg
index 99dfd1718c1e..b7cfc91bbd46 100644
--- a/assets/images/product-illustrations/bank-mouse--green.svg
+++ b/assets/images/product-illustrations/bank-mouse--green.svg
@@ -1,50 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/bank-user--green.svg b/assets/images/product-illustrations/bank-user--green.svg
index 676d05c3bc0c..35029902801c 100644
--- a/assets/images/product-illustrations/bank-user--green.svg
+++ b/assets/images/product-illustrations/bank-user--green.svg
@@ -1,48 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/concierge--blue.svg b/assets/images/product-illustrations/concierge--blue.svg
index d1d3fede1f64..facba4991d05 100644
--- a/assets/images/product-illustrations/concierge--blue.svg
+++ b/assets/images/product-illustrations/concierge--blue.svg
@@ -1,20 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/concierge--exclamation.svg b/assets/images/product-illustrations/concierge--exclamation.svg
index ed4b8fd3f533..8033d84b1a5a 100644
--- a/assets/images/product-illustrations/concierge--exclamation.svg
+++ b/assets/images/product-illustrations/concierge--exclamation.svg
@@ -1,26 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/credit-cards--blue.svg b/assets/images/product-illustrations/credit-cards--blue.svg
index 008dbd20be30..51f18537af1a 100644
--- a/assets/images/product-illustrations/credit-cards--blue.svg
+++ b/assets/images/product-illustrations/credit-cards--blue.svg
@@ -1,31 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/gps-track--orange.svg b/assets/images/product-illustrations/gps-track--orange.svg
index 400958af31ca..1c13895e27fb 100644
--- a/assets/images/product-illustrations/gps-track--orange.svg
+++ b/assets/images/product-illustrations/gps-track--orange.svg
@@ -1,24 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/home-illustration-hands.svg b/assets/images/product-illustrations/home-illustration-hands.svg
index 9a70d8cc6363..75ee67189126 100644
--- a/assets/images/product-illustrations/home-illustration-hands.svg
+++ b/assets/images/product-illustrations/home-illustration-hands.svg
@@ -1,545 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/invoice--orange.svg b/assets/images/product-illustrations/invoice--orange.svg
index aebd50660662..0512cfd2959f 100644
--- a/assets/images/product-illustrations/invoice--orange.svg
+++ b/assets/images/product-illustrations/invoice--orange.svg
@@ -1,25 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/jewel-box--blue.svg b/assets/images/product-illustrations/jewel-box--blue.svg
index b9d6a084bcb9..c137a0063b5f 100644
--- a/assets/images/product-illustrations/jewel-box--blue.svg
+++ b/assets/images/product-illustrations/jewel-box--blue.svg
@@ -1,45 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/jewel-box--green.svg b/assets/images/product-illustrations/jewel-box--green.svg
index ba1cade3dcc3..c4c73385b636 100644
--- a/assets/images/product-illustrations/jewel-box--green.svg
+++ b/assets/images/product-illustrations/jewel-box--green.svg
@@ -1,45 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/jewel-box--pink.svg b/assets/images/product-illustrations/jewel-box--pink.svg
index dd58151c9132..d42baf0c5d8b 100644
--- a/assets/images/product-illustrations/jewel-box--pink.svg
+++ b/assets/images/product-illustrations/jewel-box--pink.svg
@@ -1,45 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/jewel-box--yellow.svg b/assets/images/product-illustrations/jewel-box--yellow.svg
index 858d5b666886..3f40365bd0f1 100644
--- a/assets/images/product-illustrations/jewel-box--yellow.svg
+++ b/assets/images/product-illustrations/jewel-box--yellow.svg
@@ -1,45 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/magic-code.svg b/assets/images/product-illustrations/magic-code.svg
index 7f26cf51874c..f623857f1546 100644
--- a/assets/images/product-illustrations/magic-code.svg
+++ b/assets/images/product-illustrations/magic-code.svg
@@ -1,931 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/money-envelope--blue.svg b/assets/images/product-illustrations/money-envelope--blue.svg
index 199489af882f..78ac4032daf5 100644
--- a/assets/images/product-illustrations/money-envelope--blue.svg
+++ b/assets/images/product-illustrations/money-envelope--blue.svg
@@ -1,30 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/money-mouse--pink.svg b/assets/images/product-illustrations/money-mouse--pink.svg
index 72c21fc46754..ae67d1f8c2b6 100644
--- a/assets/images/product-illustrations/money-mouse--pink.svg
+++ b/assets/images/product-illustrations/money-mouse--pink.svg
@@ -1,30 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/receipt--yellow.svg b/assets/images/product-illustrations/receipt--yellow.svg
index f40f3e0a5aa9..c5e2ea9c07e3 100644
--- a/assets/images/product-illustrations/receipt--yellow.svg
+++ b/assets/images/product-illustrations/receipt--yellow.svg
@@ -1,20 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/receipts-search--yellow.svg b/assets/images/product-illustrations/receipts-search--yellow.svg
index 9db0cc47c236..f40061c034d5 100644
--- a/assets/images/product-illustrations/receipts-search--yellow.svg
+++ b/assets/images/product-illustrations/receipts-search--yellow.svg
@@ -1,55 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/rocket--blue.svg b/assets/images/product-illustrations/rocket--blue.svg
index b59e8a28c8ca..5fec253cc4e1 100644
--- a/assets/images/product-illustrations/rocket--blue.svg
+++ b/assets/images/product-illustrations/rocket--blue.svg
@@ -1,286 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/rocket--orange.svg b/assets/images/product-illustrations/rocket--orange.svg
index a3bb9a67fb7d..0e8078e926f4 100644
--- a/assets/images/product-illustrations/rocket--orange.svg
+++ b/assets/images/product-illustrations/rocket--orange.svg
@@ -1,87 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/safe.svg b/assets/images/product-illustrations/safe.svg
index db2ac0707f7f..70e6d116daa9 100644
--- a/assets/images/product-illustrations/safe.svg
+++ b/assets/images/product-illustrations/safe.svg
@@ -1,119 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/simple-illustration__smartscan.svg b/assets/images/product-illustrations/simple-illustration__smartscan.svg
new file mode 100644
index 000000000000..688133368956
--- /dev/null
+++ b/assets/images/product-illustrations/simple-illustration__smartscan.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/tada--blue.svg b/assets/images/product-illustrations/tada--blue.svg
index 5430863ca145..c0f2b3f104eb 100644
--- a/assets/images/product-illustrations/tada--blue.svg
+++ b/assets/images/product-illustrations/tada--blue.svg
@@ -1,54 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/tada--yellow.svg b/assets/images/product-illustrations/tada--yellow.svg
index 037baef7defe..b21887899768 100644
--- a/assets/images/product-illustrations/tada--yellow.svg
+++ b/assets/images/product-illustrations/tada--yellow.svg
@@ -1,56 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/product-illustrations/todd-behind-cloud.svg b/assets/images/product-illustrations/todd-behind-cloud.svg
index 6281ce0ef727..65911b275499 100644
--- a/assets/images/product-illustrations/todd-behind-cloud.svg
+++ b/assets/images/product-illustrations/todd-behind-cloud.svg
@@ -1,58 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/profile.svg b/assets/images/profile.svg
index 9f41da0e141f..84edb572b236 100644
--- a/assets/images/profile.svg
+++ b/assets/images/profile.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/qrcode.svg b/assets/images/qrcode.svg
index 8851a69a03d7..f506a944d54e 100644
--- a/assets/images/qrcode.svg
+++ b/assets/images/qrcode.svg
@@ -1,5 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/question-mark-circle.svg b/assets/images/question-mark-circle.svg
index ae318f655750..cd42f3c118d3 100644
--- a/assets/images/question-mark-circle.svg
+++ b/assets/images/question-mark-circle.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/receipt-doc.png b/assets/images/receipt-doc.png
index 773bfaed73ad..4c9ced0356a3 100644
Binary files a/assets/images/receipt-doc.png and b/assets/images/receipt-doc.png differ
diff --git a/assets/images/receipt-generic.png b/assets/images/receipt-generic.png
index 1aabe854617d..d0ac937ac777 100644
Binary files a/assets/images/receipt-generic.png and b/assets/images/receipt-generic.png differ
diff --git a/assets/images/receipt-html.png b/assets/images/receipt-html.png
index 5cf8d585b21f..cade062115f2 100644
Binary files a/assets/images/receipt-html.png and b/assets/images/receipt-html.png differ
diff --git a/assets/images/receipt-search.svg b/assets/images/receipt-search.svg
index a8aa5f51f581..f79866cae6a5 100644
--- a/assets/images/receipt-search.svg
+++ b/assets/images/receipt-search.svg
@@ -1,16 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/receipt-svg.png b/assets/images/receipt-svg.png
index 130c331dd8c9..c0306e94827f 100644
Binary files a/assets/images/receipt-svg.png and b/assets/images/receipt-svg.png differ
diff --git a/assets/images/receipt-upload.svg b/assets/images/receipt-upload.svg
index 813aaac51f5b..d008c2999dae 100644
--- a/assets/images/receipt-upload.svg
+++ b/assets/images/receipt-upload.svg
@@ -1,110 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/receipt.svg b/assets/images/receipt.svg
index 5ad963dab8ad..0983f6fec369 100644
--- a/assets/images/receipt.svg
+++ b/assets/images/receipt.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/rotate-image.svg b/assets/images/rotate-image.svg
index b1c4f02cbb8d..c3cb0e0293bf 100644
--- a/assets/images/rotate-image.svg
+++ b/assets/images/rotate-image.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/rotate-left.svg b/assets/images/rotate-left.svg
index 47447cf91cf9..935cbf93757f 100644
--- a/assets/images/rotate-left.svg
+++ b/assets/images/rotate-left.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/rotate.svg b/assets/images/rotate.svg
index 651f9a6ac82d..f9eb97017020 100644
--- a/assets/images/rotate.svg
+++ b/assets/images/rotate.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/send.svg b/assets/images/send.svg
index 9ba1c6a336a2..34327fab329f 100644
--- a/assets/images/send.svg
+++ b/assets/images/send.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/shield.svg b/assets/images/shield.svg
index cb46f32fdfa0..09d5c7d51252 100644
--- a/assets/images/shield.svg
+++ b/assets/images/shield.svg
@@ -1,14 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/shutter.svg b/assets/images/shutter.svg
index e4dadcea8089..f8d81efcee2b 100644
--- a/assets/images/shutter.svg
+++ b/assets/images/shutter.svg
@@ -1,18 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/signIn/apple-logo.svg b/assets/images/signIn/apple-logo.svg
index 4e428fc41aed..de5ebf191066 100644
--- a/assets/images/signIn/apple-logo.svg
+++ b/assets/images/signIn/apple-logo.svg
@@ -1,4 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/signIn/google-logo.svg b/assets/images/signIn/google-logo.svg
index ebdd4be8cade..ec879fafa988 100644
--- a/assets/images/signIn/google-logo.svg
+++ b/assets/images/signIn/google-logo.svg
@@ -1,14 +1 @@
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__bank-arrow.svg b/assets/images/simple-illustrations/simple-illustration__bank-arrow.svg
index 7e5b4dae1ccc..85a0445f640b 100644
--- a/assets/images/simple-illustrations/simple-illustration__bank-arrow.svg
+++ b/assets/images/simple-illustrations/simple-illustration__bank-arrow.svg
@@ -1,172 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__bill.svg b/assets/images/simple-illustrations/simple-illustration__bill.svg
index 7fb76fb8c09b..aa4cb8fc9faf 100644
--- a/assets/images/simple-illustrations/simple-illustration__bill.svg
+++ b/assets/images/simple-illustrations/simple-illustration__bill.svg
@@ -1,57 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__chatbubbles.svg b/assets/images/simple-illustrations/simple-illustration__chatbubbles.svg
index 8edeea7e06f9..37857c15c074 100644
--- a/assets/images/simple-illustrations/simple-illustration__chatbubbles.svg
+++ b/assets/images/simple-illustrations/simple-illustration__chatbubbles.svg
@@ -1,24 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__coffeemug.svg b/assets/images/simple-illustrations/simple-illustration__coffeemug.svg
index de4ae88d731b..7d54b9892fce 100644
--- a/assets/images/simple-illustrations/simple-illustration__coffeemug.svg
+++ b/assets/images/simple-illustrations/simple-illustration__coffeemug.svg
@@ -1,46 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__concierge-bubble.svg b/assets/images/simple-illustrations/simple-illustration__concierge-bubble.svg
index eeabc78b1881..b3a6bf98deba 100644
--- a/assets/images/simple-illustrations/simple-illustration__concierge-bubble.svg
+++ b/assets/images/simple-illustrations/simple-illustration__concierge-bubble.svg
@@ -1,102 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__concierge.svg b/assets/images/simple-illustrations/simple-illustration__concierge.svg
index 8275671c3486..061a37d492e9 100644
--- a/assets/images/simple-illustrations/simple-illustration__concierge.svg
+++ b/assets/images/simple-illustrations/simple-illustration__concierge.svg
@@ -1,95 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__credit-cards.svg b/assets/images/simple-illustrations/simple-illustration__credit-cards.svg
index 8e070f074ef3..f0ffd1174efc 100644
--- a/assets/images/simple-illustrations/simple-illustration__credit-cards.svg
+++ b/assets/images/simple-illustrations/simple-illustration__credit-cards.svg
@@ -1,92 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__email-address.svg b/assets/images/simple-illustrations/simple-illustration__email-address.svg
index a8f0db9a4f8b..7bf0d253530a 100644
--- a/assets/images/simple-illustrations/simple-illustration__email-address.svg
+++ b/assets/images/simple-illustrations/simple-illustration__email-address.svg
@@ -1,35 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__handearth.svg b/assets/images/simple-illustrations/simple-illustration__handearth.svg
index f79e3f73293b..30828ee3585b 100644
--- a/assets/images/simple-illustrations/simple-illustration__handearth.svg
+++ b/assets/images/simple-illustrations/simple-illustration__handearth.svg
@@ -1,30 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__invoice.svg b/assets/images/simple-illustrations/simple-illustration__invoice.svg
index 0a10b70a7bfe..bd7738e571cd 100644
--- a/assets/images/simple-illustrations/simple-illustration__invoice.svg
+++ b/assets/images/simple-illustrations/simple-illustration__invoice.svg
@@ -1,65 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__lockopen.svg b/assets/images/simple-illustrations/simple-illustration__lockopen.svg
index fb07d7a8628b..6a269e686ab5 100644
--- a/assets/images/simple-illustrations/simple-illustration__lockopen.svg
+++ b/assets/images/simple-illustrations/simple-illustration__lockopen.svg
@@ -1,73 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__luggage.svg b/assets/images/simple-illustrations/simple-illustration__luggage.svg
index 9a01eee56662..3d3118f8cebd 100644
--- a/assets/images/simple-illustrations/simple-illustration__luggage.svg
+++ b/assets/images/simple-illustrations/simple-illustration__luggage.svg
@@ -1,79 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__money-receipts.svg b/assets/images/simple-illustrations/simple-illustration__money-receipts.svg
index 3d81f5dba653..af9d6a26a73a 100644
--- a/assets/images/simple-illustrations/simple-illustration__money-receipts.svg
+++ b/assets/images/simple-illustrations/simple-illustration__money-receipts.svg
@@ -1,142 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__moneybadge.svg b/assets/images/simple-illustrations/simple-illustration__moneybadge.svg
index 1f673aa20a90..68fc7845e531 100644
--- a/assets/images/simple-illustrations/simple-illustration__moneybadge.svg
+++ b/assets/images/simple-illustrations/simple-illustration__moneybadge.svg
@@ -1,78 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__moneyintowallet.svg b/assets/images/simple-illustrations/simple-illustration__moneyintowallet.svg
index 3f89e6b14836..e184257a4456 100644
--- a/assets/images/simple-illustrations/simple-illustration__moneyintowallet.svg
+++ b/assets/images/simple-illustrations/simple-illustration__moneyintowallet.svg
@@ -1,137 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__moneywings.svg b/assets/images/simple-illustrations/simple-illustration__moneywings.svg
index b13abdf448af..921af4ff88be 100644
--- a/assets/images/simple-illustrations/simple-illustration__moneywings.svg
+++ b/assets/images/simple-illustrations/simple-illustration__moneywings.svg
@@ -1,131 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__opensafe.svg b/assets/images/simple-illustrations/simple-illustration__opensafe.svg
index 273d68b62723..1dd6ab9e5215 100644
--- a/assets/images/simple-illustrations/simple-illustration__opensafe.svg
+++ b/assets/images/simple-illustrations/simple-illustration__opensafe.svg
@@ -1,195 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__sanfrancisco.svg b/assets/images/simple-illustrations/simple-illustration__sanfrancisco.svg
index 79779e85c940..ef1dfd547614 100644
--- a/assets/images/simple-illustrations/simple-illustration__sanfrancisco.svg
+++ b/assets/images/simple-illustrations/simple-illustration__sanfrancisco.svg
@@ -1,78 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__shield.svg b/assets/images/simple-illustrations/simple-illustration__shield.svg
index 5d56b9c3acb2..ebea008403a0 100644
--- a/assets/images/simple-illustrations/simple-illustration__shield.svg
+++ b/assets/images/simple-illustrations/simple-illustration__shield.svg
@@ -1,77 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__thumbsupstars.svg b/assets/images/simple-illustrations/simple-illustration__thumbsupstars.svg
index 623874d2d3eb..23412a17af4a 100644
--- a/assets/images/simple-illustrations/simple-illustration__thumbsupstars.svg
+++ b/assets/images/simple-illustrations/simple-illustration__thumbsupstars.svg
@@ -1,69 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__track-shoe.svg b/assets/images/simple-illustrations/simple-illustration__track-shoe.svg
index 5d45f2f9df67..04679033a714 100644
--- a/assets/images/simple-illustrations/simple-illustration__track-shoe.svg
+++ b/assets/images/simple-illustrations/simple-illustration__track-shoe.svg
@@ -1,100 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__treasurechest.svg b/assets/images/simple-illustrations/simple-illustration__treasurechest.svg
index edb868db11d2..2bdee0c7e90f 100644
--- a/assets/images/simple-illustrations/simple-illustration__treasurechest.svg
+++ b/assets/images/simple-illustrations/simple-illustration__treasurechest.svg
@@ -1,138 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/social-facebook.svg b/assets/images/social-facebook.svg
index 3a966653e688..a8ed9b7c5231 100644
--- a/assets/images/social-facebook.svg
+++ b/assets/images/social-facebook.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/social-instagram.svg b/assets/images/social-instagram.svg
index 79d4aadf374a..a90ae389b0ed 100644
--- a/assets/images/social-instagram.svg
+++ b/assets/images/social-instagram.svg
@@ -1,17 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/social-linkedin.svg b/assets/images/social-linkedin.svg
index 97a1da8962f4..04a88fa700a9 100644
--- a/assets/images/social-linkedin.svg
+++ b/assets/images/social-linkedin.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/social-podcast.svg b/assets/images/social-podcast.svg
index 1366699b6823..41b6905a37b2 100644
--- a/assets/images/social-podcast.svg
+++ b/assets/images/social-podcast.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/social-twitter.svg b/assets/images/social-twitter.svg
index 6a90f95032bb..5955d2ab21de 100644
--- a/assets/images/social-twitter.svg
+++ b/assets/images/social-twitter.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/social-youtube.svg b/assets/images/social-youtube.svg
index 834314d27d27..ef8161be32cd 100644
--- a/assets/images/social-youtube.svg
+++ b/assets/images/social-youtube.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/sync.svg b/assets/images/sync.svg
index 65d8df356901..af28fef95b86 100644
--- a/assets/images/sync.svg
+++ b/assets/images/sync.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/task.svg b/assets/images/task.svg
index 20412f771b69..4a51073fece2 100644
--- a/assets/images/task.svg
+++ b/assets/images/task.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/three-dots.svg b/assets/images/three-dots.svg
index 1ff11c8448a1..2c92f2db7820 100644
--- a/assets/images/three-dots.svg
+++ b/assets/images/three-dots.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/transfer.svg b/assets/images/transfer.svg
index 76288f8227b4..bc717c0a1c85 100644
--- a/assets/images/transfer.svg
+++ b/assets/images/transfer.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/trashcan.svg b/assets/images/trashcan.svg
index 6158a705bd35..0456e6c94350 100644
--- a/assets/images/trashcan.svg
+++ b/assets/images/trashcan.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/unlock.svg b/assets/images/unlock.svg
index 0cf22e8d1813..22c4278b0072 100644
--- a/assets/images/unlock.svg
+++ b/assets/images/unlock.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/upload-alt.svg b/assets/images/upload-alt.svg
index 3b8e7137bd93..19973e11f98d 100644
--- a/assets/images/upload-alt.svg
+++ b/assets/images/upload-alt.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/upload.svg b/assets/images/upload.svg
index faffc4a9b8cf..fee5f66a1d67 100644
--- a/assets/images/upload.svg
+++ b/assets/images/upload.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/user.svg b/assets/images/user.svg
index 96f403e2ce4a..16672c8b8ed9 100644
--- a/assets/images/user.svg
+++ b/assets/images/user.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/users.svg b/assets/images/users.svg
index 8af469328821..ac2ee1ccb83f 100644
--- a/assets/images/users.svg
+++ b/assets/images/users.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/wallet.svg b/assets/images/wallet.svg
index 1c6d606683b8..1e213fe209e1 100644
--- a/assets/images/wallet.svg
+++ b/assets/images/wallet.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/workspace-default-avatar.svg b/assets/images/workspace-default-avatar.svg
index 63d0a47f6806..b853e2ad2520 100644
--- a/assets/images/workspace-default-avatar.svg
+++ b/assets/images/workspace-default-avatar.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/zoom-icon.svg b/assets/images/zoom-icon.svg
index 24d019654795..81f025aedf79 100644
--- a/assets/images/zoom-icon.svg
+++ b/assets/images/zoom-icon.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/assets/images/zoom.svg b/assets/images/zoom.svg
index 25e82c2903eb..a7d1c64556ba 100644
--- a/assets/images/zoom.svg
+++ b/assets/images/zoom.svg
@@ -1,13 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
index 7dc851c95c9e..d8a24adefdc3 100644
--- a/config/webpack/webpack.common.js
+++ b/config/webpack/webpack.common.js
@@ -83,6 +83,8 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
{from: 'web/favicon-unread.png'},
{from: 'web/og-preview-image.png'},
{from: 'web/apple-touch-icon.png'},
+ {from: 'assets/images/expensify-app-icon.svg'},
+ {from: 'web/manifest.json'},
{from: 'assets/css', to: 'css'},
{from: 'assets/fonts/web', to: 'fonts'},
{from: 'node_modules/react-pdf/dist/esm/Page/AnnotationLayer.css', to: 'css/AnnotationLayer.css'},
diff --git a/contributingGuides/OFFLINE_UX.md b/contributingGuides/OFFLINE_UX.md
index a678a0b5b042..cca5c6286f73 100644
--- a/contributingGuides/OFFLINE_UX.md
+++ b/contributingGuides/OFFLINE_UX.md
@@ -104,7 +104,7 @@ This pattern greys out the submit button on a form and does not allow the form t
**How to implement:** Use the `` component. This pattern should use the `API.write()` method.
-**Example:** Inviting new memebers to a workspace.
+**Example:** Inviting new members to a workspace.
### D - Full Page Blocking UI Pattern
This pattern blocks the user from interacting with an entire page.
diff --git a/contributingGuides/OfflineUX_Patterns_Flowchart.png b/contributingGuides/OfflineUX_Patterns_Flowchart.png
index 813474dedb0d..bd7a0f311059 100644
Binary files a/contributingGuides/OfflineUX_Patterns_Flowchart.png and b/contributingGuides/OfflineUX_Patterns_Flowchart.png differ
diff --git a/contributingGuides/REVIEWER_CHECKLIST.md b/contributingGuides/REVIEWER_CHECKLIST.md
index d52d80a818bb..16c8f88927b1 100644
--- a/contributingGuides/REVIEWER_CHECKLIST.md
+++ b/contributingGuides/REVIEWER_CHECKLIST.md
@@ -57,42 +57,42 @@
### Screenshots/Videos
-Web
+Android: Native
-Mobile Web - Chrome
+Android: mWeb Chrome
-Mobile Web - Safari
+iOS: Native
-Desktop
+iOS: mWeb Safari
-iOS
+MacOS: Chrome / Safari
-Android
+MacOS: Desktop
diff --git a/contributingGuides/data_flow.png b/contributingGuides/data_flow.png
index e874afce6537..6ee8a4deec5a 100644
Binary files a/contributingGuides/data_flow.png and b/contributingGuides/data_flow.png differ
diff --git a/desktop/electron.png b/desktop/electron.png
index e80796026c67..914e4ff34637 100644
Binary files a/desktop/electron.png and b/desktop/electron.png differ
diff --git a/desktop/icon-adhoc.png b/desktop/icon-adhoc.png
index 5812ad6c5404..8e74a974198f 100644
Binary files a/desktop/icon-adhoc.png and b/desktop/icon-adhoc.png differ
diff --git a/desktop/icon-dev.png b/desktop/icon-dev.png
index 4589faa80d41..2d38819c450b 100644
Binary files a/desktop/icon-dev.png and b/desktop/icon-dev.png differ
diff --git a/desktop/icon-stg.png b/desktop/icon-stg.png
index c605f8aea6ad..fcca93d0cf43 100644
Binary files a/desktop/icon-stg.png and b/desktop/icon-stg.png differ
diff --git a/desktop/icon.png b/desktop/icon.png
index f837c238d19d..f90a81e86c65 100644
Binary files a/desktop/icon.png and b/desktop/icon.png differ
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index abc1299154ef..0ff280c4b9c6 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -10,15 +10,10 @@
"electron-context-menu": "^2.3.0",
"electron-log": "^4.4.7",
"electron-serve": "^1.0.0",
- "electron-updater": "^4.3.4",
+ "electron-updater": "^6.1.4",
"node-machine-id": "^1.1.12"
}
},
- "node_modules/@types/semver": {
- "version": "7.3.9",
- "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.9.tgz",
- "integrity": "sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ=="
- },
"node_modules/ansi-regex": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -55,11 +50,11 @@
}
},
"node_modules/builder-util-runtime": {
- "version": "8.9.2",
- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
- "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
+ "version": "9.2.1",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.1.tgz",
+ "integrity": "sha512-2rLv/uQD2x+dJ0J3xtsmI12AlRyk7p45TEbE/6o/fbb633e/S3pPgm+ct+JHsoY7r39dKHnGEFk/AASRFdnXmA==",
"dependencies": {
- "debug": "^4.3.2",
+ "debug": "^4.3.4",
"sax": "^1.2.4"
},
"engines": {
@@ -98,9 +93,9 @@
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/debug": {
- "version": "4.3.3",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
- "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
"dependencies": {
"ms": "2.1.2"
},
@@ -155,18 +150,18 @@
"integrity": "sha512-tQJBCbXKoKCfkBC143QCqnEtT1s8dNE2V+b/82NF6lxnGO/2Q3a3GSLHtKl3iEDQgdzTf9pH7p418xq2rXbz1Q=="
},
"node_modules/electron-updater": {
- "version": "4.6.5",
- "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.6.5.tgz",
- "integrity": "sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA==",
+ "version": "6.1.4",
+ "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.4.tgz",
+ "integrity": "sha512-yYAJc6RQjjV4WtInZVn+ZcLyXRhbVXoomKEfUUwDqIk5s2wxzLhWaor7lrNgxODyODhipjg4SVPMhJHi5EnsCA==",
"dependencies": {
- "@types/semver": "^7.3.6",
- "builder-util-runtime": "8.9.2",
- "fs-extra": "^10.0.0",
+ "builder-util-runtime": "9.2.1",
+ "fs-extra": "^10.1.0",
"js-yaml": "^4.1.0",
"lazy-val": "^1.0.5",
"lodash.escaperegexp": "^4.1.2",
"lodash.isequal": "^4.5.0",
- "semver": "^7.3.5"
+ "semver": "^7.3.8",
+ "tiny-typed-emitter": "^2.1.0"
}
},
"node_modules/emoji-regex": {
@@ -206,9 +201,9 @@
}
},
"node_modules/fs-extra": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
- "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+ "version": "10.1.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+ "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
"dependencies": {
"graceful-fs": "^4.2.0",
"jsonfile": "^6.0.1",
@@ -219,9 +214,9 @@
}
},
"node_modules/graceful-fs": {
- "version": "4.2.9",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
- "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
+ "version": "4.2.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
},
"node_modules/is-fullwidth-code-point": {
"version": "3.0.0",
@@ -333,14 +328,14 @@
}
},
"node_modules/sax": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
- "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+ "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
},
"node_modules/semver": {
- "version": "7.3.5",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
- "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"dependencies": {
"lru-cache": "^6.0.0"
},
@@ -410,6 +405,11 @@
"node": ">=8"
}
},
+ "node_modules/tiny-typed-emitter": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz",
+ "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA=="
+ },
"node_modules/universalify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -437,11 +437,6 @@
}
},
"dependencies": {
- "@types/semver": {
- "version": "7.3.9",
- "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.9.tgz",
- "integrity": "sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ=="
- },
"ansi-regex": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -466,11 +461,11 @@
"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
},
"builder-util-runtime": {
- "version": "8.9.2",
- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
- "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
+ "version": "9.2.1",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.1.tgz",
+ "integrity": "sha512-2rLv/uQD2x+dJ0J3xtsmI12AlRyk7p45TEbE/6o/fbb633e/S3pPgm+ct+JHsoY7r39dKHnGEFk/AASRFdnXmA==",
"requires": {
- "debug": "^4.3.2",
+ "debug": "^4.3.4",
"sax": "^1.2.4"
}
},
@@ -497,9 +492,9 @@
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"debug": {
- "version": "4.3.3",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
- "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+ "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
"requires": {
"ms": "2.1.2"
}
@@ -540,18 +535,18 @@
"integrity": "sha512-tQJBCbXKoKCfkBC143QCqnEtT1s8dNE2V+b/82NF6lxnGO/2Q3a3GSLHtKl3iEDQgdzTf9pH7p418xq2rXbz1Q=="
},
"electron-updater": {
- "version": "4.6.5",
- "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.6.5.tgz",
- "integrity": "sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA==",
+ "version": "6.1.4",
+ "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.4.tgz",
+ "integrity": "sha512-yYAJc6RQjjV4WtInZVn+ZcLyXRhbVXoomKEfUUwDqIk5s2wxzLhWaor7lrNgxODyODhipjg4SVPMhJHi5EnsCA==",
"requires": {
- "@types/semver": "^7.3.6",
- "builder-util-runtime": "8.9.2",
- "fs-extra": "^10.0.0",
+ "builder-util-runtime": "9.2.1",
+ "fs-extra": "^10.1.0",
"js-yaml": "^4.1.0",
"lazy-val": "^1.0.5",
"lodash.escaperegexp": "^4.1.2",
"lodash.isequal": "^4.5.0",
- "semver": "^7.3.5"
+ "semver": "^7.3.8",
+ "tiny-typed-emitter": "^2.1.0"
}
},
"emoji-regex": {
@@ -582,9 +577,9 @@
}
},
"fs-extra": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
- "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+ "version": "10.1.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+ "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
"requires": {
"graceful-fs": "^4.2.0",
"jsonfile": "^6.0.1",
@@ -592,9 +587,9 @@
}
},
"graceful-fs": {
- "version": "4.2.9",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
- "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
+ "version": "4.2.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
},
"is-fullwidth-code-point": {
"version": "3.0.0",
@@ -680,14 +675,14 @@
}
},
"sax": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
- "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+ "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
},
"semver": {
- "version": "7.3.5",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
- "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+ "version": "7.5.4",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+ "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
"requires": {
"lru-cache": "^6.0.0"
}
@@ -736,6 +731,11 @@
"ansi-regex": "^5.0.1"
}
},
+ "tiny-typed-emitter": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz",
+ "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA=="
+ },
"universalify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
diff --git a/desktop/package.json b/desktop/package.json
index 45283a260970..bf49d93f1a7b 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -7,7 +7,7 @@
"electron-context-menu": "^2.3.0",
"electron-log": "^4.4.7",
"electron-serve": "^1.0.0",
- "electron-updater": "^4.3.4",
+ "electron-updater": "^6.1.4",
"node-machine-id": "^1.1.12"
},
"author": "Expensify, Inc.",
diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
index c887849ffd99..825b681c8871 100644
--- a/docs/_sass/_main.scss
+++ b/docs/_sass/_main.scss
@@ -350,7 +350,7 @@ button {
img {
display: block;
margin: 20px auto;
- border-radius: 10px;
+ border-radius: 16px;
@include maxBreakpoint($breakpoint-tablet) {
width: 100%;
@@ -546,7 +546,7 @@ button {
align-items: center;
img {
- border-radius: 12px;
+ border-radius: 16px;
width: 100%;
}
}
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-USD.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-USD.md
index 375b00d62eac..2fbdac02e85c 100644
--- a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-USD.md
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-USD.md
@@ -1,5 +1,159 @@
---
title: Business Bank Accounts - USD
-description: Business Bank Accounts - USD
+description: How to add/remove Business Bank Accounts (US)
---
-## Resource Coming Soon!
+# Overview
+Adding a verified business bank account unlocks a myriad of features and automation in Expensify.
+Once you connect your business bank account, you can:
+- Pay employee expense reports via direct deposit (US)
+- Settle company bills via direct transfer
+- Accept invoice payments through direct transfer
+- Access the Expensify Card
+
+# How to add a verified business bank account
+To connect a business bank account to Expensify, follow the below steps:
+1. Go to **Settings > Account > Payments**
+2. Click **Add Verified Bank Account**
+3. Click **Log into your bank**
+4. Click **Continue**
+5. When you hit the **Plaid** screen, you'll be shown a list of compatible banks that offer direct online login access
+6. Login to the business bank account
+- If the bank is not listed, click the X to go back to the connection type
+- Here you’ll see the option to **Connect Manually**
+- Enter your account and routing numbers
+7. Enter your bank login credentials.
+- If your bank requires additional security measures, you will be directed to obtain and enter a security code
+- If you have more than one account available to choose from, you will be directed to choose the desired account
+Next, to verify the bank account, you’ll enter some details about the business as well as some personal information.
+
+## Enter company information
+This is where you’ll add the legal business name as well as several other company details.
+
+### Company address
+The company address must:
+- Be located in the US
+- Be a physical location
+If you input a maildrop address (PO box, UPS Store, etc.), the address will likely be flagged for review and adding the bank account to Expensify will be delayed.
+
+### Tax Identification Number
+This is the identification number that was assigned to the business by the IRS.
+### Company website
+A company website is required to use most of Expensify’s payment features. When adding the website of the business, format it as, https://www.domain.com.
+### Industry Classification Code
+You can locate a list of Industry Classification Codes here.
+## Enter personal information
+Whoever is connecting the bank account to Expensify, must enter their details under the Requestor Information section:
+- The address must be a physical address
+- The address must be located in the US
+- The SSN must be US-issued
+This does not need to be a signor on the bank account. If someone other than the Expensify account holder enters their personal information in this section, the details will be flagged for review and adding the bank account to Expensify will be delayed.
+
+## Upload ID
+After entering your personal details, you’ll be prompted to click a link or scan a QR code so that you can do the following:
+1. Upload the front and back of your ID
+2. Use your device to take a selfie and record a short video of yourself
+It’s required that your ID is:
+- Issued in the US
+- Unexpired
+
+## Additional Information
+Check the appropriate box under **Additional Information**, accept the agreement terms, and verify that all of the information is true and accurate:
+- A Beneficial Owner refers to an **individual** who owns 25% or more of the business.
+- If you or another **individual** owns 25% or more of the business, please check the appropriate box
+- If someone else owns 25% or more of the business, you will be prompted to provide their personal information
+If no individual owns more than 25% of the company you do not need to list any beneficial owners. In that case, be sure to leave both boxes unchecked under the Beneficial Owner Additional Information section.
+
+# How to validate the bank account
+The account you set up can be found under **Settings > Account > Payment > Bank Accounts** section in either **Verifying** or **Pending** status.
+If it is **Verifying**, then this means we sent you a message and need more information from you. Please check your Concierge chat which should include a message with specific details about what we require to move forward.
+If it is **Pending**, then in 1-2 business days Expensify will administer 3 test transactions to your bank account. Please check your Concierge chat for further instructions. If you do not see these test transactions
+After these transactions (2 withdrawals and 1 deposit) have been processed in your account, visit your Expensify Inbox, where you'll see a prompt to input the transaction amounts.
+Once you've finished these steps, your business bank account is ready to use in Expensify!
+
+# How to share a verified bank account
+Only admins with access to the verified bank account can reimburse employees or pay vendor bills. To grant another admin access to the bank account in Expensify, go to **Settings > Account > Payments > Bank Accounts** and click **"Share"**. Enter their email address, and they will receive instructions from us. Please note, they must be a policy admin on a policy you also have access to in order to share the bank account with them.
+When a bank account is shared, it must be revalidated with three new microtransactions to ensure the shared admin has access. This process takes 1-2 business days. Once received, the shared admin can enter the transactions via their Expensify account's Inbox tab.
+
+Note: A report is shared with all individuals with access to the same business bank account in Expensify for audit purposes.
+
+
+# How to remove access to a verified bank account
+This step is important when accountants and staff leave your business.
+To remove an admin's access to a shared bank account, go to **Settings > Account > Payments > Shared Business Bank Accounts**.
+You'll find a list of individuals who have access to the bank account. Next to each user, you'll see the option to Unshare the bank account.
+
+# How to delete a verified bank account
+If you need to delete a bank account from Expensify, run through the following steps:
+1. Head to **Settings > Account > Payments**
+2. Click the red **Delete** button under the corresponding bank account
+
+Be cautious, as if it hasn't been shared with someone else, the next user will need to set it up from the beginning.
+
+If the bank account is set as the settlement account for your Expensify Cards, you’ll need to designate another bank account as your settlement account under **Settings > Domains > Company Cards > Settings** before this account can be deleted.
+
+# Deep Dive
+
+## Verified bank account requirements
+
+To add a business bank account to issue reimbursements via ACH (US), to pay invoices (US) or utilize the Expensify Card:
+- You must enter a physical address for yourself, any Beneficial Owner (if one exists), and the business associated with the bank account. We **cannot** accept a PO Box or MailDrop location.
+- If you are adding the bank account to Expensify, you must add it from **your** Expensify account settings.
+- If you are adding a bank account to Expensify, we are required by law to verify your identity. Part of this process requires you to verify a US issued photo ID. For utilizing features related to US ACH, your idea must be issued by the United States. You and any Beneficial Owner (if one exists), must also have a US address
+- You must have a valid website for your business to utilize the Expensify Card, or to pay invoices with Expensify.
+
+## Locked bank account
+When you reimburse a report, you authorize Expensify to withdraw the funds from your account. If your bank rejects Expensify’s withdrawal request, your verified bank account is locked until the issue is resolved.
+
+Withdrawal requests can be rejected due to insufficient funds, or if the bank account has not been enabled for direct debit.
+If you need to enable direct debits from your verified bank account, your bank will require the following details:
+- The ACH CompanyIDs (1270239450 and 4270239450)
+- The ACH Originator Name (Expensify)
+To request to unlock the bank account, click **Fix** on your bank account under **Settings > Account > Payments > Bank Accounts**.
+This sends a request to our support team to review exactly why the bank account was locked.
+Please note, unlocking a bank account can take 4-5 business days to process.
+
+## Error adding ID to Onfido
+Expensify is required by both our sponsor bank and federal law to verify the identity of the individual that is initiating the movement of money. We use Onfido to confirm that the person adding a payment method is genuine and not impersonating someone else.
+
+If you get a generic error message that indicates, "Something's gone wrong", please go through the following steps:
+
+1. Ensure you are using either Safari (on iPhone) or Chrome (on Android) as your web browser.
+2. Check your browser's permissions to make sure that the camera and microphone settings are set to "Allow"
+3. Clear your web cache for Safari (on iPhone) or Chrome (on Android).
+4. If using a corporate Wi-Fi network, confirm that your corporate firewall isn't blocking the website.
+5. Make sure no other apps are overlapping your screen, such as the Facebook Messenger bubble, while recording the video.
+6. On iPhone, if using iOS version 15 or later, disable the Hide IP address feature in Safari.
+7. If possible, try these steps on another device
+8. If you have another phone available, try to follow these steps on that device
+If the issue persists, please contact your Account Manager or Concierge for further troubleshooting assistance.
+
+# FAQ
+## What is a Beneficial Owner?
+
+A Beneficial Owner refers to an **individual** who owns 25% or more of the business. If no individual owns 25% or more of the business, the company does not have a Beneficial Owner.
+
+
+## What do I do if the Beneficial Owner section only asks for personal details, but our business is owned by another company?
+
+
+Please only indicate you have a Beneficial Owner, if it is an individual that owns 25% or more of the business.
+
+## Why can’t I input my address or upload my ID?
+
+
+Are you entering a US address? When adding a verified business bank account in Expensify, the individual adding the account, and any beneficial owner (if one exists) are required to have a US address, US photo ID, and a US SSN. If you do not meet these requirements, you’ll need to have another admin add the bank account, and then share access with you once verified.
+
+
+## Why am I being asked for documentation when adding my bank account?
+When a bank account is added to Expensify, we complete a series of checks to verify the information provided to us. We conduct these checks to comply with both our sponsor bank's requirements and federal government regulations, specifically the Bank Secrecy Act / Anti-Money Laundering (BSA / AML) laws. Expensify also has anti-fraud measures in place.
+If automatic verification fails, we may request manual verification, which could involve documents such as address verification for your business, a letter from your bank confirming bank account ownership, etc.
+
+If you have any questions regarding the documentation request you received, please contact Concierge and they will be happy to assist.
+
+
+## I don’t see all three microtransactions I need to validate my bank account. What should I do?
+
+It's a good idea to wait till the end of that second business day. If you still don’t see them, please reach out to your bank and ask them to whitelist our ACH ID's **1270239450** and **4270239450**. Expensify’s ACH Originator Name is "Expensify".
+
+Make sure to reach out to your Account Manager or to Concierge once you have done so and our team will be able to re-trigger those 3 transactions!
+
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Direct-Bank-Connections.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Direct-Bank-Connections.md
index f1d939ca9c89..8b6ea7de2642 100644
--- a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Direct-Bank-Connections.md
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Direct-Bank-Connections.md
@@ -1,5 +1,108 @@
---
title: Direct Bank Connections
-description: Direct Bank Connections
+description: Connect your company cards in Expensify to bring all team members’ card expenses into their accounts and conveniently manage card transactions and out-of-pocket expenses in one place.
+
---
-## Resource Coming Soon!
+# Overview
+If you're a Domain Admin, you have the power to connect and manage your company cards in Expensify centrally. If your company uses a card program with one of our Approved! Banking Partners, you can easily connect the card feed to Expensify via login credentials. Connecting company cards is a great way to bring all team members’ card expenses into their accounts and conveniently manage card transactions and out-of-pocket expenses in one place. Keeping things organized has never been easier!
+# How to connect company cards using a direct bank connection
+1. Go to **Settings > Domains > _Domain Name_ > Company Cards**
+2. Click **Import Card**
+
+![Expensify domain cards](https://help.expensify.com/assets/images/ExpensifyHelp_DomainCards.png){:width="100%"}
+
+3. Select your card issuer and input the **master administrative login credentials**
+4. You will then be able to assign accounts to cardholders
+5. Set a start date from which expenses will appear in their accounts
+## How to assign company cards
+After connecting your company cards with Expensify, you can assign each card to its respective cardholder.
+To assign the company cards, go to **Settings > Domains > _Domain Name_ > Company Cards**.
+If you have more than one card feed, select the correct feed in the drop-down list in the Company Card section.
+
+![Expensify domain card list](https://help.expensify.com/assets/images/ExpensifyHelp_DomainCardsList.png){:width="100%"}
+
+
+Once you’ve selected the appropriate feed, click the `Assign New Cards` button to populate the emails and the last four digits of the cardholder.
+
+![Expensify assign cards](https://help.expensify.com/assets/images/ExpensifyHelp_AssignCardBtn.png){:width="100%"}
+
+![Expensify domain assign card form](https://help.expensify.com/assets/images/ExpensifyHelp_AssignCardForm.png){:width="100%"}
+
+ **Select the cardholder:** Search the populated list for all employee email addresses. The employee will need to have an email address under this Domain to assign a card.
+
+**Select the card:** Search the list using the last four digits of the card number. If no transactions have been posted on the card, the card number will not appear in the list. You can instead assign the card by typing in the full card number in the field.
+
+**Note:** If you're assigning a card by typing in the full PAN (the full card number), press the ENTER key on your keyboard after typing the full PAN into the card field. The field may clear itself after pressing ENTER, but click **Assign** anyway and then verify that the assignment shows up in the cardholder table.
+
+**Set the transaction start date (optional):** Any transactions that were posted before this date will not be imported into Expensify. If you do not make a selection, it will default to the earliest available transactions from the card.
+Please note we can only import data for the time period the bank is releasing to us. Most banks only provide a certain amount of historical data, averaging 30-90 days into the past. It's not possible to override the start date the bank has provided via this tool.
+
+**Click the Assign button:** Once assigned, you will see each cardholder associated with their card and the start date listed.
+
+![Expensify domain assigned cards](https://help.expensify.com/assets/images/ExpensifyHelp_AssignedCard.png){:width="100%"}
+
+
+## How to unassign company cards
+_**Important** - Before you begin the unassigning process, please note that unassigning a company card will **delete** any **Open** or **Unreported** expenses in the cardholder's account. To avoid this, users should submit these expenses **before** their cards are unassigned._
+
+If you need to unassign a certain card, click the **Actions** button associated with the card in question and then click **Unassign**.
+
+![Expensify domain unassign cards](https://help.expensify.com/assets/images/ExpensifyHelp_UnassignCard.png){:width="100%"}
+
+To completely remove the card connection, unassign every card from the list and then refresh the page.
+
+**Note:** If expenses are **Processing** and then rejected, they will also be deleted when they're returned to an **Open** state as the linked card they're linked to no longer exists.
+
+# Deep Dive
+## Configure card settings
+Once you’ve imported your company cards, the next step is configuring the cards’ settings.
+If you're using a connected accounting system such as NetSuite, Xero, Sage Intacct, Quickbooks Desktop, or QuickBooks Online. In that case, you can connect the card to export to a specific credit card GL account.
+1. Go to **Settings > Domains > _Domain Name_ > Company Cards**
+2. Click **Edit Exports** on the right-hand side of the card table and select the GL account you want to export expenses to
+3. You're all done. After the account is set, exported expenses will be mapped to the specific account selected when exported by a Domain Admin.
+
+![Expensify domain cards settings](https://help.expensify.com/assets/images/ExpensifyHelp_UnassignCard-1.png){:width="100%"}
+
+
+You can access the remaining company card settings by navigating to **Settings > Domains > _Domain Name_ > Company Cards > Settings.** More information on card settings can be found by searching **“How to configure company card settings”**.
+
+# FAQ
+## How can I connect and manage my company’s cards centrally if I’m not a domain admin?
+ If you cannot access Domains, you must request Domain Admin access to an existing Domain Admin (usually the workspace owner).
+
+## Are direct bank connections the best option for connecting credit cards to Expensify?
+If we currently have a connection with your bank, then it’s a good option. However, if you want enhanced stability and additional functionality, consider opting for a commercial card feed directly from your bank or getting the Expensify card.
+
+## My card feed is set up. Why is a specific card not coming up when I try to assign it to an employee?
+Cards will appear in the drop-down when activated and have at least one posted transaction. If the card is activated and has been used for a while and you're still not seeing it, please contact your Account Manager or message Concierge for further assistance.
+
+## Is there a fee for utilizing direct card connections?
+Nope! Direct card connections come at no extra cost and are part of the Corporate Workspace pricing.
+
+## What is the difference between commercial card feeds and direct bank connections?
+The direct bank connection is a connection set up with your login credentials for that account. In contrast, the commercial card feed is set up by your bank requesting that Visa/MasterCard/Amex send a daily transaction feed to Expensify. The former can be done without the assistance of your bank or Expensify, but the latter is more stable and reliable.
+
+## What if my bank uses a card program that isn't with one of Expensify's Approved! Banking partners?
+If your company uses a Commercial Card program that isn’t with one of our Approved! Banking Partners (which supports connecting the feed via login credentials), the best way to import your company cards is by setting up a direct Commercial Card feed between Expensify and your bank. Note the Approved! Banking Partners include:
+- Bank of America
+- Citibank
+- Capital One
+- Chase
+- Wells Fargo
+- Amex
+- Stripe
+- Brex
+
+## Why do direct bank connections break?
+Banks often make changes to safeguard your confidential information, and when they do, we need to update the connection between Expensify and the bank. We have a team of engineers who work closely with banks to monitor this and update our software accordingly when this happens.
+
+## How do I resolve errors while trying to import my card?
+Ensure you're importing your card in the correct spot in Expensify and selecting the proper bank connection. For company cards, use the master administrative credentials to import your set of cards at **Settings > Domains > _Domain Name_ > Company Cards > Import Card.**
+
+## Why is my card connection broken after working fine?
+The first step is to check for any changes to your bank information. Have you recently changed your banking password without updating it in Expensify? Has your banking username or card number been updated? Did you edit your security questions for your bank? Additionally, if your security questions have changed or their answers aren't saved in Expensify. In that case, we won't be able to access your account list, and you'll need to address this within Expensify.
+
+If you've answered "yes" to any of these questions, you'll need to update this information in Expensify and manually re-establish the connection. Please note that Expensify cannot automatically update this information for you.
+A Domain Admin can fix the connection by heading to **Settings > Domains > _Domain Name_ > Company Cards > Fix**. You will be prompted to enter the new credentials/updated information, and this should reestablish the connection.
+If you are still experiencing issues with the card connection, please search for company card troubleshooting or contact Expensify Support for help.
+
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Troubleshooting.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Troubleshooting.md
index e3d1307e6a05..8d1a79e49eaf 100644
--- a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Troubleshooting.md
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Troubleshooting.md
@@ -1,5 +1,101 @@
---
title: Troubleshooting
-description: Troubleshooting
+description: How to troubleshoot company card importing in Expensify
---
-## Resource Coming Soon!
+# Overview
+Whether you're encountering issues related to company cards, require assistance with company card account access, or have questions about company card import features, you've come to the right place.
+
+## How to add company cards to Expensify
+You can add company credit cards under the Domain settings in your Expensify account by navigating to *Settings* > *Domain* > _Domain Name_ > *Company Cards* and clicking *Import Card/Bank* and following the prompts.
+
+# Errors connecting company cards
+
+## Error: Too many attempts
+If you've been locked out while trying to import a new card, you'll need to wait a full 24 hours before trying again. This lock happens when incorrect online banking credentials are entered multiple times, and it's there for your security — it can't be removed. To avoid this, make sure your online banking credentials are correct before attempting to import your card again.
+
+## Error: Invalid credentials/Login failed
+Verify your ability to log into your online banking portal by attempting to log into your bank account via the banking website.
+Check for any potential temporary outages on your bank's end that may affect third-party connections like Expensify.
+For specific card types:
+- *Chase Card*: Confirm your password meets their new 8-32 character requirement.
+- *Wells Fargo Card*: Ensure your password is under 14 characters. Reset it if necessary before importing your card to Expensify. If your card is already imported, update it and use the "Fix Card" option to reestablish the connection.
+- *SVB Card*: Enable Direct Connect from the SVB website and use your online banking username and Direct Connect PIN instead of your password when connecting an SVB card. If connecting via *Settings* > *Domain* > _[Domain Name]_ > *Company Cards*, contact SVB for CDF feed setup.
+
+## Error: Direct Connect not enabled
+Direct Connect will need to be enabled in your account for your bank/credit card provider before you can import your card to Expensify. Please reach out to your bank to confirm if this option is available for your account, as well as get instructions on how to get this setup.
+
+## Error: Account Setup
+This error message typically indicates that there's something you need to do on your bank account's end. Please visit your online banking portal and check if there are any pending actions required. Once you've addressed those, you can try connecting your card again.
+For Amex cardholders with multiple card programs in your Amex US Business account: To import multiple card programs into Expensify, you'll need to contact Amex and request that they separate the multiple card programs into distinct logins. For instance, you'll want to have your _Business Platinum_ cards under *"username1/password1"* and _Business Gold_ cards under *"username2/password2."* This ensures smooth integration with Expensify.
+
+## Error: Account type not supported
+If Expensify doesn't have a direct connection to your bank/credit card provider, we can still support the connection via spreadsheet import, which you can learn more about [here](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/CSV-Import#gsc.tab=0). If the cards you're trying to import are company cards, it’s possible that you might be able to obtain a commercial feed directly from your bank. Please find more information on this [here](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Commercial-Card-Feeds#gsc.tab=0).
+
+## Error: Username/Password/Questions out of date
+Your company card connection is broken because we're missing some answers to some security questions. Please head to *Settings* > *Domain* > _[Domain Name]_ > *Company Cards* and click _Fix Card_.
+This will require you to answer your bank's security questions. You will need to do this for each security question you have with your bank; so if you have 3 security questions, you will need to do this 3 times.
+
+## Error: Account not found/Card number changed
+This error message appears when you have been issued a new card, or if there's been a significant change to the account in some other way (password and/or card number change).
+When your online bank/card account password has been changed, you may need to update the details on the Expensify end as well. To do this, navigate to *Settings* > *Domain* > _[Domain Name]_ > *Company Cards* and click _Fix Card_.
+If there’s been a recent change to the card number, you’ll have to remove the card with the previous number and re-import the card using the new number. A Domain Admin will have to re-assign the card via *Settings* > *Domain* > _Domain Name_ > *Company Cards*. Before removing the card, please ensure *all Open reports have been submitted*, as removing the card will remove all imported transactions from the account that are associated with that card.
+
+## Error: General connection error
+This error message states that your bank or credit card provider is under maintenance and is unavailable at this time. Try waiting a few hours before trying to import your credit card again. Check out our [status page](https://status.expensify.com/) for updates on bank/credit card connections, or you can also choose to subscribe to updates for your specific account type.
+
+## Error: Not seeing cards listed after a successful login
+The card will only appear in the drop-down list for assignment once it’s activated and there are transactions that have been incurred and posted on the card. If not, the card won't be available to assign to the card holder until then.
+
+# Troubleshooting issues assigning company cards
+
+## Why do bank connections break?
+Banks often make changes to safeguard your confidential information, and when they do, we need to update the connection between Expensify and the bank. We have a team of engineers that works closely with banks to monitor this and update our software accordingly when this happens.
+The first step is to check if there have been any changes to your bank information. Have you recently changed your banking password without updating it in Expensify? Has your banking username or card number been updated? Did you update your security questions for your bank?
+If you've answered "yes" to any of these questions, a Domain Admins need to update this information in Expensify and manually reestablish the connection by heading to *Settings* > *Domains* > _Domain Name_ > *Company Cards* > *Fix*. The Domain Admin will be prompted to enter the new credentials/updated information and this should reestablish the connection.
+
+## How do I resolve errors while I’m trying to import my card?*
+Make sure you're importing your card in the correct spot in Expensify and selecting the right bank connection. For company cards, use the master administrative credentials to import your set of cards at *Settings* > *Domains* > _Domain Name_ > *Company Cards* > *Import Card*.
+Please note there are some things that cannot be bypassed within Expensify, including two-factor authentication being enabled within your bank account. This will prevent the connection from remaining stable and will need to be turned off on the bank side.
+
+## What are the most reliable bank connections in Expensify?*
+The most reliable corporate card to use with Expensify is the Expensify Card. We offer daily settlement, unapproved expense limits, and real-time compliance for secure and efficient spending, as well as 2% cash back. Click here to learn more or apply.
+Additionally, we've teamed up with major banks worldwide to ensure a smooth import of credit card transactions into your accounts. Corporate cards from the following banks also offer the most dependable connections in Expensify:
+- American Express
+- Bank of America
+- Brex
+- Capital One
+- Chase
+- Citibank
+- Stripe
+- Wells Fargo
+
+Commercial feeds for company cards are the dependable connections in Expensify. If you have a corporate or commercial card account, you might have access to a daily transaction feed where expenses from Visa, MasterCard, and American Express are automatically sent to Expensify. Reach out to your banking relationship manager to check if your card program qualifies for this feature.
+
+# Troubleshooting American Express Business
+
+## Amex account roles
+American Express provides three different roles for accessing accounts on their website. When connecting Amex cards to Expensify, it's crucial to use the credentials of the Primary/Basic account holder. Here's what each role means:
+- *Primary/Basic Account Holder*: The person who applied for the American Express Business card, owns the account, manages its finances, and controls card issuance and account management. They can view all charges by other cardmembers on their account. They can see all charges made by other cardmembers on their account.
+- *Supplemental Cardmember (Employee Cardmember)*: Chosen by the Primary Card Member (typically an employee on business accounts), they can access their own card info and make payments but can't see other account details.
+- *Authorized Account Manager (AAM)*: Chosen by the Primary Card Member, AAMs can manage the account online or by phone, but they can't link cards to services like Expensify. They have admin rights, including adding cards, making payments, canceling cards, and setting limits. To connect cards to Expensify, use the Primary Card Holder's credentials for full access.
+
+## The connection is established but there are no cards to assign
+
+When establishing the connection, you must assign cards during the same session. It isn't possible to create the connection, log out, and assign the cards later, as the connection will not stick, and require you to reattempt the connection again.
+
+## Amex error: Card isn't eligible
+This error comes directly from American Express and is typically related to an account that is not a business account or using credentials that are not the primary account holder credentials.
+
+## Amex error: Session has expired
+If you get an error stating an American Express Business Card “Your session has expired. Please return to Expensify and try again, this always means that you are using the incorrect credentials. Remember, you need to use primary/basic cardholder credentials. If you are not sure which credentials you should use, reach out to American Express for guidance.
+
+## Connect multiple company card programs under the same credentials
+If you have multiple company card programs with the same credentials, you can select ALL programs at once. With this, all programs will be under one dropdown. Make sure to select all cards each time you are adding any cards from any program.
+If you would like your card programs listed under separate dropdowns, you can select only that group making sure to select all cards from that group each time you are adding a new card.
+Once you have authorized the account, you’ll be guided back to Expensify where you’ll assign all necessary cards across all programs.
+This will store all cards under the same American Express Business connection dropdown and allow all cards to be added to Expensify for you to assign to users.
+*Important Reminder*: Whenever you need to access the connection to assign a new card, you must still choose "ALL card programs." For instance, if you have a new employee with a card under your Business Gold Rewards Card program, you'll still need to authorize all the cards in that program or all the programs if you have only one dropdown menu!
+
+## Add cards under different programs with different logins
+If you have multiple card programs with different credentials, you will need to have another Domain Admin account add each card program from their own account.
+Once all Domain Admins have connected and assigned the cards that they are the Primary account holder for, all cards will be listed under one *American Express (New and Upgraded)* list in the Domain Company Card page.
diff --git a/docs/articles/expensify-classic/billing-and-subscriptions/Overview.md b/docs/articles/expensify-classic/billing-and-subscriptions/Overview.md
index 963186916f01..b835db54cbf2 100644
--- a/docs/articles/expensify-classic/billing-and-subscriptions/Overview.md
+++ b/docs/articles/expensify-classic/billing-and-subscriptions/Overview.md
@@ -1,5 +1,38 @@
---
-title: Overview
-description: Overview
+title: Billing in Expensify
+description: An overview of how billing works in Expensify.
---
-## Resource Coming Soon!
+# Overview
+Expensify’s billing is based on monthly member activity. At the beginning of each month, you’ll be billed for the previous month’s activity. Your Expensify bill ultimately depends on your plan type, whether you're on an annual subscription or pay-per-use billing, and whether you’re using Expensify Cards.
+# How billing works in Expensify
+Expensify bills the owners of Group Workspaces on the first of each month for the previous month's usage. You can find billing receipts in **Settings > Account > Payments > Billing History**. We recommend that businesses have one billing owner for all of their Group Workspaces.
+## Active members
+An **active member** is anyone who chats, creates, submits, approves, reimburses, or exports a report in Expensify in any given month. This includes Copilots and automated settings.
+## Annual subscription
+With an annual subscription, you set your monthly active member count at the beginning and get a 50% discount on your monthly active member cost. That means an annual subscription paired with the Collect plan will cost $10 per monthly active member instead of $20, and the Control plan will cost $18 instead of $36.
+
+Each month, you’ll be billed for the amount of members you originally set in your subscription size. Any active members in a given month above this subscription size will be billed at the pay-per-use rate.
+
+For example, let’s say you set your annual subscription size at 10 members and you’re on the Control plan. You’ll be billed $18/member for 10 members each month. However, let’s say in one particular month you had 12 active members, you’d be billed at $18/member for the 10 members in your subscription size + $36/member (pay-per-use rate) for the additional 2 active members.
+
+You can always increase your annual subscription size, which will extend your annual subscription length. You cannot reduce your annual subscription size until your current subscription has ended. If you have any questions about this, reach out to Concierge or your account manager.
+## Pay-per-use
+The pay-per-use rate is the full rate per active member without any discounts. The pay-per-use rate for each member on the Collect plan is $20 and on the Control plan is $36.
+## How the Expensify Card can reduce your bill
+Bundling the Expensify Card with an annual subscription ensures you pay the lowest possible monthly price for Expensify. And the more you spend on Expensify Cards, the lower your bill will be.
+
+If at least 50% of your approved USD spend in a given month is on your company’s Expensify Cards, you will receive an additional 50% discount on the price per member. This additional 50% discount, when coupled with an annual subscription, brings the price per member to $5 on a Collect plan and $9 on a Control plan.
+
+Additionally, every month, you receive 1% cash back on all Expensify Card purchases, and 2% if the spend across your Expensify Cards is $250k or more. Any cash back from the Expensify Card is first applied to your Expensify bill, further reducing your price per member. Any leftover cash back is deposited directly into your connected bank account.
+## Savings calculator
+To see how much money you can save (and even earn!) by using the Expensify Card, check out our [savings calculator](https://use.expensify.com/price-savings-calculator). Just enter a few details and see how much you’ll save!
+# FAQ
+## What if we put less than 50% of our total spend on the Expensify Card?
+If you put less than 50% of your total USD spend on your Expensify Card, your bill gets discounted on a sliding scale based on the percentage of use. So if you don't use the Expensify Card at all, you'll be charged the full rate for each member based on your plan and subscription.
+Example:
+- Annual subscription discount: 50%
+- % of Expensify Card spend (USD) across all workspaces: 20%
+- Expensify Card discount: 20%
+You save 70% on the price per member on your bill for that month.
+
+Note: USD spend refers to approved USD transactions on the Expensify Card in any given month, compared to all approved USD spend on workspaces in that same month.
diff --git a/docs/articles/expensify-classic/billing-and-subscriptions/Receipt-Breakdown.md b/docs/articles/expensify-classic/billing-and-subscriptions/Receipt-Breakdown.md
new file mode 100644
index 000000000000..275fb2c93cf0
--- /dev/null
+++ b/docs/articles/expensify-classic/billing-and-subscriptions/Receipt-Breakdown.md
@@ -0,0 +1,49 @@
+---
+title: Receipts Breakdown
+description: This article goes over the Expensify receipt for billing owners.
+---
+
+# Overview
+This article will give you (the billing owner) a detailed breakdown of your Expensify bill.
+
+Your receipt is broken up into multiple sections that include:
+1. A high-level summary of your total Expensify bill
+2. Ways to reduce your bill and get paid to use Expensify
+3. A billing breakdown that covers all activity and discounts
+4. An activity breakdown by workspace
+
+## How-to understand the high-level summary
+The top section will show the total amount you paid as the billing owner of Expensify workspaces and give you a breakdown of price per member. Every member of your workspace(s) gets to store data, review data, and access free features like Expensify Chat. Thus, we show the total price and then use all of the members across all of the workspaces you own to calculate the price per member. Further down in the receipt, and in this article, we break down the members who generated billable activity.
+
+## How-to reduce your bill and get paid to use Expensify
+Chances are you can actually get paid to use Expensify with the Expensify Card. In this section of the receipt, we outline how much money you're leaving on the table by not using the Expensify Card. You can click `Get started` to connect with your account manager (if you have one) or Concierge, both of whom can help get you started with the card.
+
+_Note: Currently, we offer Expensify Cards to companies with USD bank accounts._
+
+## How-to understand your billing breakdown
+Your receipt will have a detailed breakdown of activity and discounts across all workspaces. Here's a description of items that may appear on your bill:
+- [Number of] Inactive workspace members @ $0.00
+ - All inactive members from any of your workspaces.
+- [Number of] Chat-only members @ $0.00
+ - Any workspace members who chatted but didn't generate any other billable activity. Learn more about [chatting for free.](https://help.expensify.com/articles/new-expensify/getting-started/chat/Everything-About-Chat#gsc.tab=0)
+- [Number of] Annual Control members @ $18.00
+ - Any members included in your annual subscription on the Control plan.
+- [Number of] Pay-per-use Control members @ $36.00
+ - Any members above your annual subscription size on the Control plan. They're billed at the pay-per-use rate.
+- [Number of] Annual Collect members @ $10.00
+ - Any members included in your annual subscription on the Collect plan.
+- [Number of] Pay-per-use Collect members @ $20.00
+ - Any members above your annual subscription size on the Collect plan. These members are billed at the pay-per-use rate.
+- [Number of] Free members @ $0.00
+ - All members across any of your Free workspaces.
+- X% Expensify Card discount with $Y spend
+ - This shows the % discount you're getting based on total spend across your Expensify Cards. This is only available in the US.
+- X% Expensify Card cash back credit for $Y spend
+ - The amount of cash back you've earned based on total spend across your Expensify Cards. This is only available in the US.
+- 50% ExpensifyApproved! partner discount
+ - If you're part of an accounting firm, you get an additional discount for being our partner. [Learn more about our ExpensifyApproved! accountants program.](https://use.expensify.com/accountants-program)
+- Total
+ - Sum of all the line items above.
+
+## How-to understand your activity breakdown
+This section will list all of your workspaces alongside their IDs and break down the billing for each of them.
diff --git a/docs/articles/expensify-classic/expense-and-report-features/Currency.md b/docs/articles/expensify-classic/expense-and-report-features/Currency.md
index e5c9096fa610..eb6ca9bb2d40 100644
--- a/docs/articles/expensify-classic/expense-and-report-features/Currency.md
+++ b/docs/articles/expensify-classic/expense-and-report-features/Currency.md
@@ -1,5 +1,64 @@
---
-title: Currency
-description: Currency
+title: Report Currency
+description: Understanding expense and report currency
---
-## Resource Coming Soon!
+
+# Overview
+As a workspace admin, you can choose a default currency for your employees' expense reports, and we’ll automatically convert any expenses into that currency.
+
+Here are a few essential things to remember:
+
+- Currency settings for a workspace apply to all expenses under that workspace. If you need different default currencies for certain employees, creating separate workspaces and configuring the currency settings is best.
+- As an admin, the currency settings you establish in the workspace will take precedence over any currency settings individual users may have in their accounts.
+- Currency is a workspace-level setting, meaning the currency you set will determine the currency for all expenses submitted on that workspace.
+
+# How to select the currency on a workspace
+
+## As an admin on a group workspace
+
+1. Sign into your Expensify web account
+2. Go to **Settings > Workspaces > Group > _[Workspace Name]_> Reports > Report Basics**
+3. Adjust the **Report Output Currency**
+
+## On an individual workspace
+
+1. Sign into your Expensify web account
+2. Go to **Settings > Workspaces > Individual >_[Workspace Name]_> Reports > Report Basics**
+3. Adjust the **Report Output Currency**
+
+Please note the currency setting on an individual workspace is overridden when you submit a report on a group workspace.
+
+# Deep Dive
+
+## Conversion Rates
+
+Using data from Open Exchange Rates, Expensify takes the average rate on the day the expense occurred to convert an expense from one currency to another. The conversion rate can vary depending on when the expense happened since the rate is determined after the market closes on that specific date.
+
+If the markets aren’t open on the day the expense takes place (i.e., on a Saturday), Expensify will use the daily average rate from the last available market day before the purchase took place.
+
+When an expense is logged for a future date, possibly to anticipate a purchase that has yet to occur, we'll use the most recent available data. This means the report's value may change up to the day of that expense.
+
+## Managing expenses for employees in several different countries
+
+Suppose you have employees scattered across the globe who submit expense reports in various currencies. The best way to manage those expenses is to create separate group workspaces for each location or region where your employees are based.
+
+Then, set the default currency for that workspace to match the currency in which the employees are reimbursed.
+
+For example, if you have employees in the US, France, Japan, and India, you’d want to create four separate workspaces, add the employees to each, and then set the corresponding currency for each workspace.
+
+# FAQ
+
+## I have expenses in several different currencies. How will this show up on a report?
+
+If you're traveling to foreign countries during a reporting period and making purchases in various currencies, each expense is imported with the currency of the purchase.
+
+On your expense report, Expensify will automatically convert each expense to the default currency set for the group workspace.
+
+## How does the currency of an expense impact the conversion rate?
+
+Expenses entered in a foreign currency are automatically converted to the default currency on your workspace. The conversion uses the day’s average trading rate pulled from [Open Exchange Rates](https://openexchangerates.org/).
+
+If you want to bypass the exchange rate conversion, you can manually enter an expense in your default currency instead.
+
+
+
diff --git a/docs/articles/expensify-classic/expensify-card/Card-Settings.md b/docs/articles/expensify-classic/expensify-card/Card-Settings.md
index 35708b6fbb1e..a8d56f267757 100644
--- a/docs/articles/expensify-classic/expensify-card/Card-Settings.md
+++ b/docs/articles/expensify-classic/expensify-card/Card-Settings.md
@@ -2,74 +2,76 @@
title: Expensify Card Settings
description: Admin Card Settings and Features
---
-## Expensify Card - admin settings and features
-
+
# Overview
-
+
The Expensify Card offers a range of settings and functionality to customize how admins manage expenses and card usage in Expensify. To start, we'll lay out the best way to make these options work for you.
-
+
Set Smart Limits to control card spend. Smart Limits are spend limits that can be set for individual cards or specific groups. Once a given Smart Limit is reached, the card is temporarily disabled until expenses are approved.
-
+
Monitor spend using your Domain Limit and the Reconciliation Dashboard.
Your Domain Limit is the total Expensify Card limit across your entire organization. No member can spend more than what's available here, no matter what their individual Smart Limit is. A Domain Limit is dynamic and depends on a number of factors, which we'll explain below.
-
+
Decide the settlement model that works best for your business
Monthly settlement is when your Expensify Card balance is paid in full on a certain day each month. Though the Expensify Card is set to settle daily by default, any Domain Admin can change this setting to monthly.
-
+
Now, let's get into the mechanics of each piece mentioned above.
-
+
# How to set Smart Limits
Smart Limits allow you to set a custom spend limit for each Expensify cardholder, or default limits for groups. Setting a Smart Limit is the step that activates an Expensify card for your user (and issues a virtual card for immediate use).
-
+
## Set limits for individual cardholders
As a Domain Admin, you can set or edit Custom Smart Limits for a card by going to Settings > Domains > Domain Name > Company Cards. Simply click Edit Limit to set the limit. This limit will restrict the amount of unapproved (unsubmitted and Processing) expenses that a cardholder can incur. After the limit is reached, the cardholder won't be able to use their card until they submit outstanding expenses and have their card spend approved. If you set the Smart Limit to $0, the user's card can't be used.
## Set default group limits
Domain Admins can set or edit custom Smart Limits for a domain group by going to Settings > Domains > Domain Name > Groups. Just click on the limit in-line for your chosen group and amend the value.
-
+
This limit will apply to all members of the Domain Group who do not have an individual limit set via Settings > Domains > Domain Name > Company Cards.
+
## Refreshing Smart Limits
To let cardholders keep spending, you can approve their pending expenses via the Reconciliation tab. This will free up their limit, allowing them to use their card again.
-
+
To check an unapproved card balance and approve expenses, click on Reconciliation and enter a date range, then click though the Unapproved total to see what needs approving. You can add to a new report or approve an existing report from here.
-
+
You can also increase a Smart Limit at any time by clicking Edit Limit.
-
+
# Understanding your Domain Limit
-
+
To get the most accurate Domain Limit for your company, connect your bank account via Plaid under Settings > Account > Payments > Add Verified Bank Account.
-
+
If your bank isn't supported or you're having connection issues, you can request a custom limit under Settings > Domains > Domain Name > Company Cards > Request Limit Increase. As a note, you'll need to provide three months of unredacted bank statements for review by our risk management team.
-
+
Your Domain Limit may fluctuate from time to time based on various factors, including:
-
+
- Available funds in your Verified Business Bank Account: We regularly check bank balances via Plaid. A sudden drop in balance within the last 24 hours may affect your limit. For 'sweep' accounts, be sure to maintain a substantial balance even if you're sweeping daily.
- Pending expenses: Review the Reconciliation Dashboard to check for large pending expenses that may impact your available balance. Your Domain Limit will adjust automatically to include pending expenses.
- Processing settlements: Settlements need about three business days to process and clear. Several large settlements over consecutive days may impact your Domain Limit, which will dynamically update when settlements have cleared.
-
-As a note, if your Domain Limit is reduced to $0, your cardholders can't make purchases even if they have a larger Smart Limit set on their individual cards.
+
+As a note, if your Domain Limit is reduced to $0, your cardholders can't make purchases even if they have a larger Smart Limit set on their individual cards.
+
# How to reconcile Expensify Cards
## How to reconcile expenses
Reconciling expenses is essential to ensuring your financial records are accurate and up-to-date.
-
+
Follow the steps below to quickly review and reconcile expenses associated with your Expensify Cards:
-
+
1. Go to Settings > Domains > Domain Name > Company Cards > Reconciliation > Expenses
2. Enter your start and end dates, then click Run
3. The Imported Total will show all Expensify Card transactions for the period
4. You'll also see a list of all Expensify Cards, the total spend on each card, and a snapshot of expenses that have and have not been approved (Approved Total and Unapproved Total, respectively)
By clicking on the amounts, you can view the associated expenses
-
+
+
## How to reconcile settlements
A settlement is the payment to Expensify for the purchases made using the Expensify Cards.
-
+
The Expensify Card program can settle on either a daily or monthly basis. One thing to note is that not all transactions in a settlement will be approved when running reconciliation.
-
+
You can view the Expensify Card settlements under Settings > Domains > Domain Name > Company Cards > Reconciliation > Settlements.
-
+
By clicking each settlement amount, you can see the transactions contained in that specific payment amount.
-
+
Follow the below steps to run reconciliation on the Expensify Card settlements:
-
+
1. Log into the Expensify web app
2. Click Settings > Domains > Domain Name > Company Cards > Reconciliation tab > Settlements
3. Use the Search function to generate a statement for the specific period you need
@@ -82,7 +84,7 @@ Follow the below steps to run reconciliation on the Expensify Card settlements:
- Card: refers to the Expensify credit card number and cardholder's email address
- Business Account: the business bank account connected to Expensify that the settlement is paid from
- Transaction ID: a special ID that helps Expensify support locate transactions if there's an issue
-
+
5. Review the individual transactions (debits) and the payments (credits) that settled them
6. Every cardholder will have a virtual and a physical card listed. They're handled the same way for settlements, reconciliation, and exporting.
7. Click Download CSV for reconciliation
@@ -90,77 +92,78 @@ Follow the below steps to run reconciliation on the Expensify Card settlements:
9. To reconcile pre-authorizations, you can use the Transaction ID column in the CSV file to locate the original purchase
10. Review account payments
11. You'll see payments made from the accounts listed under Settings > Account > Payments > Bank Accounts. Payment data won't show for deleted accounts.
-
+
You can use the Reconciliation Dashboard to confirm the status of expenses that are missing from your accounting system. It allows you to view both approved and unapproved expenses within your selected date range that haven't been exported yet.
-
+
+
# Deep dive
## Set a preferred workspace
Some customers choose to split their company card expenses from other expense types for coding purposes. Most commonly this is done by creating a separate workspace for card expenses.
-
+
You can use the preferred workspace feature in conjunction with Scheduled Submit to make sure all newly imported card expenses are automatically added to reports connected to your card-specific workspace.
+
## How to change your settlement account
You can change your settlement account to any other verified business bank account in Expensify. If your bank account is closing, make sure you set up the replacement bank account in Expensify as early as possible.
-
+
To select a different settlement account:
-
+
1. Go to Settings > Domains > Domain Name > Company Cards > Settings tab
2. Use the Expensify Card settlement account dropdown to select a new account
3. Click Save
-
+
+
## Change the settlement frequency
-
+
By default, the Expensify Cards settle on a daily cadence. However, you can choose to have the cards settle on a monthly basis.
-
+
1. Monthly settlement is only available if the settlement account hasn't had a negative balance in the last 90 days
2. There will be an initial settlement to settle any outstanding spend that happened before switching the settlement frequency
3. The date that the settlement is changed to monthly is the settlement date going forward (e.g. If you switch to monthly settlement on September 15th, Expensify Cards will settle on the 15th of each month going forward)
-
+
To change the settlement frequency:
1. Go to Settings > Domains > Domain Name > Company Cards > Settings tab
2. Click the Settlement Frequency dropdown and select Monthly
3. Click Save to confirm the change
-
-
+
+
+
## Declined Expensify Card transactions
As long as you have 'Receive realtime alerts' enabled, you'll get a notification explaining the decline reason. You can enable alerts in the mobile app by clicking on three-bar icon in the upper-left corner > Settings > toggle Receive realtime alerts on.
-
+
If you ever notice any unfamiliar purchases or need a new card, go to Settings > Account > Credit Card Import and click on Request a New Card right away.
-
+
Here are some reasons an Expensify Card transaction might be declined:
-
+
1. You have an insufficient card limit
- If a transaction amount exceeds the available limit on your Expensify Card, the transaction will be declined. It's essential to be aware of the available balance before making a purchase to avoid this - you can see the balance under Settings > Account > Credit Card Import on the web app or mobile app. Submitting expenses and having them approved will free up your limit for more spend.
-
+
2. Your card hasn't been activated yet, or has been canceled
- If the card has been canceled or not yet activated, it won't process any transactions.
-
+
3. Your card information was entered incorrectly. Entering incorrect card information, such as the CVC, ZIP or expiration date will also lead to declines.
-
+
4. There was suspicious activity
- If Expensify detects unusual or suspicious activity, we may block transactions as a security measure. This could happen due to irregular spending patterns, attempted purchases from risky vendors, or multiple rapid transactions. Check your Expensify Home page to approve unsual merchants and try again.
If the spending looks suspicious, we may do a manual due diligence check, and our team will do this as quickly as possible - your cards will all be locked while this happens.
-
5. The merchant is located in a restricted country
- Some countries may be off-limits for transactions. If a merchant or their headquarters (billing address) are physically located in one of these countries, Expensify Card purchases will be declined. This list may change at any time, so be sure to check back frequently: Belarus, Burundi, Cambodia, Central African Republic, Democratic Republic of the Congo, Cuba, Iran, Iraq, North Korea, Lebanon, Libya, Russia, Somalia, South Sudan, Syrian Arab Republic, Tanzania, Ukraine, Venezuela, Yemen, and Zimbabwe.
-
+
# FAQ
## What happens when I reject an Expensify Card expense?
-
-
Rejecting an Expensify Card expense from an Expensify report will simply allow it to be reported on a different report. You cannot undo a credit card charge.
-
+
If an Expensify Card expense needs to be rejected, you can reject the report or the specific expense so it can be added to a different report. The rejected expense will become Unreported and return to the submitter's Expenses page.
-
+
If you want to dispute a card charge, please message Concierge to start the dispute process.
-
+
If your employee has accidentally made an unauthorised purchase, you will need to work that out with the employee to determine how they will pay back your company.
-
-
+
+
## What happens when an Expensify Card transaction is refunded?
-
-
+
+
The way a refund is displayed in Expensify depends on the status of the expense (pending or posted) and whether or not the employee also submitted an accompanying SmartScanned receipt. Remember, a SmartScanned receipt will auto-merge with the Expensify Card expense.
-
+
- Full refunds:
If a transaction is pending and doesn't have a receipt attached (except for eReceipts), getting a full refund will make the transaction disappear.
If a transaction is pending and has a receipt attached (excluding eReceipts), a full refund will zero-out the transaction (amount becomes zero).
diff --git a/docs/articles/expensify-classic/expensify-card/Expensify-Card-Perks.md b/docs/articles/expensify-classic/expensify-card/Expensify-Card-Perks.md
new file mode 100644
index 000000000000..5c9761b7ff1d
--- /dev/null
+++ b/docs/articles/expensify-classic/expensify-card/Expensify-Card-Perks.md
@@ -0,0 +1,247 @@
+---
+title: Expensify Card Perks
+description: Get the most out of your Expensify Card with exclusive perks!
+---
+
+
+# Overview
+The Expensify Card is packed with perks, both native to our Card program and through exclusive discounts with partnering solutions. The Expensify Card’s primary perks include:
+- Access to our premiere Expensify Lounge (with more locations coming soon)
+- Swipe to Win, where every swipe has a chance to win fun personalized gifts for you and your closest friends and family members
+- And unbeatable cash back incentive with each swipe
+Below, we’ll cover all of our exclusive offers in more detail and how to claim discounts with our partners.
+
+# Expensify Card Perks
+
+## Access to the Expensify Lounge
+Our [world-class lounge](https://use.expensify.com/lounge) is now open for Expensify members and guests to enjoy!
+
+We invite you to visit our sleek San Francisco lounge, where sweeping city views provide the perfect backdrop for a morning coffee to start your day.
+
+Enjoy complimentary cocktails and snacks in a vibrant atmosphere with blazing-fast WiFi. Whether you want a place to focus on work, socialize with other members, or simply kick back and relax – our lounge is ready and waiting to welcome you.
+
+You can sign up for free [here](https://use.expensify.com) if you’re not an Expensify member. If you have any questions, reach out to concierge@expensify.com and [check this out](https://use.expensify.com/lounge) for more info.
+
+## Swipe to Win
+Swipe to Win is a new [Expensify Card](https://use.expensify.com/company-credit-card) perk that gives cardholders the chance to send a gift to a friend, family member, or essential worker on the frontlines!
+
+Winners can choose to _Send a Smile_ or _Send a Laugh_. To start, we’re offering one gift per option:
+
+- **Send A Smile:** Champagne by Expensify
+- **Send a Laugh:** Jenga Set
+
+**How to Participate**
+It’s easy! Once you have an Expensify Card, you just need to start using it. With each swipe, you're automatically entered to win and have a 1 in 250 chance of getting a prize!
+
+**How will I know if I’ve won?**
+Winners will be notified immediately via the Expensify app, and receive additional instructions on how to choose and send their desired gift.
+
+If you don't have Expensify notifications turned on yet, here are some helpful guides:
+- [Apple Notification Preferences](https://support.apple.com/en-us/HT201925)
+- [Android Notification Preferences](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fsupport.google.com%2Fandroid%2Fanswer%2F9079661%3Fhl%3Den)
+
+# Partner Specific Perks
+
+## Amazon AWS
+Whether you are a two-person startup launching a new company or a venture-backed startup, we all could use a little relief in these difficult times. AWS Activate provides you with access to the resources you need to quickly get started on AWS - including free credits, technical support, and training.
+
+All Expensify customers that have adopted The Expensify Card qualify when they add their Expensify Card for billing with AWS!
+
+**Apply now by going [to this link](https://aws.amazon.com/startups/credits) and using the OrgID: 0qyIA (Case Sensitive)**
+
+The full details on the AWS Activate program can be found in AWS's [terms & conditions](https://aws.amazon.com/activate/terms/) and the [Activate FAQs](https://aws.amazon.com/startups/faq).
+
+## Stripe
+Whether you’re creating a subscription service, an on-demand marketplace, or an e-commerce store, Stripe’s integrated payments platform helps you build and scale your business globally.
+
+**Receive waived Stripe fees, if you’re new to Stripe, for your first $5,000 in processed payments.**
+
+**How to redeem:** Sign up for Stripe using your Expensify Card.
+
+## Lamar Advertising
+Lamar provides out-of-home advertising space for clients on billboards, digital, airport displays, transit, and highway logo signs.
+
+**Receive at minimum a 10% discount on your first campaign.**
+
+**How do redeem:** Contact Expensify’s dedicated account manager, Lisa Kane, and mention you’re an Expensify cardholder.
+
+Email: lkane@lamar.com
+
+## Carta
+Simplify equity management with Carta.
+
+**Receive a 20% first-year discount and waived implementation fees for Carta.**
+
+**How to redeem:** Sign up using your Expensify Card
+
+## Pilot
+Pilot specializes in bookkeeping and tax prep for startups and e-commerce providers. When you work with Pilot, you’re paired with a dedicated finance expert who takes the work off your plate and is on hand to answer your questions.
+
+**20% off the first 6-months of Pilot Core**
+
+**How to redeem:** Sign-up using your Expensify Card.
+
+## Spotlight Reporting
+The integrated cloud reporting and forecasting tool that allows you to create insights for better business decisions. Designed by Accountants, for Accountants
+
+**20% discount off your subscription for the first 6 months, plus one free seat to Spotlight Certification.**
+
+**How to redeem:** Sign up using your Expensify Card.
+
+## Guideline
+Guideline's full-service 401(k) plans make it easier and more affordable to offer your employees the retirement benefits they deserve.
+
+**Receive 3 months free.**
+
+**How to redeem:** Sign up using your Expensify Card.
+
+## Gusto
+Gusto's people platform helps businesses like yours onboard, pay, insure, and support your hardworking team. Payroll, benefits, and more
+
+**3 months free service**
+
+**How to redeem:** Sign-up using your Expensify Card.
+
+## QuickBooks Online
+QuickBooks accounting software helps keep your books accurate and up to date, automatically such as: invoicing, cashflow, expense tracking, and more.
+
+**Receive 30% off QuickBooks Online for the first 12 months.**
+
+**How to redeem:** Sign up using your Expensify Card.
+
+## Highfive
+Highfive improves the ease and quality of intelligent in-room video conferencing.
+
+**Receive 50% off the Highfive Select starter package. 10% off the Highfive Premium Package.**
+
+**How to redeem:** Sign-up with your Expensify Card.
+
+## Zendesk
+**$436 in credits for Zendesk Suite products per month for the first year**
+
+How to redeem:
+1. Reach out to startups@zendesk.com with the following: "Expensify asked me to send an email regarding the Zendesk promotion”. You'll receive a code you use in step 5 below.
+2. Start a Zendesk Trial (can be a suite trial or something different) in USD. If your trial is not in USD, contact Zendesk. If you already have a current trial, the code applies and can be used.
+3. From inside your Zendesk trial, click the Buy Now button.
+4. Select your chosen plan with monthly billing. The $436 monthly credit works for up to 4 licenses of the Suite, but the code can also apply $436 to any alternative monthly plan selection.
+5. Enter the promo code that was provided to you in step 1 after emailing Zendesk.
+6. Complete the checkout process and note that once your free credit runs out after 12 monthly billing periods, you will be charged for your next month with Zendesk.
+
+## Xero
+Accounting Software With Everything You Need To Run Your Business Beautifully. Smart Online Accounting. Bank Connections
+
+**U.S. residents get 50% off Xero for six months.**
+
+Head to [this](https://apps.xero.com/us/app/expensify?xtid=x30expensify&utm_source=expensify&utm_medium=web&utm_campaign=cardoffer) page and sign-up for Xero using your Expensify Card!
+
+## Freshworks
+Boost your startup journey with leading customer and employee engagement solutions from Freshworks including CRM, livechat, support, marketing automation, ITSM and HRMS.
+
+How to receive $4,000 in credits on Freshworks products:
+
+[Click here](https://www.freshworks.com/partners/startup-program/expensify-card/) and fill out the form and enter your details, Freshbooks will recognize your company as an Expensify Card customer automatically.
+
+## Slack
+**Receive 25% off for the first year:** You’ll enjoy premium features like unlimited messaging and apps, Slack Connect channels, group video calls, priority support, and much more. It’s all just a click away.
+
+**How to redeem with your Expensify Card:** [Click here](https://slack.com/promo/partner?remote_promo=ead919f5) to redeem the offer by using your Expensify Card to manage the billing.
+
+## Deel.com
+Deel makes onboarding international team members in 150 different countries painless. Quickly bring on contractors or hire employees in seconds with Deel as your employer of record (EOR). It’s one simple, powerful dashboard that houses everything you need. Finalize contracts, pay employees, and manage all your payroll data in one place seamlessly.
+
+**How to redeem 3 months free, then 30% off the rest of the year with Deel.com:** Click [here](https://www.deel.com/partners/expensify) and sign up using your Expensify Card.
+
+## Snap
+**$1,000 in Snap credits**
+Whether you're looking to increase online sales, drive app installs, or get more leads, Snapchat can connect you with a unique mobile audience primed to take action. For a limited time, spend $1000 in Snapchat's Ads Manager and receive $1000 in ad credit to use towards your next campaign!
+
+**How to redeem with your Expensify Card:** Click on `create ad` or `request a call` by clicking here. Enter your details to set up your account if you don't already have one.Add the Expensify Card as your payment option for your Snap Business account.Credits will be automatically placed in your account once you've reached $1,000 in spend.
+
+## Aircall
+Aircall is the cloud-based phone system of choice for modern brands. Aircall allows sales and support teams to have meaningful and efficient phone conversations, and integrates with the most popular CRMs, Help desks, and business tools. Pricing is dependent on the number of users within the account. Discount could range from $270-$9,000+
+
+**2 Months Free**
+
+**How to redeem with your Expensify Card:**
+1. Click [here])(http://pages.aircall.io/Expensify-RewardsPartnerReferral.html)
+2. Sign up for a demo
+3. Let our team know you're an Expensify customer
+
+## NetSuite
+NetSuite helps companies manage core business processes with a cloud-based ERP and accounting software. Expensify has a direct integration with NetSuite so that expenses are coded to your exact preference and data is always synchronized across the two systems.
+
+**10% OFF for the First Year**
+
+**How to redeem:**
+1. Fill out this [Google form](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fdocs.google.com%2Fforms%2Fd%2Fe%2F1FAIpQLSeiOzLrdO-MgqeEMwEqgdQoh4SJBi42MZME9ycHp4SQjlk3bQ%2Fviewform%3Fusp%3Dsf_link).
+2. An Expensify rep will make an introduction to a NetSuite sales rep to get the process started. This offer is only for prospective NetSuite customers. If you are currently a NetSuite customer, this promotion does not apply.
+3. Once you are set up and pay for your first year with NetSuite, we will send you a payment equal to 10% of your first year contract within three months of paying your first NetSuite invoice.
+
+## PagerDuty
+PagerDuty's Platform for Real-Time Operations integrates machine data & human intelligence to improve visibility & agility across organizations.
+
+**25% OFF**
+
+**How to redeem:**
+1. Sign-up using your Expensify Card
+2. Use the discount code EXPENSIFYPDTEAM for a 25% discount on the Team plan or EXPENSIFYPDBUSINESS for a 25% discount on the Business plan within the Cost Summary section upon checkout.
+
+## Typeform
+Typeform makes collecting and sharing information comfortable and conversational. It's a web-based platform you can use to create anything from surveys to apps, without needing to write a single line of code.
+
+**30% off annual premium and professional plans**
+
+**How to redeem with your Expensify Card:**
+1. Click on the 'Get Typeform` by [clicking here](https://try.typeform.com/expensify/?utm_source=expensify&utm_medium=referral&utm_campaign=expensify_integration&utm_content=directory)
+2. Enter your details and setup your free account
+3. Verify your email by clicking on the link that Typeform sends you
+4. Go through the on boarding flow within Tyepform
+5. Click on the 'Upgrade' button from within your workspace
+6. Select your plan
+7. Enter the coupon 'EXPENSIFY30' on the checkout page
+8. Click on 'Upgrade now' once you've filled out all of your payment details with your Expensify Card
+
+## Intercom
+Intercom builds a suite of messaging-first products for businesses to accelerate growth across the customer lifecycle.
+
+**3-months free service**
+
+**How to redeem:** Sign-up using your Expensify Card.
+
+## Talkspace
+Prescription management and personalized treatment from a network of licensed prescribers trained in mental healthcare. Therapists are licensed, verified and background-checked. Working with a Talkspace therapist will give you an unbiased, trained perspective and provide you with the guidance and tools to help you feel better. When it comes to your mental health, the right therapist makes all the difference.
+
+**$125 OFF Talkspace purchases**
+
+**How to redeem with your Expensify Card:** Use the code at EXPENSIFY at the time of checkout.
+
+## Stripe Atlas
+Stripe Atlas helps removes obstacles typically associated with starting a business so you can build your startup from anywhere in the world.
+
+**Receive $100 off Stripe Atlas and get access to a startup toolkit and special offers on additional Strip Atlas services.**
+
+**How to redeem:** Sign up with your Expensify Card.
+
+# FAQ
+
+## Where is the Expensify Lounge?
+The Expensify Lounge is located on the 16th floor of 88 Kearny Street in San Francisco, California, 94108. This is currently our only lounge location, but keep an eye out for more work lounges popping up soon!
+
+## When is the Expensify Lounge open?
+The lounge is open 8 a.m. to 6 p.m. from Monday through Friday, except for national holidays. Capacity is limited, and we are admitting loungers on a first-come, first-served basis, so make sure to get there early!
+
+## Who can use the lounge workplace?
+Customers with an Expensify subscription can use Expensify’s lounge workplace, and any partner who has completed [ExpensifyApproved! University!](https://university.expensify.com/users/sign_in?next=%2Fdashboard)
+
+
+
+
+# FAQ
+This section covers the useful but not as vital information, it should capture commonly queried elements which do not organically form part of the About or How-to sections.
+
+- What's idiosyncratic or potentially confusing about this feature?
+- Is there anything unique about how this feature relates to billing/activity?
+- If this feature is released, are there any common confusions that can't be solved by improvements to the product itself?
+- Similarly, if this feature hasn't been released, can you predict and pre-empt any potential confusion?
+- Is there any general troubleshooting for this feature?
+ - Note: troubleshooting should generally go in the FAQ, but if there is extensive troubleshooting, such as with integrations, that will be housed in a separate page, stored with and linked from the main page for that feature.
diff --git a/docs/articles/expensify-classic/expensify-card/Get-The-Card.md b/docs/articles/expensify-classic/expensify-card/Get-The-Card.md
deleted file mode 100644
index e5233a3732a3..000000000000
--- a/docs/articles/expensify-classic/expensify-card/Get-The-Card.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Get the Card
-description: Get the Card
----
-## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expensify-card/Request-the-Card.md b/docs/articles/expensify-classic/expensify-card/Request-the-Card.md
new file mode 100644
index 000000000000..4830c0fffbcd
--- /dev/null
+++ b/docs/articles/expensify-classic/expensify-card/Request-the-Card.md
@@ -0,0 +1,49 @@
+---
+title: Request the Card
+description: Details on requesting the Expensify Card as an employee
+---
+# Overview
+
+Once your organization is approved for the Expensify Card, you can request a card!
+
+This article covers how to request, activate, and replace your physical and virtual Expensify Cards.
+
+# How to get your first Expensify Card
+
+An admin in your organization must first enable the Expensify Cards before you can receive a card. After that, an admin may assign you a card by setting a limit. You can think of setting a card limit as “unlocking” access to the card.
+
+If you haven’t been assigned a limit yet, look for the task on your account's homepage that says, “Ask your admin for the card!” This task allows you to message your admin team to make that request.
+
+Once you’re assigned a card limit, we’ll notify you via email to let you know you can request a card. A link within the notification email will take you to your account’s homepage, where you can provide your shipping address for the physical card. Enter your address, and we’ll ship the card to arrive within 3-5 business days.
+
+Once your physical card arrives in the mail, activate it in Expensify by entering the last four digits of the card in the activation task on your account’s homepage.
+
+# Virtual Card
+
+Once assigned a limit, a virtual card is available immediately. You can view the virtual card details via **Settings > Account > Credit Card Import > Show Details**. Feel free to begin transacting with the virtual card while your physical card is in transit – your virtual card and physical card share a limit.
+
+Please note that you must enable two-factor authentication on your account if you want to have the option to dispute transactions made on your virtual card.
+
+# Notifications
+
+To stay up-to-date on your card’s limit and spending activity, download the Expensify mobile app and enable push notifications. Your card is connected to your Expensify account, so each transaction on your card will trigger a push notification. We’ll also send you a push notification if we detect potentially fraudulent activity and allow you to confirm your purchase.
+
+# How to request a replacement Expensify Card
+
+You can request a new card anytime if your Expensify Card is lost, stolen, or damaged. From your Expensify account on the web, head to **Settings > Account > Credit Card Import** and click **Request a New Card**. Confirm the shipping information, complete the prompts, and your new card will arrive in 2 - 3 business days.
+
+Selecting the “lost” or “stolen” options will deactivate your current card to prevent potentially fraudulent activity. However, choosing the “damaged” option will leave your current card active so you can use it while the new one is shipped to you.
+
+If you need to cancel your Expensify Card and cannot access the website or mobile app, call our interactive voice recognition phone service (available 24/7). Call 1-877-751-5848 (US) or +44 808 196 0632 (Internationally).
+
+It's not possible to order a replacement card over the phone, so, if applicable, you would need to handle this step from your Expensify account.
+
+# FAQ
+
+## What if I haven’t received my card after multiple weeks?
+
+Reach out to support, and we can locate a tracking number for the card. If the card shows as delivered, but you still haven’t received it, you’ll need to confirm your address and order a new one.
+
+## I’m self-employed. Can I set up the Expensify Card as an individual?
+
+Yep! As long as you have a business bank account and have registered your company with the IRS, you are eligible to use the Expensify Card as an individual business owner.
diff --git a/docs/articles/expensify-classic/getting-started/Tips-And-Tricks.md b/docs/articles/expensify-classic/getting-started/Tips-And-Tricks.md
new file mode 100644
index 000000000000..b692bf466413
--- /dev/null
+++ b/docs/articles/expensify-classic/getting-started/Tips-And-Tricks.md
@@ -0,0 +1,72 @@
+---
+title: Tips and Tricks
+description: How to get started with setup tips for your Expensify account
+---
+
+# Overview
+In this article, we'll outline helpful tips for using Expensify, such as keyboard shortcuts and text formatting.
+
+# How to Format Text in Expensify
+You can use a basic markdown in report comments to emphasize or clarify your sentiments. This includes italicizing, bolding, and strikethrough for text, as well as adding basic hyperlinks.
+Formatting is consistent across both web and mobile applications, with three markdown options available for your report comments:
+- **Bold:** Place an asterisk on either side (*bold*)
+- **Italicize:** Place an underscore on either side (_italic_)
+- **Strikethrough:** Place a tilde on either side (~strikethrough~)
+
+# How to Use Keyboard Shortcuts
+Keyboard shortcuts can speed things up and simplify tasks. Expensify offers several shortcuts for your convenience. Let's explore them!
+- **Shift + ?** - Opens the keyboard shortcuts dialog
+- **Shift + G** - Prompts you for a reportID to open the report page for a specific report
+- **ESC** - Closes any shortcut dialog window
+- **Ctrl+Enter** - Submit a comment on a report from the comment field in the Report History & Comments section.
+- **Shift + P** - Takes you to the report’s policy when you’re on a report
+- **Shift + →** - Go to the next report
+- **Shift + ←** - Go to the previous report
+- **Shift + R** - Reloads the current page
+
+# How to Create a Copy of a Report
+If you have identical monthly expenses and want to copy them easily, visit your Reports page, check the box next to the report you would like to duplicate, and click "Copy" to duplicate all expenses (excluding receipt images).
+If you prefer, you can create a standard template for certain expenses:
+1. Go to the Reports page.
+2. Click "New Report."
+3. Assign an easily searchable name to the report.
+4. Click the green '+' button to add an expense.
+5. Choose "New Expense."
+6. Select the type of expense (e.g., regular expense, distance, time, etc.).
+7. Enter the expense details, code, and any relevant description.
+8. Click "Save."
+**Pro Tip:** If you use Scheduled Submit, place the template report under your individual workspace to avoid accidental submission. When you're ready to use it, check the report box, copy it, and make necessary changes to the name and workspace.
+
+# How to Enable Location Access on Web
+If you’d like to use features that rely on your current location, you will need to enable location permissions for Expensify. You can find instructions for enabling location settings on the three most common web browsers below. If your browser is not on the list, then please do a web search for your browser and “enable location settings”.
+
+## Chrome
+1. Open Chrome
+2. At the top right, click the three-dot Menu > Settings
+3. Click “Privacy and Security” and then “Site Settings”
+4. Click "Location"
+5. Check the “Not allowed to see your location” list to ensure that expensify.com and new.expensify.com are not listed. If they are, click the delete icon next to them to allow location access
+
+## Firefox
+1. Open Firefox
+2. In the URL bar enter “about:preferences”
+3. On the left-hand side select “Privacy & Security”
+4. Scroll down to Permissions
+5. Click on Settings next to Location
+6. If location access is blocked for expensify.com or new.expensify.com, you can update it here to allow access
+
+## Safari
+1. In the top menu bar, click Safari
+2. Then select Settings > Websites
+3. Click Location on the left-hand side
+4. If expensify.com or new.expensify.com have “Deny” set as their access, update it to “Ask” or “Allow”
+
+# Which browser works best with Expensify?
+We recommend using Google Chrome, but you can use Expensify on most major browsers, such as:
+- [Google Chrome](https://google.com/chrome/)
+- [Mozilla Firefox](https://mozilla.com/firefox)
+- [Microsoft Edge](https://microsoft.com/edge)
+- [Microsoft Internet Explorer](https://microsoft.com/ie). Please note: Microsoft has discontinued support and security updates for all versions below Version 11. This means those older versions may not work well. Due to the lack of security updates for the older versions, parts of our site may not be accessible. Please update your IE version or choose a different browser.
+- [Apple Safari (Apple devices only)](https://apple.com/safari)
+- [Opera](https://opera.com)
+It's always best practice to ensure you have the most recent updates for your browser and keep your operating system up to date.
diff --git a/docs/articles/expensify-classic/insights-and-custom-reporting/Other-Export-Options.md b/docs/articles/expensify-classic/insights-and-custom-reporting/Other-Export-Options.md
index 31f5aaf93032..dfc545c4c367 100644
--- a/docs/articles/expensify-classic/insights-and-custom-reporting/Other-Export-Options.md
+++ b/docs/articles/expensify-classic/insights-and-custom-reporting/Other-Export-Options.md
@@ -14,7 +14,7 @@ From the **Expenses** page, you can export individual expenses into a CSV. From
3. Click **Export to** at the top right of the page
4. Choose the desired export option
-You can use one of the default templates or create your own template. The default templates and the option to export to a connected accounting package are only available on the **Reports** page. Visit the specific help page for your accounting package to learn more about how to get this set up.
+You can use one of the [default templates](https://help.expensify.com/articles/expensify-classic/insights-and-custom-reporting/Default-Export-Templates#gsc.tab=0) or [create your own template](https://help.expensify.com/articles/expensify-classic/insights-and-custom-reporting/Custom-Templates#gsc.tab=0). The default templates and the option to export to a connected accounting package are only available on the **Reports** page. Visit the specific help page for your accounting package to learn more about how to get this set up.
# How to export a report as a PDF
1. Go to the **Reports** page
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/QuickBooks-Time.md b/docs/articles/expensify-classic/integrations/HR-integrations/QuickBooks-Time.md
index 3ee1c8656b4b..5bbd2c4b583c 100644
--- a/docs/articles/expensify-classic/integrations/HR-integrations/QuickBooks-Time.md
+++ b/docs/articles/expensify-classic/integrations/HR-integrations/QuickBooks-Time.md
@@ -1,5 +1,41 @@
---
-title: Coming Soon
-description: Coming Soon
+title: Expensify and TSheets/QuickBooks Time Integration Guide
+description: This help document explains how to connect TSheets/QuickBooks Time to your Expensify policy
---
-## Resource Coming Soon!
+# Overview
+
+Connecting Expensify with TSheets/QuickBooks Time can streamline your expense tracking and time management processes. This integration allows you to automatically sync time entries from TSheets/QuickBooks Time with expenses in Expensify, ensuring accurate and efficient expense reporting.
+
+# How to set up the Expensify and TSheets/QuickBooks Time integration
+
+Before you begin, make sure you have the following:
+
+- **Expensify account:** You must have an active Expensify account.
+- **TSheets account:** You must have a TSheets account and admin privileges to set up the integration.
+
+Now, follow these steps to set up the integration:
+
+1. Log into your Expensify account on your web browser
+
+2. Go to **Settings > Workspaces > Group > Workspace Name > Connections > TSheets**
+
+3. Click **Connect to TSheets**
+
+4. Follow the on-screen instructions to sign in to your TSheets account and grant Expensify access.
+
+5. Once the integration is authorized, you may need to configure some preferences.
+- Specify how you want TSheets time entries to be imported into Expensify. You can typically customize settings like the date range, project/task mapping, and expense categories.
+
+6. Now, we’d recommend testing the integration.
+- Create a sample time entry in TSheets and check if it’s automatically reflected in your Expensify account.
+
+7. If the test is successful, save your integration settings.
+
+8. You may also want to schedule regular syncs or specify how often Expensify should pull data from TSheets.
+
+With the integration set up, your TSheets time entries will now appear in Expensify as expenses. You can review, categorize, and submit these expenses as needed.
+
+Congratulations! You've successfully integrated Expensify with TSheets, simplifying your expense tracking and reporting process.
+
+For questions, don't hesitate to reach out to concierge@expensify.com or chat directly with your account manager
+
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Bolt.md b/docs/articles/expensify-classic/integrations/travel-integrations/Bolt.md
deleted file mode 100644
index 3ee1c8656b4b..000000000000
--- a/docs/articles/expensify-classic/integrations/travel-integrations/Bolt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Coming Soon
-description: Coming Soon
----
-## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Hotel-Tonight.md b/docs/articles/expensify-classic/integrations/travel-integrations/Hotel-Tonight.md
deleted file mode 100644
index 3ee1c8656b4b..000000000000
--- a/docs/articles/expensify-classic/integrations/travel-integrations/Hotel-Tonight.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Coming Soon
-description: Coming Soon
----
-## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Kayak.md b/docs/articles/expensify-classic/integrations/travel-integrations/Kayak.md
deleted file mode 100644
index 3ee1c8656b4b..000000000000
--- a/docs/articles/expensify-classic/integrations/travel-integrations/Kayak.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Coming Soon
-description: Coming Soon
----
-## Resource Coming Soon!
diff --git a/docs/articles/new-expensify/getting-started/Security.md b/docs/articles/new-expensify/getting-started/Security.md
new file mode 100644
index 000000000000..5c8eee7ae60e
--- /dev/null
+++ b/docs/articles/new-expensify/getting-started/Security.md
@@ -0,0 +1,53 @@
+---
+title: Security
+description: Expensify prioritizes data security and maintains strict compliance standards to safeguard users' sensitive information.
+---
+
+
+# Overview
+
+We take security seriously. Our measures align with what banks use to protect sensitive financial data. We regularly test and update our security to stay ahead of any threats. Plus, we're checked daily by McAfee for extra reassurance against hackers. You can verify our security strength below or on the McAfee SECURE site.
+
+Discover how Expensify safeguards your information below!
+
+## The Gold Standard of Security
+
+Expensify follows the highest standard of security, known as the Payment Card Industry Data Security Standard. This standard is used by major companies like PayPal, Visa, and banks to protect online credit card information. It covers many aspects of how systems work together securely. You can learn more about it on the PCI-DSS website. And, Expensify is also compliant with SSAE 16!
+
+
+## Data and Password Encryption
+
+When you press 'enter,' your data transforms into a secret code, making it super secure. This happens whether it's moving between your browser and our servers or within our server network. In tech talk, we use HTTPS+TLS for all web connections, ensuring your information is encrypted at every stage of the journey. This means your data is always protected!
+
+## Account Safety
+
+Protecting your data on our servers is our top priority. We've taken strong measures to ensure your data is safe when it travels between you and us and when it's stored on our servers.
+In our first year, we focused on creating a super-reliable, geographically redundant, and PCI compliant data center. This means your data stays safe, and our systems stay up and running.
+We use a dual-control key, which only our servers know about. This key is split into two parts and stored in separate secure places, managed by different Expensify employees.
+With this setup, sensitive data stays secure and can't be accessed outside our secure servers.
+
+## Our Commitment to GDPR
+
+The General Data Protection Regulation (GDPR), introduced by the European Commission, is a set of rules to strengthen and unify data protection for individuals in the European Union (EU). It also addresses the transfer of personal data outside the EU. This regulation applies not only to EU-based organizations but also to those outside the EU that handle the data of EU citizens. The compliance deadline for GDPR was May 25, 2018.
+
+Our commitment to protecting the privacy of our customer’s data includes:
+
+- Being active participants in the EU-US Privacy Shield and Swiss-US Privacy Shield Frameworks.
+- Undergoing annual SSAE-18 SOC 1 Type 2 audit by qualified, independent third-party auditors.
+- Maintaining PCI-DSS compliance.
+- Leveraging third-party experts to conduct yearly penetration tests.
+- All employees and contractors are subject to background checks (refreshed. annually), sign non-disclosure agreements, and are subject to ongoing security and privacy training.
+
+
+We have worked diligently to ensure we comply with GDPR. Here are some key changes we made:
+
+
+- **Enhanced Security and Data Privacy**: We've strengthened our security measures and carefully reviewed our privacy policies to align with GDPR requirements.
+- **Dedicated Data Protection Officer**: We've appointed a dedicated Data Protection Officer who can be reached at [privacy@expensify.com](mailto:privacy@expensify.com) for any privacy-related inquiries.
+- **Vendor Agreements**: We've signed Data Processing Addendums (DPAs) with all our vendors to ensure your data is handled safely during onward transfers.
+- **Transparency**: You can find details about the sub-processors we use on our website.
+- **Privacy Shield Certification**: We maintain certifications for the E.U.-U.S. Privacy Shield and the Swiss-U.S. Privacy Shield, which help secure international data transfers.
+- **GDPR Compliance**: We have a Data Processing Addendum that outlines the terms to meet GDPR requirements. You can request a copy by contacting [concierge@expensify.com](mailto:concierge@expensify.com).
+- **User Control**: Our product tools allow users to export data, manage preferences, and close accounts anytime.
+
+**Disclaimer**: Please note that the information on this page is for informational purposes only and is not intended as legal advice. It's essential to consult with legal and professional counsel to understand how GDPR may apply to your specific situation.
diff --git a/docs/articles/new-expensify/workspace-and-domain-settings/Domain-Settings-Overview.md b/docs/articles/new-expensify/workspace-and-domain-settings/Domain-Settings-Overview.md
new file mode 100644
index 000000000000..cf2f0f59a4a0
--- /dev/null
+++ b/docs/articles/new-expensify/workspace-and-domain-settings/Domain-Settings-Overview.md
@@ -0,0 +1,140 @@
+---
+title: Domains
+description: Want to gain greater control over your company settings in Expensify? Read on to find out more about our Domains feature and how it can help you save time and effort when managing your company expenses.
+---
+
+# Overview
+Domains is a feature in Expensify that allows admins to have more nuanced control over a specific Expensify activity, as well as providing a bird’s eye view of company card expenditure. Think of it as your command center for things like managing user account access, enforcing stricter Workspace rules for certain groups, or issuing cards and reconciling statements.
+There are several settings within Domains that you can configure so that you have more control and visibility into your organization’s settings. Those features are:
+- Company Cards
+- Domain Admins
+- Domain Members
+ - Two-Factor Authentication
+- Domain Groups
+ - Domain Group Settings
+- Reporting Tools
+- SAML
+
+There are two ways to use Domains – as an unverified domain or a verified domain. An unverified domain allows you to import Company Cards and manage them, whereas a verified domain allows you to do that in addition to:
+1. Receive vendor bills in Expensify
+2. Fine-tune user restrictions using domain Groups
+3. Configure SAML SSO for easier login to Expensify
+4. Set vacation delegates for your domain members
+5. Use consolidated domain billing
+
+# How to claim a domain
+To use the domains feature with an unverified domain, you’ll need to claim the domain first.
+To claim a domain, you need to be a Workspace Admin with a company email address. This allows you to manage company bills, company cards, and reconciliation. Claiming requires an email matching your company's domain.
+1. Create an Expensify account
+2. Set up an expense Workspace
+3. Go to **Settings > _Domains_**.
+Whichever member runs through those steps will automatically be made a Domain Admin.
+
+
+# How to verify a domain
+To use the domains feature with a verified domain, you’ll want to go through the steps of verifying it.
+
+To verify domain ownership, follow these steps:
+1. Log in to your DNS service provider, which could be your Domain Name Registrar like NameCheap or GoDaddy, a dedicated DNS service provider like DNSMadeEasy or Amazon Route53, or managed internally by your company's IT department.
+2. Find the page for editing DNS records for expensify.com. This might be labeled as DNS Management or Zone File Editor.
+3. Add a new TXT record and set the value as: **532F6180D8**
+4. Save your changes
+5. Click the Verify button to confirm domain ownership
+
+After successful verification, you can remove the TXT DNS record. Please note that an email will be sent to all Expensify users on the domain to inform them that their accounts will be under Domain Control after verification.
+
+**Tips:**
+Not sure how to do this? Check the below guides from some of the most popular hosts on the web:
+[123-reg.co.uk](https://www.123-reg.co.uk/)
+[One.com](https://www.one.com/en/)
+[Wix.com](https://www.wix.com/)
+Google/GSuite
+[Godaddy](https://www.godaddy.com/)
+When creating the TXT record, input only the code and no other values or information.
+You can always confirm if you added the TXT code correctly here: https://viewdns.info/dnsrecord/?domain=[enterdomainhere]
+
+# Domain settings
+
+## Domain Admins
+Domain Admins have full authority over domain settings. They can modify member group names and rules, link or modify Company Cards, and add or remove domain members and other admins.
+
+### Adding a Domain Admin
+1. Head to **Settings > Domains > [Domain Name] > Domain Admins**
+2. In the "Email or Phone" field, type in the email address of the person you want to make a Domain Admin (this can be any email not specifically tied to the domain)
+3. Click "Add Admin"
+
+### Removing a Domain Admin:
+1. If you're already a Domain Admin, go to **Settings > Domains > [Domain Name] > Domain Admins**
+2. Locate the list of Domain Admins and find the one you want to remove
+3. Next to the Domain Admin's name, click the red trash can icon. This will remove that person from the Domain Admin role
+
+## Domain Members
+A domain member is a user associated with a specific domain (usually a company or another group) in Expensify and typically managed by a Domain Admin. This is also where you can enable Two-Factor authentication for your domain.
+
+### Adding users to the domain
+When a Domain Admin adds a user to the domain, that will create a new Expensify account for that user, and they'll receive invitations to set up their account. Users can also join a verified domain by creating their own account, as long as they have an email address associated with that domain (e.g. yourname@yourcompany.com). Once they have verified the account, all Domain Admins will be notified, and the employee will be added to the Default Group.
+**Important Note:** If someone who isn't a Domain Admin invites a user to a Workspace before they're invited to the domain, their account will be created, but in a closed state. A closed state means that the account cannot be used until it has been validated. Once the Domain Admin has invited the user, the user will receive a magic link to verify their account, sign in, and open the account completely.
+
+### How to add users
+1. In your web account, go to **Settings > Domains > [Domain Name] > Domain Admins**
+2. In the email field, enter the user you want to invite. This will create their Expensify account and send them an invitation
+
+### Removing users from the Domain
+Removing a user means taking them out of your domain and closing their Expensify account completely if they don't have another login. Be cautious because closing an account is permanent and deletes any unsubmitted or processing reports.
+
+### How to remove users
+In your web account, go to **Settings > Domains > [Domain Name] > Domain Admins**
+Check the box next to the employee's name you want to remove, then click “Close Accounts”.
+
+### Important notes about closing accounts through Domain settings:
+If a user has a Secondary Login linked to their Expensify account, they can still access their account after it's closed in the domain. This is helpful for accessing financial data, like tax-related receipts.
+Closing an account through the domain permanently removes any unsubmitted receipts/reports. Make sure to approve or reimburse all employee reports before closing an account.
+If an employee doesn't have a Secondary Login, they'll be automatically removed from the group Workspace. If they have a Secondary Login, it will continue to be associated with the group Workspace.
+
+## Domain Groups
+Domain Groups can be accessed if you have verified your domain. Groups are used to set rules or permissions for groups of users so you can enforce multiple different expense workspaces and rules. If you are a Domain Admin, you can create and edit Domain Groups under **Settings > Domains > _Domain Name_ > Groups**.
+
+### Creating Domain Groups
+1. In your Expensify account on the web, navigate to **Settings > Domains > _Domain Name_ > Groups**
+2. Select “Create Group” to create the group. This will allow you to name the Group, as well as configure permissions that will apply to members of the Group.
+
+### Adding members to a Domain Group
+1. In your Expensify account on the web, navigate to **Settings > Domains > [Domain Name] > Domain Members**
+2. Select the checkbox next to the domain members you wish to add to the Domain Group
+3. Select “Add to Group” to select the Group you wish to add them to
+
+### Editing Domain Groups
+1. In your Expensify account on the web, navigate to **Settings > Domains > _Domain Name_ > Groups**
+2. Next to the Group you wish to edit, select “Edit”
+3. This will open the Edit Permission Group pane, where you can edit the rules and permissions for that group
+4. Make your edits and click “Save”
+
+## Domain Group settings
+These are the settings that can be customized for each group you have created. Typically, companies use two groups (Employees and Managers) and enforce stricter rules for Employees. The settings are:
+- Strict Workspace Enforcement: When enabled, all Workspace rules must be followed for a report to be submitted. If a rule is violated, the report can't be submitted until the issue is fixed. Employees can't bypass this by dismissing notifications.
+- Login Restrictions: Enabling this prevents users from using non-company email addresses as their primary login. Secondary logins are still allowed.
+- Workspace Creation and Removal Restrictions: This feature stops users from creating new group workspaces or unsubscribing from existing workspaces. Admins who need these abilities should be in a separate group with this restriction turned off.
+- Preferred Workspace: When enabled, group members can only create reports under one designated Workspace. They can move a report to a different Workspace or their personal one later if needed. This helps keep personal and company expenses separate. If a company card uses a specific Workspace, this setting overrides it for more control over company card expenses.
+- Setting a Preferred Workspace: If Preferred Workspace is on, you can choose a default group Workspace for all Group Members.
+
+## SAML
+To enable SAML SSO in Expensify you will first need to claim and verify your domain. Once you have a verified domain, you can access SAML SSO by navigating to **Settings > Domains > _Domain Name_ > SAML**
+
+## Enable Two-Factor Authentication (2FA)
+1. As a Domain Admin, head to: **Settings > Domains > _Your Domain Name_ > Domain Members**
+2. Turn on Two Factor Authentication by toggling it to ENABLED
+3. Any Domain members that do not have two-factor authentication enabled will be asked to set it up on their Home page when they next log in, and won't be able to use Expensify until they do.
+4. To turn it off, simply toggle it off and refresh the page.
+
+**Tips:**
+- When using SAML, two-factor authentication cannot be required.
+- For disputing digital Expensify Card purchases, two-factor authentication must be enabled.
+- It might take up to 2 hours for domain-level enforcement to take effect, and users will be prompted to configure their individual 2FA settings on their next login to Expensify.
+
+# FAQ
+
+## How many domains can I have?
+You can manage multiple domains by adding them through **Settings > Domains > New Domain**. However, to verify additional domains, you must be a Workspace Admin on a Control Workspace. Keep in mind that the Collect plan allows verification for just one domain.
+
+## What’s the difference between claiming a domain and verifying a domain?
+Claiming a domain is limited to users with matching email domains, and allows Workspace Admins with a company email to manage bills, company cards, and reconciliation. Verifying a domain offers extra features and security.
diff --git a/docs/assets/images/Auto-Reconciliation_Image2.png b/docs/assets/images/Auto-Reconciliation_Image2.png
index 5c7ed2d6b7ea..4e53dc49f6f1 100644
Binary files a/docs/assets/images/Auto-Reconciliation_Image2.png and b/docs/assets/images/Auto-Reconciliation_Image2.png differ
diff --git a/docs/assets/images/Auto-Reconciliaton_Image1.png b/docs/assets/images/Auto-Reconciliaton_Image1.png
index 9fcb7e316aaf..a9a4a33954c8 100644
Binary files a/docs/assets/images/Auto-Reconciliaton_Image1.png and b/docs/assets/images/Auto-Reconciliaton_Image1.png differ
diff --git a/docs/assets/images/ExpensifyHelp_ApprovingReports_01.png b/docs/assets/images/ExpensifyHelp_ApprovingReports_01.png
new file mode 100644
index 000000000000..587b7cb1d9d8
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_ApprovingReports_01.png differ
diff --git a/docs/assets/images/ExpensifyHelp_ApprovingReports_02.png b/docs/assets/images/ExpensifyHelp_ApprovingReports_02.png
new file mode 100644
index 000000000000..1376c8ccf71c
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_ApprovingReports_02.png differ
diff --git a/docs/assets/images/ExpensifyHelp_ApprovingReports_03.png b/docs/assets/images/ExpensifyHelp_ApprovingReports_03.png
new file mode 100644
index 000000000000..3bf84342edf6
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_ApprovingReports_03.png differ
diff --git a/docs/assets/images/ExpensifyHelp_ApprovingReports_04.png b/docs/assets/images/ExpensifyHelp_ApprovingReports_04.png
new file mode 100644
index 000000000000..8913771747aa
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_ApprovingReports_04.png differ
diff --git a/docs/assets/images/ExpensifyHelp_ApprovingReports_05.png b/docs/assets/images/ExpensifyHelp_ApprovingReports_05.png
new file mode 100644
index 000000000000..f1f43ae16f03
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_ApprovingReports_05.png differ
diff --git a/docs/assets/images/ExpensifyHelp_ApprovingReports_06.png b/docs/assets/images/ExpensifyHelp_ApprovingReports_06.png
new file mode 100644
index 000000000000..51854b6e2690
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_ApprovingReports_06.png differ
diff --git a/docs/assets/images/ExpensifyHelp_ApprovingReports_07.png b/docs/assets/images/ExpensifyHelp_ApprovingReports_07.png
new file mode 100644
index 000000000000..b750ffdc486f
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_ApprovingReports_07.png differ
diff --git a/docs/assets/images/ExpensifyHelp_CardSettings.png b/docs/assets/images/ExpensifyHelp_CardSettings.png
index c10a3d1cbc39..8339bc41ab7f 100644
Binary files a/docs/assets/images/ExpensifyHelp_CardSettings.png and b/docs/assets/images/ExpensifyHelp_CardSettings.png differ
diff --git a/docs/assets/images/ExpensifyHelp_ExpenseRules_01.png b/docs/assets/images/ExpensifyHelp_ExpenseRules_01.png
index 7a6c3c1b3a13..ad71c304a06f 100644
Binary files a/docs/assets/images/ExpensifyHelp_ExpenseRules_01.png and b/docs/assets/images/ExpensifyHelp_ExpenseRules_01.png differ
diff --git a/docs/assets/images/ExpensifyHelp_ExpenseRules_02.png b/docs/assets/images/ExpensifyHelp_ExpenseRules_02.png
index 28c6a7689b77..58d448f4c1f4 100644
Binary files a/docs/assets/images/ExpensifyHelp_ExpenseRules_02.png and b/docs/assets/images/ExpensifyHelp_ExpenseRules_02.png differ
diff --git a/docs/assets/images/ExpensifyHelp_Lyft_01.png b/docs/assets/images/ExpensifyHelp_Lyft_01.png
index 35959779ec09..15c21c750d1d 100644
Binary files a/docs/assets/images/ExpensifyHelp_Lyft_01.png and b/docs/assets/images/ExpensifyHelp_Lyft_01.png differ
diff --git a/docs/assets/images/ExpensifyHelp_SettlementExpanded.png b/docs/assets/images/ExpensifyHelp_SettlementExpanded.png
index 8672c8639202..8b0693c59a40 100644
Binary files a/docs/assets/images/ExpensifyHelp_SettlementExpanded.png and b/docs/assets/images/ExpensifyHelp_SettlementExpanded.png differ
diff --git a/docs/assets/images/ExpensifyHelp_SettlementExport.png b/docs/assets/images/ExpensifyHelp_SettlementExport.png
index b8c9a36220d4..de2a52495576 100644
Binary files a/docs/assets/images/ExpensifyHelp_SettlementExport.png and b/docs/assets/images/ExpensifyHelp_SettlementExport.png differ
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_1.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_1.png
index d4e73beb16b3..988aa216b59c 100644
Binary files a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_1.png and b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_1.png differ
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_2.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_2.png
index 45956a586d98..3b441e9cdf1a 100644
Binary files a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_2.png and b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_2.png differ
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_3.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_3.png
index 32aae12d3687..d1ff39eb22f6 100644
Binary files a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_3.png and b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_3.png differ
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_4.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_4.png
index ccd9335025bf..316d3f5aca6f 100644
Binary files a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_4.png and b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_4.png differ
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_5.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_5.png
index 5363935f0ab5..a19880d950fd 100644
Binary files a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_5.png and b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_5.png differ
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_6.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_6.png
index 739446de8383..af7f3421336e 100644
Binary files a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_6.png and b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_6.png differ
diff --git a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_7.png b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_7.png
index 21a1d3416858..260558881327 100644
Binary files a/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_7.png and b/docs/assets/images/ManagingEmployeesAndReports_ApprovalWorkflows_7.png differ
diff --git a/docs/assets/images/accounting.svg b/docs/assets/images/accounting.svg
index 4398e9573747..bacc7ae21e68 100644
--- a/docs/assets/images/accounting.svg
+++ b/docs/assets/images/accounting.svg
@@ -1,68 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/add-australian-deposit-only-account-modal.png b/docs/assets/images/add-australian-deposit-only-account-modal.png
index 1196a57c8f8f..86fd488fa947 100644
Binary files a/docs/assets/images/add-australian-deposit-only-account-modal.png and b/docs/assets/images/add-australian-deposit-only-account-modal.png differ
diff --git a/docs/assets/images/add-australian-deposit-only-account.png b/docs/assets/images/add-australian-deposit-only-account.png
index 4cea4fb11757..d9593f9958af 100644
Binary files a/docs/assets/images/add-australian-deposit-only-account.png and b/docs/assets/images/add-australian-deposit-only-account.png differ
diff --git a/docs/assets/images/add-vba-australian-account-modal.png b/docs/assets/images/add-vba-australian-account-modal.png
index ee624eca3814..fd02919f1586 100644
Binary files a/docs/assets/images/add-vba-australian-account-modal.png and b/docs/assets/images/add-vba-australian-account-modal.png differ
diff --git a/docs/assets/images/add-vba-australian-account.png b/docs/assets/images/add-vba-australian-account.png
index f064225e176a..dbe06801de62 100644
Binary files a/docs/assets/images/add-vba-australian-account.png and b/docs/assets/images/add-vba-australian-account.png differ
diff --git a/docs/assets/images/arrow-right.svg b/docs/assets/images/arrow-right.svg
index 01e94332393c..2565efbf30a5 100644
--- a/docs/assets/images/arrow-right.svg
+++ b/docs/assets/images/arrow-right.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/arrow-up.svg b/docs/assets/images/arrow-up.svg
index 9f609925d910..844ef49314e4 100644
--- a/docs/assets/images/arrow-up.svg
+++ b/docs/assets/images/arrow-up.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/back-left.svg b/docs/assets/images/back-left.svg
index 071cd22b1644..e6ea47be3da5 100644
--- a/docs/assets/images/back-left.svg
+++ b/docs/assets/images/back-left.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/bank-card.svg b/docs/assets/images/bank-card.svg
index 48da9af0d986..051d028d4af2 100644
--- a/docs/assets/images/bank-card.svg
+++ b/docs/assets/images/bank-card.svg
@@ -1,41 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/cancel-reimbursement.png b/docs/assets/images/cancel-reimbursement.png
index 87317d2f60ba..9257cd759214 100644
Binary files a/docs/assets/images/cancel-reimbursement.png and b/docs/assets/images/cancel-reimbursement.png differ
diff --git a/docs/assets/images/circle-hourglass.svg b/docs/assets/images/circle-hourglass.svg
index 5c307db6bb04..68359ab49315 100644
--- a/docs/assets/images/circle-hourglass.svg
+++ b/docs/assets/images/circle-hourglass.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/close.svg b/docs/assets/images/close.svg
index 71e4df7ace0c..9b050b1e91c6 100644
--- a/docs/assets/images/close.svg
+++ b/docs/assets/images/close.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/concierge-avatar.svg b/docs/assets/images/concierge-avatar.svg
index d2a7cf31ac98..eb374a9a5a68 100644
--- a/docs/assets/images/concierge-avatar.svg
+++ b/docs/assets/images/concierge-avatar.svg
@@ -1,39 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/delete-australian-bank-account.png b/docs/assets/images/delete-australian-bank-account.png
index 2148973e5a6c..6d2be119f736 100644
Binary files a/docs/assets/images/delete-australian-bank-account.png and b/docs/assets/images/delete-australian-bank-account.png differ
diff --git a/docs/assets/images/down.svg b/docs/assets/images/down.svg
index d0925eeb1336..c47a53f35ea6 100644
--- a/docs/assets/images/down.svg
+++ b/docs/assets/images/down.svg
@@ -1,10 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/envelope-receipt.svg b/docs/assets/images/envelope-receipt.svg
index 40f57cc4ebda..650f4dca9145 100644
--- a/docs/assets/images/envelope-receipt.svg
+++ b/docs/assets/images/envelope-receipt.svg
@@ -1,35 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/expensify-footer-logo--vertical.svg b/docs/assets/images/expensify-footer-logo--vertical.svg
index 58dc05ad2944..9cd5e26cc8f2 100644
--- a/docs/assets/images/expensify-footer-logo--vertical.svg
+++ b/docs/assets/images/expensify-footer-logo--vertical.svg
@@ -1,30 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/expensify-footer-logo.svg b/docs/assets/images/expensify-footer-logo.svg
index e664651b84fd..9e3f837f7365 100644
--- a/docs/assets/images/expensify-footer-logo.svg
+++ b/docs/assets/images/expensify-footer-logo.svg
@@ -1,30 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/expensify-help.svg b/docs/assets/images/expensify-help.svg
index 7aa084e0fc0c..0655b947a27f 100644
--- a/docs/assets/images/expensify-help.svg
+++ b/docs/assets/images/expensify-help.svg
@@ -1,51 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/expensify-logo-round.png b/docs/assets/images/expensify-logo-round.png
index 59d29ed09530..18fa9ba49969 100644
Binary files a/docs/assets/images/expensify-logo-round.png and b/docs/assets/images/expensify-logo-round.png differ
diff --git a/docs/assets/images/gears.svg b/docs/assets/images/gears.svg
index 23621afc8008..a598dbee28d5 100644
--- a/docs/assets/images/gears.svg
+++ b/docs/assets/images/gears.svg
@@ -1,101 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/hand-card.svg b/docs/assets/images/hand-card.svg
index 779e6ff4184c..4c5b7cfcc666 100644
--- a/docs/assets/images/hand-card.svg
+++ b/docs/assets/images/hand-card.svg
@@ -1,19 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/handshake.svg b/docs/assets/images/handshake.svg
index 04872bd3a88b..1a2f9badc781 100644
--- a/docs/assets/images/handshake.svg
+++ b/docs/assets/images/handshake.svg
@@ -1,36 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/insights-chart.png b/docs/assets/images/insights-chart.png
index 4b21b8d70a09..54000c0ee307 100644
Binary files a/docs/assets/images/insights-chart.png and b/docs/assets/images/insights-chart.png differ
diff --git a/docs/assets/images/lightbulb.svg b/docs/assets/images/lightbulb.svg
index 45a889fb9e0c..b15ec9ced77d 100644
--- a/docs/assets/images/lightbulb.svg
+++ b/docs/assets/images/lightbulb.svg
@@ -1,71 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/menu.svg b/docs/assets/images/menu.svg
index 4fc34e918899..6bc8bc8fa8f7 100644
--- a/docs/assets/images/menu.svg
+++ b/docs/assets/images/menu.svg
@@ -1,11 +1 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/docs/assets/images/moderation-context-menu.png b/docs/assets/images/moderation-context-menu.png
index 55aa17498cf7..e76a09ce8153 100644
Binary files a/docs/assets/images/moderation-context-menu.png and b/docs/assets/images/moderation-context-menu.png differ
diff --git a/docs/assets/images/moderation-flag-page.png b/docs/assets/images/moderation-flag-page.png
index e60e2ccb8776..e28ff940322d 100644
Binary files a/docs/assets/images/moderation-flag-page.png and b/docs/assets/images/moderation-flag-page.png differ
diff --git a/docs/assets/images/moderation-reportee-whisper.png b/docs/assets/images/moderation-reportee-whisper.png
index 9235a262bef5..1b8fa77b20b7 100644
Binary files a/docs/assets/images/moderation-reportee-whisper.png and b/docs/assets/images/moderation-reportee-whisper.png differ
diff --git a/docs/assets/images/moderation-reporter-whisper.png b/docs/assets/images/moderation-reporter-whisper.png
index 881b25268515..68397f838060 100644
Binary files a/docs/assets/images/moderation-reporter-whisper.png and b/docs/assets/images/moderation-reporter-whisper.png differ
diff --git a/docs/assets/images/money-case.svg b/docs/assets/images/money-case.svg
index c1bb49b3ab5a..e40430c9e27b 100644
--- a/docs/assets/images/money-case.svg
+++ b/docs/assets/images/money-case.svg
@@ -1,135 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/money-circle.svg b/docs/assets/images/money-circle.svg
index 645e1a58701a..f17183ff63b6 100644
--- a/docs/assets/images/money-circle.svg
+++ b/docs/assets/images/money-circle.svg
@@ -1,12 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/money-into-wallet.svg b/docs/assets/images/money-into-wallet.svg
index d6d5b0e7d6e7..06592778bd51 100644
--- a/docs/assets/images/money-into-wallet.svg
+++ b/docs/assets/images/money-into-wallet.svg
@@ -1,32 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/money-receipt.svg b/docs/assets/images/money-receipt.svg
index 379d56727e42..406aaf3c1db7 100644
--- a/docs/assets/images/money-receipt.svg
+++ b/docs/assets/images/money-receipt.svg
@@ -1,34 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/money-wings.svg b/docs/assets/images/money-wings.svg
index c2155080f721..87ffdf28ec4b 100644
--- a/docs/assets/images/money-wings.svg
+++ b/docs/assets/images/money-wings.svg
@@ -1,26 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/monitor.svg b/docs/assets/images/monitor.svg
index 6e2580b4c9e8..c577e6b0db0a 100644
--- a/docs/assets/images/monitor.svg
+++ b/docs/assets/images/monitor.svg
@@ -1,12 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/og-preview-image.png b/docs/assets/images/og-preview-image.png
index db4bfac8a5cb..4914e7283779 100644
Binary files a/docs/assets/images/og-preview-image.png and b/docs/assets/images/og-preview-image.png differ
diff --git a/docs/assets/images/paper-airplane.svg b/docs/assets/images/paper-airplane.svg
index 8daa13bfa38b..152a5d10f21c 100644
--- a/docs/assets/images/paper-airplane.svg
+++ b/docs/assets/images/paper-airplane.svg
@@ -1,113 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/playbook-existing-corporate-card.png b/docs/assets/images/playbook-existing-corporate-card.png
index 5baad14abf7c..9cfbc02e0ab2 100644
Binary files a/docs/assets/images/playbook-existing-corporate-card.png and b/docs/assets/images/playbook-existing-corporate-card.png differ
diff --git a/docs/assets/images/playbook-expense-basics.png b/docs/assets/images/playbook-expense-basics.png
index b0bbd2095415..99c462070405 100644
Binary files a/docs/assets/images/playbook-expense-basics.png and b/docs/assets/images/playbook-expense-basics.png differ
diff --git a/docs/assets/images/playbook-impoort-employees.png b/docs/assets/images/playbook-impoort-employees.png
index 4f4f6f4e50ae..1cb8a11b95fc 100644
Binary files a/docs/assets/images/playbook-impoort-employees.png and b/docs/assets/images/playbook-impoort-employees.png differ
diff --git a/docs/assets/images/playbook-new-bill.png b/docs/assets/images/playbook-new-bill.png
index 8e8a01fe156b..b27d269e862d 100644
Binary files a/docs/assets/images/playbook-new-bill.png and b/docs/assets/images/playbook-new-bill.png differ
diff --git a/docs/assets/images/playbook-scheduled-submit.png b/docs/assets/images/playbook-scheduled-submit.png
index c8c6eb91774c..32919ae0eb06 100644
Binary files a/docs/assets/images/playbook-scheduled-submit.png and b/docs/assets/images/playbook-scheduled-submit.png differ
diff --git a/docs/assets/images/playbook.svg b/docs/assets/images/playbook.svg
index 0088d8f915f1..e0e2a883e636 100644
--- a/docs/assets/images/playbook.svg
+++ b/docs/assets/images/playbook.svg
@@ -1,88 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/reimbursing-default.png b/docs/assets/images/reimbursing-default.png
index 6823fecaba35..58970385f5dd 100644
Binary files a/docs/assets/images/reimbursing-default.png and b/docs/assets/images/reimbursing-default.png differ
diff --git a/docs/assets/images/reimbursing-manual-warning.png b/docs/assets/images/reimbursing-manual-warning.png
index 34ef6bbc8d3c..1f4c6491c5db 100644
Binary files a/docs/assets/images/reimbursing-manual-warning.png and b/docs/assets/images/reimbursing-manual-warning.png differ
diff --git a/docs/assets/images/reimbursing-manual.png b/docs/assets/images/reimbursing-manual.png
index 8d27f71036ca..a4b66546922e 100644
Binary files a/docs/assets/images/reimbursing-manual.png and b/docs/assets/images/reimbursing-manual.png differ
diff --git a/docs/assets/images/reimbursing-reports-dropdown.png b/docs/assets/images/reimbursing-reports-dropdown.png
index 5a3da794c5e9..d56ad6cbf250 100644
Binary files a/docs/assets/images/reimbursing-reports-dropdown.png and b/docs/assets/images/reimbursing-reports-dropdown.png differ
diff --git a/docs/assets/images/search.svg b/docs/assets/images/search.svg
index 9680cc415454..5bd5fc24d858 100644
--- a/docs/assets/images/search.svg
+++ b/docs/assets/images/search.svg
@@ -1,3 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/docs/assets/images/send.svg b/docs/assets/images/send.svg
index f442d9148327..2ac109683395 100644
--- a/docs/assets/images/send.svg
+++ b/docs/assets/images/send.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/settings-new-dot.svg b/docs/assets/images/settings-new-dot.svg
index 13338fc72362..558e7413c295 100644
--- a/docs/assets/images/settings-new-dot.svg
+++ b/docs/assets/images/settings-new-dot.svg
@@ -1,88 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/settings-old-dot.svg b/docs/assets/images/settings-old-dot.svg
index 89302b65c70d..ca5bc04bd0ff 100644
--- a/docs/assets/images/settings-old-dot.svg
+++ b/docs/assets/images/settings-old-dot.svg
@@ -1,187 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/shield.svg b/docs/assets/images/shield.svg
index 252da0321692..3202a532884c 100644
--- a/docs/assets/images/shield.svg
+++ b/docs/assets/images/shield.svg
@@ -1,16 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/social-facebook.svg b/docs/assets/images/social-facebook.svg
index e10f0b21b4dc..0cf2317839f0 100644
--- a/docs/assets/images/social-facebook.svg
+++ b/docs/assets/images/social-facebook.svg
@@ -1,7 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/social-instagram.svg b/docs/assets/images/social-instagram.svg
index 848a8563403e..d78d50d65aa3 100644
--- a/docs/assets/images/social-instagram.svg
+++ b/docs/assets/images/social-instagram.svg
@@ -1,17 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/social-linkedin.svg b/docs/assets/images/social-linkedin.svg
index d1715494c23a..ef7ed938540f 100644
--- a/docs/assets/images/social-linkedin.svg
+++ b/docs/assets/images/social-linkedin.svg
@@ -1,8 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/social-podcast.svg b/docs/assets/images/social-podcast.svg
index b3db63124d2a..69c5340a389e 100644
--- a/docs/assets/images/social-podcast.svg
+++ b/docs/assets/images/social-podcast.svg
@@ -1,15 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/social-twitter.svg b/docs/assets/images/social-twitter.svg
index 40465f27185c..cadb5fd7474a 100644
--- a/docs/assets/images/social-twitter.svg
+++ b/docs/assets/images/social-twitter.svg
@@ -1,9 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/social-youtube.svg b/docs/assets/images/social-youtube.svg
index 60cfcd9e4147..cec64f2a7766 100644
--- a/docs/assets/images/social-youtube.svg
+++ b/docs/assets/images/social-youtube.svg
@@ -1,11 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/docs/assets/images/users.svg b/docs/assets/images/users.svg
index 15f3c0e01de5..ad34f781df52 100644
--- a/docs/assets/images/users.svg
+++ b/docs/assets/images/users.svg
@@ -1,14 +1 @@
-
+
\ No newline at end of file
diff --git a/docs/assets/images/workflow.svg b/docs/assets/images/workflow.svg
index e5eac423cd1d..435e3556a5bf 100644
--- a/docs/assets/images/workflow.svg
+++ b/docs/assets/images/workflow.svg
@@ -1,117 +1 @@
-
+
\ No newline at end of file
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/Store.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/Store.png
index 35d8a1c3cef2..c848522b0b80 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/Store.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/Store.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iOS@2x.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iOS@2x.png
index 2f88e782bfd9..c42e7ac3f925 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iOS@2x.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iOS@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iOS@3x.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iOS@3x.png
index cae156c0409f..a1e71e266bee 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iOS@3x.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iOS@3x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iPad.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iPad.png
index c4f9c3c467d0..ab723d4719b3 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iPad.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iPad.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iPad@2x.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iPad@2x.png
index f36fe1698c60..a87298744bda 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iPad@2x.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iPad@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iPadPro.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iPadPro.png
index 389e9bf64676..aa2cbc1473ee 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iPadPro.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/iPadPro.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/notification@2x 1.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/notification@2x 1.png
index 48f5d96656bf..cae0b7d91800 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/notification@2x 1.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/notification@2x 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/notification@2x.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/notification@2x.png
index 48f5d96656bf..f5d6ad425da1 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/notification@2x.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/notification@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/notification@3x.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/notification@3x.png
index f5ccc2a65c77..e09d8a3d7db6 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/notification@3x.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/notification@3x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings.png
index 6899938f4b2b..114a9a961e36 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings@2x 1.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings@2x 1.png
index c401dfbb94d6..f20a51d77e05 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings@2x 1.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings@2x 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings@2x.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings@2x.png
index c401dfbb94d6..fc73dfab1e1f 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings@2x.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings@3x.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings@3x.png
index f43a34acb801..fa9b49aa9b77 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings@3x.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/settings@3x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight.png
index 20f25cfb4a76..21021c78a083 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight@2x 1.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight@2x 1.png
index fb8e5ca9d8cc..c692788c1884 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight@2x 1.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight@2x 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight@2x.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight@2x.png
index fb8e5ca9d8cc..c692788c1884 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight@2x.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight@3x.png b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight@3x.png
index b9ac89a69f28..2ac3b654fe66 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight@3x.png and b/ios/NewExpensify/Images.xcassets/AppIcon.appiconset/spotlight@3x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_Store.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_Store.png
index 2647154f2d96..c5426cffe80f 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_Store.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_Store.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPadApp.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPadApp.png
index 2ac48e7baaeb..1486278b3a88 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPadApp.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPadApp.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPadApp@2x.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPadApp@2x.png
index 8fe39eeb5d9e..b3e0c7a19150 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPadApp@2x.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPadApp@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPadPro@2x.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPadPro@2x.png
index b6e348e6ca32..621562e831f2 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPadPro@2x.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPadPro@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@2x 1.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@2x 1.png
index ae9b47105114..3975d1932fcb 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@2x 1.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@2x 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@2x.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@2x.png
index ae9b47105114..3975d1932fcb 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@2x.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@3x 1.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@3x 1.png
index e47a76cd08a7..a68d092e932b 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@3x 1.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@3x 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@3x.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@3x.png
index e47a76cd08a7..a68d092e932b 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@3x.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_iPhoneApp@3x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_notification@2x 1.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_notification@2x 1.png
index 523e6cfff8ae..03666c6795c6 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_notification@2x 1.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_notification@2x 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_notification@2x.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_notification@2x.png
index 523e6cfff8ae..03666c6795c6 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_notification@2x.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_notification@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_notification@3x.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_notification@3x.png
index 8f4f398039c2..8a9f7e8f33d0 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_notification@3x.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_notification@3x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings 1.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings 1.png
index 9f18efd8459e..8acce9b73e11 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings 1.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings.png
index 9f18efd8459e..4cbeca376a16 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings@2x 1.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings@2x 1.png
index edad826a6f40..593f6c0b80e6 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings@2x 1.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings@2x 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings@2x.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings@2x.png
index edad826a6f40..8b8e901b76ea 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings@2x.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings@3x.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings@3x.png
index 69007e1228d7..f0fcce2013f0 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings@3x.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_settings@3x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight.png
index 70d926b9a29a..cfb6931918fb 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight@2x 1.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight@2x 1.png
index d7d5d2d5a6c5..8aeedc372d8a 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight@2x 1.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight@2x 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight@2x.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight@2x.png
index d7d5d2d5a6c5..8aeedc372d8a 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight@2x.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight@3x.png b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight@3x.png
index 9ab486c7d734..de088f2cbb4a 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight@3x.png and b/ios/NewExpensify/Images.xcassets/AppIconAdHoc.appiconset/ADHOC_spotlight@3x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_Store.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_Store.png
index 059d94609dca..8c874e35d5c6 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_Store.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_Store.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPad.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPad.png
index 6eca3a8f40ac..6faf177e719c 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPad.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPad.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPad@2x.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPad@2x.png
index dc3830a7bcf6..cf1e53c5bbd7 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPad@2x.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPad@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPadPro@2x.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPadPro@2x.png
index d97d63d7b46f..d346990c457b 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPadPro@2x.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPadPro@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@2x 1.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@2x 1.png
index dd38161a9b07..384591a8b1cb 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@2x 1.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@2x 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@2x.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@2x.png
index dd38161a9b07..384591a8b1cb 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@2x.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@3x 1.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@3x 1.png
index 97ec15762932..4babfe38e762 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@3x 1.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@3x 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@3x.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@3x.png
index 97ec15762932..4babfe38e762 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@3x.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_iPhoneApp@3x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_notification@2x 1.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_notification@2x 1.png
index 376f4d892acf..28319e37fc83 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_notification@2x 1.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_notification@2x 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_notification@2x.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_notification@2x.png
index 376f4d892acf..a168b886a55a 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_notification@2x.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_notification@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_notification@3x.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_notification@3x.png
index d432d60317da..9557f767292b 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_notification@3x.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_notification@3x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings 1.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings 1.png
index dd3aeae3ec96..f656aa833eb9 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings 1.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings.png
index dd3aeae3ec96..d1a3e4aab777 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings@2x 1.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings@2x 1.png
index f0e93e004e40..435c13e5a593 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings@2x 1.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings@2x 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings@2x.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings@2x.png
index f0e93e004e40..ec35ac2b1519 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings@2x.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings@3x.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings@3x.png
index 706525192794..95a262ee83dd 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings@3x.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_settings@3x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight.png
index bdda62ab3996..3c4d7c922246 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight@2x 1.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight@2x 1.png
index 03c0e26ce666..ca98e2363033 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight@2x 1.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight@2x 1.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight@2x.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight@2x.png
index 03c0e26ce666..ca98e2363033 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight@2x.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight@2x.png differ
diff --git a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight@3x.png b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight@3x.png
index 1e20ff590d2d..85a707216902 100644
Binary files a/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight@3x.png and b/ios/NewExpensify/Images.xcassets/AppIconDev.appiconset/DEV_spotlight@3x.png differ
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 95a9a26df7f6..759364765b4c 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
CFBundlePackageTypeAPPLCFBundleShortVersionString
- 1.3.87
+ 1.3.92CFBundleSignature????CFBundleURLTypes
@@ -40,7 +40,7 @@
CFBundleVersion
- 1.3.87.8
+ 1.3.92.0ITSAppUsesNonExemptEncryptionLSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index d41b75440036..6dd2088565cb 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
CFBundlePackageTypeBNDLCFBundleShortVersionString
- 1.3.87
+ 1.3.92CFBundleSignature????CFBundleVersion
- 1.3.87.8
+ 1.3.92.0
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index cb120bca2b88..97143f53b867 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -753,6 +753,8 @@ PODS:
- Firebase/Performance (= 8.8.0)
- React-Core
- RNFBApp
+ - RNFlashList (1.6.1):
+ - React-Core
- RNFS (2.20.0):
- React-Core
- RNGestureHandler (2.12.0):
@@ -925,6 +927,7 @@ DEPENDENCIES:
- "RNFBApp (from `../node_modules/@react-native-firebase/app`)"
- "RNFBCrashlytics (from `../node_modules/@react-native-firebase/crashlytics`)"
- "RNFBPerf (from `../node_modules/@react-native-firebase/perf`)"
+ - "RNFlashList (from `../node_modules/@shopify/flash-list`)"
- RNFS (from `../node_modules/react-native-fs`)
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
- "RNGoogleSignin (from `../node_modules/@react-native-google-signin/google-signin`)"
@@ -1134,6 +1137,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/@react-native-firebase/crashlytics"
RNFBPerf:
:path: "../node_modules/@react-native-firebase/perf"
+ RNFlashList:
+ :path: "../node_modules/@shopify/flash-list"
RNFS:
:path: "../node_modules/react-native-fs"
RNGestureHandler:
@@ -1273,6 +1278,7 @@ SPEC CHECKSUMS:
RNFBApp: 729c0666395b1953198dc4a1ec6deb8fbe1c302e
RNFBCrashlytics: 2061ca863e8e2fa1aae9b12477d7dfa8e88ca0f9
RNFBPerf: 389914cda4000fe0d996a752532a591132cbf3f9
+ RNFlashList: 236646d48f224a034f35baa0242e1b77db063b1e
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: dec4645026e7401a0899f2846d864403478ff6a5
RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
diff --git a/ios/expensify_chat_adhoc.mobileprovision.gpg b/ios/expensify_chat_adhoc.mobileprovision.gpg
index 994136a07b6c..1dae451f168c 100644
Binary files a/ios/expensify_chat_adhoc.mobileprovision.gpg and b/ios/expensify_chat_adhoc.mobileprovision.gpg differ
diff --git a/jest/setup.js b/jest/setup.js
index 4def7d1efad5..a54a90678491 100644
--- a/jest/setup.js
+++ b/jest/setup.js
@@ -1,5 +1,6 @@
import 'setimmediate';
import 'react-native-gesture-handler/jestSetup';
+import '@shopify/flash-list/jestSetup';
import * as reanimatedJestUtils from 'react-native-reanimated/src/reanimated2/jestUtils';
import mockClipboard from '@react-native-clipboard/clipboard/jest/clipboard-mock';
import setupMockImages from './setupMockImages';
diff --git a/metro.config.js b/metro.config.js
index bf2ff904df70..62ca2a25c6b2 100644
--- a/metro.config.js
+++ b/metro.config.js
@@ -7,9 +7,10 @@ require('dotenv').config();
const defaultConfig = getDefaultConfig(__dirname);
const isUsingMockAPI = process.env.E2E_TESTING === 'true';
+
if (isUsingMockAPI) {
// eslint-disable-next-line no-console
- console.warn('⚠️ Using mock API');
+ console.log('⚠️⚠️⚠️⚠️ Using mock API ⚠️⚠️⚠️⚠️');
}
/**
@@ -25,10 +26,14 @@ const config = {
resolveRequest: (context, moduleName, platform) => {
const resolution = context.resolveRequest(context, moduleName, platform);
if (isUsingMockAPI && moduleName.includes('/API')) {
+ const originalPath = resolution.filePath;
+ const mockPath = originalPath.replace('src/libs/API.ts', 'src/libs/E2E/API.mock.js').replace('/src/libs/API.js/', 'src/libs/E2E/API.mock.js');
+ // eslint-disable-next-line no-console
+ console.log('⚠️⚠️⚠️⚠️ Replacing resolution path', originalPath, ' => ', mockPath);
+
return {
...resolution,
- // TODO: Change API.mock.js extension once it is migrated to TypeScript
- filePath: resolution.filePath.replace(/src\/libs\/API.js/, 'src/libs/E2E/API.mock.js'),
+ filePath: mockPath,
};
}
return resolution;
diff --git a/package-lock.json b/package-lock.json
index 65c2be0529e3..f852bc4ddee4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.3.87-8",
+ "version": "1.3.92-0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.3.87-8",
+ "version": "1.3.92-0",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
@@ -40,6 +40,7 @@
"@react-navigation/stack": "6.3.16",
"@react-ng/bounds-observer": "^0.2.1",
"@rnmapbox/maps": "^10.0.11",
+ "@shopify/flash-list": "^1.6.1",
"@types/node": "^18.14.0",
"@ua/react-native-airship": "^15.2.6",
"awesome-phonenumber": "^5.4.0",
@@ -50,7 +51,7 @@
"date-fns-tz": "^2.0.0",
"dom-serializer": "^0.2.2",
"domhandler": "^4.3.0",
- "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#bdbdf44825658500ba581d3e86237d7b8996cc2e",
+ "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#2adc24c4e889b3a15f199a6b273e343c7d9cff78",
"fbjs": "^3.0.2",
"htmlparser2": "^7.2.0",
"idb-keyval": "^6.2.1",
@@ -193,7 +194,7 @@
"electron-builder": "24.6.4",
"eslint": "^7.6.0",
"eslint-config-airbnb-typescript": "^17.1.0",
- "eslint-config-expensify": "^2.0.39",
+ "eslint-config-expensify": "^2.0.42",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-jest": "^24.1.0",
"eslint-plugin-jsdoc": "^46.2.6",
@@ -9133,6 +9134,34 @@
"version": "1.14.1",
"license": "0BSD"
},
+ "node_modules/@shopify/flash-list": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/@shopify/flash-list/-/flash-list-1.6.1.tgz",
+ "integrity": "sha512-SlBlpP7+zol6D1SKaf402aS30Qgwdjwb8/Qn2CupYwXnTcu2l8TiXB766vcsIvKTqUO7ELfQnCwCq8NXx55FsQ==",
+ "dependencies": {
+ "recyclerlistview": "4.2.0",
+ "tslib": "2.4.0"
+ },
+ "peerDependencies": {
+ "@babel/runtime": "*",
+ "react": "*",
+ "react-native": "*"
+ }
+ },
+ "node_modules/@shopify/flash-list/node_modules/recyclerlistview": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/recyclerlistview/-/recyclerlistview-4.2.0.tgz",
+ "integrity": "sha512-uuBCi0c+ggqHKwrzPX4Z/mJOzsBbjZEAwGGmlwpD/sD7raXixdAbdJ6BTcAmuWG50Cg4ru9p12M94Njwhr/27A==",
+ "dependencies": {
+ "lodash.debounce": "4.0.8",
+ "prop-types": "15.8.1",
+ "ts-object-utils": "0.0.5"
+ },
+ "peerDependencies": {
+ "react": ">= 15.2.1",
+ "react-native": ">= 0.30.0"
+ }
+ },
"node_modules/@sideway/address": {
"version": "4.1.4",
"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
@@ -21052,8 +21081,9 @@
}
},
"node_modules/@xmldom/xmldom": {
- "version": "0.7.5",
- "license": "MIT",
+ "version": "0.7.13",
+ "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.13.tgz",
+ "integrity": "sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g==",
"engines": {
"node": ">=10.0.0"
}
@@ -28375,9 +28405,9 @@
}
},
"node_modules/eslint-config-expensify": {
- "version": "2.0.39",
- "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.39.tgz",
- "integrity": "sha512-DIxR3k99ZIDPE2NK+WLLRWpoDq06gTXdY8XZg9Etd1UqZ7fXm/Yz3/QkTxu7CH7UaXbCH3P4PTo023ULQGKOSw==",
+ "version": "2.0.42",
+ "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.42.tgz",
+ "integrity": "sha512-TNwbfIGjOp4EjT6HKEpp10mr6dkBNCNMTeMmpuQyS0Nqv1tRGJltoU3GFmUHJywrLkEmu21iC0NNMmoJ1XzmLg==",
"dev": true,
"dependencies": {
"@lwc/eslint-plugin-lwc": "^0.11.0",
@@ -30189,8 +30219,8 @@
},
"node_modules/expensify-common": {
"version": "1.0.0",
- "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#bdbdf44825658500ba581d3e86237d7b8996cc2e",
- "integrity": "sha512-/kXD/18YQJY/iWB5MOSN0ixB1mpxUA+NXEYgKjac1tJd+DoY3K6+bDeu++Qfqg26LCNfvjTkjkDGZVdGsJQ7Hw==",
+ "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#2adc24c4e889b3a15f199a6b273e343c7d9cff78",
+ "integrity": "sha512-O7XTAfJoCHiFof+X5oFcCgAZAVVJbdIZ+ANA3WBlvabxcPqN0c+dGxIroV8HlRBbTNAkD3CoDVoF61YBUOxCUg==",
"license": "MIT",
"dependencies": {
"classnames": "2.3.1",
@@ -50106,6 +50136,11 @@
"node": ">=6.10"
}
},
+ "node_modules/ts-object-utils": {
+ "version": "0.0.5",
+ "resolved": "https://registry.npmjs.org/ts-object-utils/-/ts-object-utils-0.0.5.tgz",
+ "integrity": "sha512-iV0GvHqOmilbIKJsfyfJY9/dNHCs969z3so90dQWsO1eMMozvTpnB1MEaUbb3FYtZTGjv5sIy/xmslEz0Rg2TA=="
+ },
"node_modules/ts-pnp": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
@@ -59447,6 +59482,27 @@
}
}
},
+ "@shopify/flash-list": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/@shopify/flash-list/-/flash-list-1.6.1.tgz",
+ "integrity": "sha512-SlBlpP7+zol6D1SKaf402aS30Qgwdjwb8/Qn2CupYwXnTcu2l8TiXB766vcsIvKTqUO7ELfQnCwCq8NXx55FsQ==",
+ "requires": {
+ "recyclerlistview": "4.2.0",
+ "tslib": "2.4.0"
+ },
+ "dependencies": {
+ "recyclerlistview": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/recyclerlistview/-/recyclerlistview-4.2.0.tgz",
+ "integrity": "sha512-uuBCi0c+ggqHKwrzPX4Z/mJOzsBbjZEAwGGmlwpD/sD7raXixdAbdJ6BTcAmuWG50Cg4ru9p12M94Njwhr/27A==",
+ "requires": {
+ "lodash.debounce": "4.0.8",
+ "prop-types": "15.8.1",
+ "ts-object-utils": "0.0.5"
+ }
+ }
+ }
+ },
"@sideway/address": {
"version": "4.1.4",
"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
@@ -68117,7 +68173,9 @@
}
},
"@xmldom/xmldom": {
- "version": "0.7.5"
+ "version": "0.7.13",
+ "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.13.tgz",
+ "integrity": "sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g=="
},
"@xtuc/ieee754": {
"version": "1.2.0",
@@ -73609,9 +73667,9 @@
}
},
"eslint-config-expensify": {
- "version": "2.0.39",
- "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.39.tgz",
- "integrity": "sha512-DIxR3k99ZIDPE2NK+WLLRWpoDq06gTXdY8XZg9Etd1UqZ7fXm/Yz3/QkTxu7CH7UaXbCH3P4PTo023ULQGKOSw==",
+ "version": "2.0.42",
+ "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.42.tgz",
+ "integrity": "sha512-TNwbfIGjOp4EjT6HKEpp10mr6dkBNCNMTeMmpuQyS0Nqv1tRGJltoU3GFmUHJywrLkEmu21iC0NNMmoJ1XzmLg==",
"dev": true,
"requires": {
"@lwc/eslint-plugin-lwc": "^0.11.0",
@@ -74774,9 +74832,9 @@
}
},
"expensify-common": {
- "version": "git+ssh://git@github.com/Expensify/expensify-common.git#bdbdf44825658500ba581d3e86237d7b8996cc2e",
- "integrity": "sha512-/kXD/18YQJY/iWB5MOSN0ixB1mpxUA+NXEYgKjac1tJd+DoY3K6+bDeu++Qfqg26LCNfvjTkjkDGZVdGsJQ7Hw==",
- "from": "expensify-common@git+ssh://git@github.com/Expensify/expensify-common.git#bdbdf44825658500ba581d3e86237d7b8996cc2e",
+ "version": "git+ssh://git@github.com/Expensify/expensify-common.git#2adc24c4e889b3a15f199a6b273e343c7d9cff78",
+ "integrity": "sha512-O7XTAfJoCHiFof+X5oFcCgAZAVVJbdIZ+ANA3WBlvabxcPqN0c+dGxIroV8HlRBbTNAkD3CoDVoF61YBUOxCUg==",
+ "from": "expensify-common@git+ssh://git@github.com/Expensify/expensify-common.git#2adc24c4e889b3a15f199a6b273e343c7d9cff78",
"requires": {
"classnames": "2.3.1",
"clipboard": "2.0.4",
@@ -88988,6 +89046,11 @@
"integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==",
"dev": true
},
+ "ts-object-utils": {
+ "version": "0.0.5",
+ "resolved": "https://registry.npmjs.org/ts-object-utils/-/ts-object-utils-0.0.5.tgz",
+ "integrity": "sha512-iV0GvHqOmilbIKJsfyfJY9/dNHCs969z3so90dQWsO1eMMozvTpnB1MEaUbb3FYtZTGjv5sIy/xmslEz0Rg2TA=="
+ },
"ts-pnp": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
diff --git a/package.json b/package.json
index aca3dc508c41..a5d189bf943c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.3.87-8",
+ "version": "1.3.92-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.",
@@ -49,7 +49,9 @@
"analyze-packages": "ANALYZE_BUNDLE=true webpack --config config/webpack/webpack.common.js --env envFile=.env.production",
"symbolicate:android": "npx metro-symbolicate android/app/build/generated/sourcemaps/react/release/index.android.bundle.map",
"symbolicate:ios": "npx metro-symbolicate main.jsbundle.map",
- "test:e2e": "node tests/e2e/testRunner.js --development",
+ "test:e2e:main": "node tests/e2e/testRunner.js --development --branch main --skipCheckout",
+ "test:e2e:delta": "node tests/e2e/testRunner.js --development --branch main --label delta --skipCheckout",
+ "test:e2e:compare": "node tests/e2e/merge.js",
"gh-actions-unused-styles": "./.github/scripts/findUnusedKeys.sh",
"workflow-test": "./workflow_tests/scripts/runWorkflowTests.sh",
"workflow-test:generate": "node workflow_tests/utils/preGenerateTest.js"
@@ -85,6 +87,7 @@
"@react-navigation/stack": "6.3.16",
"@react-ng/bounds-observer": "^0.2.1",
"@rnmapbox/maps": "^10.0.11",
+ "@shopify/flash-list": "^1.6.1",
"@types/node": "^18.14.0",
"@ua/react-native-airship": "^15.2.6",
"awesome-phonenumber": "^5.4.0",
@@ -95,7 +98,7 @@
"date-fns-tz": "^2.0.0",
"dom-serializer": "^0.2.2",
"domhandler": "^4.3.0",
- "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#bdbdf44825658500ba581d3e86237d7b8996cc2e",
+ "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#2adc24c4e889b3a15f199a6b273e343c7d9cff78",
"fbjs": "^3.0.2",
"htmlparser2": "^7.2.0",
"idb-keyval": "^6.2.1",
@@ -238,7 +241,7 @@
"electron-builder": "24.6.4",
"eslint": "^7.6.0",
"eslint-config-airbnb-typescript": "^17.1.0",
- "eslint-config-expensify": "^2.0.39",
+ "eslint-config-expensify": "^2.0.42",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-jest": "^24.1.0",
"eslint-plugin-jsdoc": "^46.2.6",
diff --git a/scripts/shellCheck.sh b/scripts/shellCheck.sh
index 14424b4d9b30..d148958900d4 100755
--- a/scripts/shellCheck.sh
+++ b/scripts/shellCheck.sh
@@ -22,7 +22,13 @@ info
ASYNC_PROCESSES=()
for SHELL_SCRIPT in $SHELL_SCRIPTS; do
- npx shellcheck -e SC1091 "$SHELL_SCRIPT" &
+ if [[ "$CI" == 'true' ]]; then
+ # ShellCheck is installed by default on GitHub Actions ubuntu runners
+ shellcheck -e SC1091 "$SHELL_SCRIPT" &
+ else
+ # Otherwise shellcheck is used via npx
+ npx shellcheck -e SC1091 "$SHELL_SCRIPT" &
+ fi
ASYNC_PROCESSES+=($!)
done
diff --git a/src/CONST.ts b/src/CONST.ts
index 048c2dee5bab..6602df7fa5eb 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -124,7 +124,16 @@ const CONST = {
VIEW_HEIGHT: 275,
},
MONEY_REPORT: {
- MIN_HEIGHT: 280,
+ SMALL_SCREEN: {
+ IMAGE_HEIGHT: 300,
+ CONTAINER_MINHEIGHT: 280,
+ VIEW_HEIGHT: 220,
+ },
+ WIDE_SCREEN: {
+ IMAGE_HEIGHT: 450,
+ CONTAINER_MINHEIGHT: 280,
+ VIEW_HEIGHT: 275,
+ },
},
},
@@ -245,7 +254,6 @@ const CONST = {
TASKS: 'tasks',
THREADS: 'threads',
CUSTOM_STATUS: 'customStatus',
- NEW_DOT_CATEGORIES: 'newDotCategories',
NEW_DOT_TAGS: 'newDotTags',
NEW_DOT_SAML: 'newDotSAML',
},
@@ -1254,7 +1262,7 @@ const CONST = {
BANK: 'Expensify Card',
FRAUD_TYPES: {
DOMAIN: 'domain',
- INDIVIDUAL: 'individal',
+ INDIVIDUAL: 'individual',
NONE: 'none',
},
STATE: {
@@ -2770,6 +2778,8 @@ const CONST = {
SCROLLING: 'scrolling',
},
+ CHAT_HEADER_LOADER_HEIGHT: 36,
+
HORIZONTAL_SPACER: {
DEFAULT_BORDER_BOTTOM_WIDTH: 1,
DEFAULT_MARGIN_VERTICAL: 8,
@@ -2777,6 +2787,11 @@ const CONST = {
HIDDEN_BORDER_BOTTOM_WIDTH: 0,
},
+ LIST_COMPONENTS: {
+ HEADER: 'header',
+ FOOTER: 'footer',
+ },
+
GLOBAL_NAVIGATION_OPTION: {
HOME: 'home',
CHATS: 'chats',
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 68b3bd047ad8..cd8c3f325ab3 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -244,7 +244,7 @@ const ONYXKEYS = {
POLICY_RECENTLY_USED_TAGS: 'policyRecentlyUsedTags_',
WORKSPACE_INVITE_MEMBERS_DRAFT: 'workspaceInviteMembersDraft_',
REPORT: 'report_',
- // REPORT_METADATA is a perf optimization used to hold loading states (isLoadingReportActions, isLoadingMoreReportActions).
+ // REPORT_METADATA is a perf optimization used to hold loading states (isLoadingInitialReportActions, isLoadingOlderReportActions, isLoadingNewerReportActions).
// A lot of components are connected to the Report entity and do not care about the actions. Setting the loading state
// directly on the report caused a lot of unnecessary re-renders
REPORT_METADATA: 'reportMetadata_',
@@ -384,15 +384,15 @@ type OnyxValues = {
[ONYXKEYS.COLLECTION.DOWNLOAD]: OnyxTypes.Download;
[ONYXKEYS.COLLECTION.POLICY]: OnyxTypes.Policy;
[ONYXKEYS.COLLECTION.POLICY_CATEGORIES]: OnyxTypes.PolicyCategory;
- [ONYXKEYS.COLLECTION.POLICY_TAGS]: OnyxTypes.PolicyTag;
+ [ONYXKEYS.COLLECTION.POLICY_TAGS]: OnyxTypes.PolicyTags;
[ONYXKEYS.COLLECTION.POLICY_MEMBERS]: OnyxTypes.PolicyMember;
[ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
- [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyMember;
+ [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyMembers;
[ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: Record;
[ONYXKEYS.COLLECTION.REPORT]: OnyxTypes.Report;
[ONYXKEYS.COLLECTION.REPORT_METADATA]: OnyxTypes.ReportMetadata;
[ONYXKEYS.COLLECTION.REPORT_ACTIONS]: OnyxTypes.ReportActions;
- [ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS]: string;
+ [ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS]: OnyxTypes.ReportActionsDrafts;
[ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS]: OnyxTypes.ReportActionReactions;
[ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT]: string;
[ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT_NUMBER_OF_LINES]: number;
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index b5ceb8fc557d..bcc4685368cb 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -5,6 +5,17 @@ import CONST from './CONST';
* This is a file containing constants for all of the routes we want to be able to go to
*/
+/**
+ * This is a file containing constants for all of the routes we want to be able to go to
+ * Returns the URL with an encoded URI component for the backTo param which can be added to the end of URLs
+ * @param backTo
+ * @returns
+ */
+function getUrlWithBackToParam(url: string, backTo?: string): string {
+ const backToParam = backTo ? `${url.includes('?') ? '&' : '?'}backTo=${encodeURIComponent(backTo)}` : '';
+ return url + backToParam;
+}
+
export default {
HOME: '',
/** This is a utility route used to go to the user's concierge chat, or the sign-in page if the user's not authenticated */
@@ -20,10 +31,7 @@ export default {
},
PROFILE: {
route: 'a/:accountID',
- getRoute: (accountID: string | number, backTo = '') => {
- const backToParam = backTo ? `?backTo=${encodeURIComponent(backTo)}` : '';
- return `a/${accountID}${backToParam}`;
- },
+ getRoute: (accountID: string | number, backTo?: string) => getUrlWithBackToParam(`a/${accountID}`, backTo),
},
TRANSITION_BETWEEN_APPS: 'transition',
@@ -49,10 +57,7 @@ export default {
BANK_ACCOUNT_PERSONAL: 'bank-account/personal',
BANK_ACCOUNT_WITH_STEP_TO_OPEN: {
route: 'bank-account/:stepToOpen?',
- getRoute: (stepToOpen = '', policyID = '', backTo = ''): string => {
- const backToParam = backTo ? `&backTo=${encodeURIComponent(backTo)}` : '';
- return `bank-account/${stepToOpen}?policyID=${policyID}${backToParam}`;
- },
+ getRoute: (stepToOpen = '', policyID = '', backTo?: string): string => getUrlWithBackToParam(`bank-account/${stepToOpen}?policyID=${policyID}`, backTo),
},
SETTINGS: 'settings',
@@ -104,13 +109,7 @@ export default {
SETTINGS_PERSONAL_DETAILS_ADDRESS: 'settings/profile/personal-details/address',
SETTINGS_PERSONAL_DETAILS_ADDRESS_COUNTRY: {
route: 'settings/profile/personal-details/address/country',
- getRoute: (country: string, backTo?: string) => {
- let route = `settings/profile/personal-details/address/country?country=${country}`;
- if (backTo) {
- route += `&backTo=${encodeURIComponent(backTo)}`;
- }
- return route;
- },
+ getRoute: (country: string, backTo?: string) => getUrlWithBackToParam(`settings/profile/personal-details/address/country?country=${country}`, backTo),
},
SETTINGS_CONTACT_METHODS: 'settings/profile/contact-methods',
SETTINGS_CONTACT_METHOD_DETAILS: {
diff --git a/src/components/AddressSearch/index.js b/src/components/AddressSearch/index.js
index 3e676b811c16..28c61076332a 100644
--- a/src/components/AddressSearch/index.js
+++ b/src/components/AddressSearch/index.js
@@ -74,6 +74,9 @@ const propTypes = {
/** A description of the location (usually the address) */
description: PropTypes.string,
+ /** The name of the location */
+ name: PropTypes.string,
+
/** Data required by the google auto complete plugin to know where to put the markers on the map */
geometry: PropTypes.shape({
/** Data about the location */
@@ -167,9 +170,10 @@ function AddressSearch(props) {
// amount of data massaging needs to happen for what the parent expects to get from this function.
if (_.size(details)) {
props.onPress({
- address: lodashGet(details, 'description', ''),
+ address: lodashGet(details, 'description'),
lat: lodashGet(details, 'geometry.location.lat', 0),
lng: lodashGet(details, 'geometry.location.lng', 0),
+ name: lodashGet(details, 'name'),
});
}
return;
@@ -220,7 +224,7 @@ function AddressSearch(props) {
const values = {
street: `${streetNumber} ${streetName}`.trim(),
-
+ name: lodashGet(details, 'name', ''),
// Autocomplete returns any additional valid address fragments (e.g. Apt #) as subpremise.
street2: subpremise,
// Make sure country is updated first, since city and state will be reset if the country changes
@@ -382,6 +386,16 @@ function AddressSearch(props) {
/>
}
+ renderRow={(data) => {
+ const title = data.isPredefinedPlace ? data.name : data.structured_formatting.main_text;
+ const subtitle = data.isPredefinedPlace ? data.description : data.structured_formatting.secondary_text;
+ return (
+
+ {title && {title}}
+ {subtitle}
+
+ );
+ }}
renderHeaderComponent={renderHeaderComponent}
onPress={(data, details) => {
saveLocationDetails(data, details);
@@ -499,15 +513,14 @@ AddressSearch.propTypes = propTypes;
AddressSearch.defaultProps = defaultProps;
AddressSearch.displayName = 'AddressSearch';
-export default compose(
- withNetwork(),
- withLocalize,
-)(
- React.forwardRef((props, ref) => (
-
- )),
-);
+const AddressSearchWithRef = React.forwardRef((props, ref) => (
+
+));
+
+AddressSearchWithRef.displayName = 'AddressSearchWithRef';
+
+export default compose(withNetwork(), withLocalize)(AddressSearchWithRef);
diff --git a/src/components/AmountTextInput.js b/src/components/AmountTextInput.js
index cc2e1e1e872b..d110fe39cd6c 100644
--- a/src/components/AmountTextInput.js
+++ b/src/components/AmountTextInput.js
@@ -64,10 +64,14 @@ AmountTextInput.propTypes = propTypes;
AmountTextInput.defaultProps = defaultProps;
AmountTextInput.displayName = 'AmountTextInput';
-export default React.forwardRef((props, ref) => (
+const AmountTextInputWithRef = React.forwardRef((props, ref) => (
));
+
+AmountTextInputWithRef.displayName = 'AmountTextInputWithRef';
+
+export default AmountTextInputWithRef;
diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
index 61b138747950..f8c4122dddb0 100755
--- a/src/components/AttachmentModal.js
+++ b/src/components/AttachmentModal.js
@@ -1,4 +1,4 @@
-import React, {useState, useCallback, useRef, useMemo} from 'react';
+import React, {useState, useCallback, useRef, useMemo, useEffect} from 'react';
import PropTypes from 'prop-types';
import {View, Animated, Keyboard} from 'react-native';
import Str from 'expensify-common/lib/str';
@@ -123,7 +123,7 @@ function AttachmentModal(props) {
const [source, setSource] = useState(props.source);
const [modalType, setModalType] = useState(CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE);
const [isConfirmButtonDisabled, setIsConfirmButtonDisabled] = useState(false);
- const [confirmButtonFadeAnimation] = useState(new Animated.Value(1));
+ const [confirmButtonFadeAnimation] = useState(() => new Animated.Value(1));
const [shouldShowDownloadButton, setShouldShowDownloadButton] = React.useState(true);
const {windowWidth} = useWindowDimensions();
@@ -137,6 +137,10 @@ function AttachmentModal(props) {
const {translate} = useLocalize();
const {isOffline} = useNetwork();
+ useEffect(() => {
+ setFile(props.originalFileName ? {name: props.originalFileName} : undefined);
+ }, [props.originalFileName]);
+
const onCarouselAttachmentChange = props.onCarouselAttachmentChange;
/**
@@ -376,7 +380,7 @@ function AttachmentModal(props) {
text: props.translate('common.download'),
onSelected: () => downloadAttachment(source),
});
- if (TransactionUtils.hasReceipt(props.transaction) && !TransactionUtils.isReceiptBeingScanned(props.transaction) && !isSettled) {
+ if (TransactionUtils.hasReceipt(props.transaction) && !TransactionUtils.isReceiptBeingScanned(props.transaction) && canEdit) {
menuItems.push({
icon: Expensicons.Trashcan,
text: props.translate('receipt.deleteReceipt'),
@@ -447,6 +451,7 @@ function AttachmentModal(props) {
onToggleKeyboard={updateConfirmButtonVisibility}
isWorkspaceAvatar={props.isWorkspaceAvatar}
fallbackSource={props.fallbackSource}
+ isUsedInAttachmentModal
/>
)
)}
diff --git a/src/components/Attachments/AttachmentCarousel/CarouselItem.js b/src/components/Attachments/AttachmentCarousel/CarouselItem.js
index 096b6d60d428..2fe62a00b90f 100644
--- a/src/components/Attachments/AttachmentCarousel/CarouselItem.js
+++ b/src/components/Attachments/AttachmentCarousel/CarouselItem.js
@@ -52,7 +52,7 @@ function CarouselItem({item, isFocused, onPress}) {
const {translate} = useLocalize();
const {isAttachmentHidden} = useContext(ReportAttachmentsContext);
// eslint-disable-next-line es/no-nullish-coalescing-operators
- const [isHidden, setIsHidden] = useState(isAttachmentHidden(item.reportActionID) ?? item.hasBeenFlagged);
+ const [isHidden, setIsHidden] = useState(() => isAttachmentHidden(item.reportActionID) ?? item.hasBeenFlagged);
const renderButton = (style) => (