Skip to content

Commit

Permalink
update new main
Browse files Browse the repository at this point in the history
  • Loading branch information
cretadn22 committed Oct 17, 2024
2 parents 9c37320 + 987ff1b commit 669f845
Show file tree
Hide file tree
Showing 304 changed files with 7,699 additions and 3,247 deletions.
7 changes: 5 additions & 2 deletions .github/ISSUE_TEMPLATE/Standard.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ___
**Version Number:**
**Reproducible in staging?:**
**Reproducible in production?:**
**If this was caught on HybridApp, is this reproducible on New Expensify Standalone?:**
**If this was caught during regression testing, add the test name, ID and link from TestRail:**
**Email or phone of affected tester (no customers):**
**Logs:** https://stackoverflow.com/c/expensify/questions/4856
Expand All @@ -34,9 +35,11 @@ Can the user still use Expensify without this being fixed? Have you informed the
Check off any platforms that are affected by this issue
--->
Which of our officially supported platforms is this issue occurring on?
- [ ] Android: Native
- [ ] Android: Standalone
- [ ] Android: HybridApp
- [ ] Android: mWeb Chrome
- [ ] iOS: Native
- [ ] iOS: Standalone
- [ ] iOS: HybridApp
- [ ] iOS: mWeb Safari
- [ ] MacOS: Chrome / Safari
- [ ] MacOS: Desktop
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/buildAndroid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@ on:
description: The pull request number associated with this build, if relevant.
type: string
required: false

outputs:
AAB_FILE_NAME:
value: ${{ jobs.build.outputs.AAB_FILE_NAME }}
APK_FILE_NAME:
value: ${{ jobs.build.outputs.APK_FILE_NAME }}
APK_ARTIFACT_NAME:
value: ${{ jobs.build.outputs.APK_ARTIFACT_NAME }}

workflow_dispatch:
inputs:
Expand Down Expand Up @@ -56,6 +59,7 @@ jobs:
outputs:
AAB_FILE_NAME: ${{ steps.build.outputs.AAB_FILE_NAME }}
APK_FILE_NAME: ${{ steps.build.outputs.APK_FILE_NAME }}
APK_ARTIFACT_NAME: ${{ steps.build.outputs.APK_ARTIFACT_NAME }}

steps:
- name: Checkout
Expand Down Expand Up @@ -159,6 +163,7 @@ jobs:
echo "APK_PATH=$apkPath"
echo "APK_FILE_NAME=$(basename "$apkPath")"
echo "SHOULD_UPLOAD_SOURCEMAPS=$SHOULD_UPLOAD_SOURCEMAPS"
echo "APK_ARTIFACT_NAME=${{ inputs.artifact-prefix }}android-artifact-apk" >> "$GITHUB_OUTPUT"
} >> "$GITHUB_OUTPUT"
- name: Upload Android AAB artifact
Expand All @@ -174,7 +179,7 @@ jobs:
continue-on-error: true
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.artifact-prefix }}android-artifact-apk
name: ${{ steps.build.outputs.APK_ARTIFACT_NAME }}
path: ${{ steps.build.outputs.APK_PATH }}

- name: Upload Android sourcemaps artifact
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2ePerformanceTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
uses: ./.github/actions/javascript/getArtifactInfo
with:
GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }}
ARTIFACT_NAME: baseline-${{ steps.getMostRecentRelease.outputs.VERSION }}-android-artifact-apk
ARTIFACT_NAME: baseline-${{ steps.getMostRecentRelease.outputs.VERSION }}android-artifact-apk

- name: Skip build if there's already an existing artifact for the baseline
if: ${{ fromJSON(steps.checkForExistingArtifact.outputs.ARTIFACT_FOUND) }}
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
uses: actions/download-artifact@v4
id: downloadBaselineAPK
with:
name: baseline-${{ needs.prep.outputs.BASELINE_VERSION }}-android-artifact-apk
name: ${{ needs.buildBaseline.outputs.APK_ARTIFACT_NAME }}
path: zip
# Set github-token only if the baseline was built in this workflow run:
github-token: ${{ needs.prep.outputs.BASELINE_ARTIFACT_WORKFLOW_ID && github.token }}
Expand All @@ -139,7 +139,7 @@ jobs:
uses: actions/download-artifact@v4
id: downloadDeltaAPK
with:
name: delta-${{ needs.prep.outputs.DELTA_REF }}-android-artifact-apk
name: ${{ needs.buildDelta.outputs.APK_ARTIFACT_NAME }}
path: zip

- name: Rename delta APK
Expand Down
6 changes: 3 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.grad
/* Fullstory settings */
fullstory {
org 'o-1WN56P-na1'
enabledVariants 'all'
enabledVariants 'production'
logcatLevel 'debug'
recordOnStart false
}
Expand Down Expand Up @@ -110,8 +110,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1009004701
versionName "9.0.47-1"
versionCode 1009005001
versionName "9.0.50-1"
// Supported language variants must be declared here to avoid from being removed during the compilation.
// This also helps us to not include unnecessary language variants in the APK.
resConfigs "en", "es"
Expand Down
37 changes: 0 additions & 37 deletions assets/images/companyCards/card-bank_of_america.svg

This file was deleted.

35 changes: 0 additions & 35 deletions assets/images/companyCards/card-other.svg

This file was deleted.

30 changes: 15 additions & 15 deletions desktop/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"electron-context-menu": "^2.3.0",
"electron-log": "^4.4.8",
"electron-updater": "^6.3.6",
"electron-updater": "^6.3.8",
"mime-types": "^2.1.35",
"node-machine-id": "^1.1.12"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ You can choose to connect either a business deposit-only account that only recei

| Business deposit-only account | Verified business account |
|---------------------------------------------------|------------------------------------------------------|
| ✔ Receive reimbursements for invoices | ✔ Reimburse expenses via direct bank transfer |
| ✔ Receive payments for invoices | ✔ Reimburse expenses via direct bank transfer |
| | ✔ Pay bills |
| | ✔ Issue Expensify Cards |

Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
---
title: Pay Bills
title: Create and Pay Bills
description: Expensify bill management and payment methods.
---
Streamline your operations by receiving and paying vendor or supplier bills directly in Expensify. Vendors can send bills even if they don't have an Expensify account, and you can manage payments seamlessly.

## Receive Bills in Expensify
# Receive Bills in Expensify
You can receive bills in three ways:
- Directly from Vendors: Provide your Expensify billing email to vendors.
- Forwarding Emails: Forward bills received in your email to Expensify.
- Manual Upload: For physical bills, create a Bill in Expensify from the Reports page.

## Bill Pay Workflow
# Bill Pay Workflow
1. When a vendor or supplier sends a bill to Expensify, the document is automatically SmartScanned, and a Bill is created. This Bill is managed by the primary domain contact, who can view it on the Reports page within their default group policy.

2. Once the Bill is ready for processing, it follows the established approval workflow. As each person approves it, the Bill appears in the next approver’s Inbox. The final approver will pay the Bill using one of the available payment methods.

3. During this process, the Bill is coded with the appropriate GL codes from your connected accounting software. After completing the approval workflow, the Bill can be exported back to your accounting system.

## Payment Methods
# Payment Methods
There are multiple ways to pay Bills in Expensify. Let’s go over each method below.

### ACH bank-to-bank transfer
## ACH bank-to-bank transfer

To use this payment method, you must have a [business bank account connected to your Expensify account](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account).

Expand All @@ -32,7 +32,7 @@ To use this payment method, you must have a [business bank account connected to

**Fees:** None

### Credit or Debit Card
## Credit or Debit Card
This option is available to all US and International customers receiving a bill from a US vendor with a US business bank account.

**To pay with a credit or debit card:**
Expand All @@ -43,13 +43,13 @@ This option is available to all US and International customers receiving a bill

**Fees:** 2.9% of the total amount paid.

### Venmo
## Venmo
If both you and the vendor must have Venmo connected to Expensify, you can pay the bill by following the steps outlined [here](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Third-Party-Payments#setting-up-third-party-payments).

**Fees:** Venmo charges a 3% sender’s fee.


### Pay outside of Expensify
## Pay outside of Expensify
If you are unable to pay using one of the above methods, you can still mark the Bill as paid. This will update its status to indicate that the payment was made outside Expensify.

**To mark a Bill as paid outside of Expensify:**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
---
title: Pay an Invoice
description: A guide to different methods of paying an invoice
---

<div id="expensify-classic" markdown="1">

There are multiple ways to pay Invoices in Expensify. Let’s go over each method below.

# How to Pay Invoices

1. Sign in to your [Expensify web account](www.expensify.com).
2. Click on the Invoice you’d like to pay to see the details.
3. Click on the **Pay** button.
4. Follow the prompts to pay through one of the following methods.

### ACH bank-to-bank transfer

To use this payment method, you must have a [business bank account connected to your Expensify account](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account).

**To pay with an ACH bank-to-bank transfer:**
1. Sign in to your [Expensify web account](www.expensify.com).
2. Go to the **Home** or **Reports** page and locate the Invoice that needs to be paid.
3. Click the **Pay** button to be redirected to the Invoice.
4. Choose the ACH option from the drop-down list.

**Fees:** None

### Credit or Debit Card
This option is available to all US and International customers receiving an invoice from a US vendor with a US business bank account.

**To pay with a credit or debit card:**
1. Sign in to your [Expensify web account](www.expensify.com).
2. Click on the Invoice you’d like to pay to see the details.
3. Click the **Pay** button.
4. Enter your credit card or debit card details.

**Fees:** 2.9% credit card payment fee.

### Venmo
If both you and the vendor must have Venmo connected to Expensify, you can pay the Invoice by following the steps outlined [here](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Third-Party-Payments#setting-up-third-party-payments).

**Fees:** Venmo and Paypal.me charges may apply.


### Pay outside of Expensify
If you are unable to pay using one of the above methods, you can still mark the Invoice as paid. This will update its status to indicate that the payment was made outside Expensify.

**To mark an Invoice as paid outside of Expensify:**
1. Sign in to your [Expensify web account](www.expensify.com).
2. Click on the Invoice you’d like to pay to see the details.
3. Click the Pay button.
4. Choose **I’ll do it manually**.

**Fees:** None.

{% include faq-begin.md %}

## What’s the difference between an Invoice and an Expense Report in Expensify?
An invoice is an expense submitted to a client or contractor for payment. An expense report is an expense/group of expenses submitted to an employer for reimbursement.

## What’s the difference between a Bill and an Invoice in Expensify?
A Bill is an amount owed to a payee (usually a vendor or supplier) and is usually created from a vendor invoice. An Invoice is a receivable and indicates an amount owed to you by someone else.

{% include faq-end.md %}
Loading

0 comments on commit 669f845

Please sign in to comment.