-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix-quick-action-label-spacing
- Loading branch information
Showing
111 changed files
with
4,576 additions
and
2,116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -114,51 +114,6 @@ jobs: | |
| env: | ||
| BROWSERSTACK: ${{ secrets.BROWSERSTACK }} | ||
|
|
||
| submitAndroid: | ||
| name: Submit Android app for production review | ||
| needs: prep | ||
| if: ${{ github.ref == 'refs/heads/production' }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup Ruby | ||
| uses: ruby/[email protected] | ||
| with: | ||
| bundler-cache: true | ||
|
|
||
| - name: Get Android native version | ||
| id: getAndroidVersion | ||
| run: echo "VERSION_CODE=$(grep -o 'versionCode\s\+[0-9]\+' android/app/build.gradle | awk '{ print $2 }')" >> "$GITHUB_OUTPUT" | ||
|
|
||
| - name: Decrypt json w/ Google Play credentials | ||
| run: gpg --batch --yes --decrypt --passphrase="${{ secrets.LARGE_SECRET_PASSPHRASE }}" --output android-fastlane-json-key.json android-fastlane-json-key.json.gpg | ||
| working-directory: android/app | ||
|
|
||
| - name: Submit Android build for review | ||
| run: bundle exec fastlane android upload_google_play_production | ||
| env: | ||
| VERSION: ${{ steps.getAndroidVersion.outputs.VERSION_CODE }} | ||
|
|
||
| - name: Warn deployers if Android production deploy failed | ||
| if: ${{ failure() }} | ||
| uses: 8398a7/action-slack@v3 | ||
| with: | ||
| status: custom | ||
| custom_payload: | | ||
| { | ||
| channel: '#deployer', | ||
| attachments: [{ | ||
| color: "#DB4545", | ||
| pretext: `<!subteam^S4TJJ3PSL>`, | ||
| text: `💥 Android production deploy failed. Please manually submit ${{ needs.prep.outputs.APP_VERSION }} in the <https://play.google.com/console/u/0/developers/8765590895836334604/app/4973041797096886180/releases/overview|Google Play Store>. 💥`, | ||
| }] | ||
| } | ||
| env: | ||
| GITHUB_TOKEN: ${{ github.token }} | ||
| SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} | ||
|
|
||
| android_hybrid: | ||
| name: Build and deploy Android HybridApp | ||
| needs: prep | ||
|
|
@@ -430,12 +385,6 @@ jobs: | |
| APPLE_DEMO_EMAIL: ${{ secrets.APPLE_DEMO_EMAIL }} | ||
| APPLE_DEMO_PASSWORD: ${{ secrets.APPLE_DEMO_PASSWORD }} | ||
|
|
||
| - name: Submit build for App Store review | ||
| if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} | ||
| run: bundle exec fastlane ios submit_for_review | ||
| env: | ||
| VERSION: ${{ steps.getIOSVersion.outputs.IOS_VERSION }} | ||
|
|
||
| - name: Upload iOS build to Browser Stack | ||
| if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} | ||
| run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@/Users/runner/work/App/App/New Expensify.ipa" | ||
|
|
@@ -714,7 +663,7 @@ jobs: | |
| name: Post a Slack message when any platform fails to build or deploy | ||
| runs-on: ubuntu-latest | ||
| if: ${{ failure() }} | ||
| needs: [buildAndroid, uploadAndroid, submitAndroid, android_hybrid, desktop, iOS, iOS_hybrid, web] | ||
| needs: [buildAndroid, uploadAndroid, android_hybrid, desktop, iOS, iOS_hybrid, web] | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
|
|
@@ -729,21 +678,15 @@ jobs: | |
| outputs: | ||
| IS_AT_LEAST_ONE_PLATFORM_DEPLOYED: ${{ steps.checkDeploymentSuccessOnAtLeastOnePlatform.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED }} | ||
| IS_ALL_PLATFORMS_DEPLOYED: ${{ steps.checkDeploymentSuccessOnAllPlatforms.outputs.IS_ALL_PLATFORMS_DEPLOYED }} | ||
| needs: [buildAndroid, uploadAndroid, submitAndroid, android_hybrid, desktop, iOS, iOS_hybrid, web] | ||
| needs: [buildAndroid, uploadAndroid, android_hybrid, desktop, iOS, iOS_hybrid, web] | ||
| if: ${{ always() }} | ||
| steps: | ||
| - name: Check deployment success on at least one platform | ||
| id: checkDeploymentSuccessOnAtLeastOnePlatform | ||
| run: | | ||
| isAtLeastOnePlatformDeployed="false" | ||
| if [ ${{ github.ref }} == 'refs/heads/production' ]; then | ||
| if [ "${{ needs.submitAndroid.result }}" == "success" ]; then | ||
| isAtLeastOnePlatformDeployed="true" | ||
| fi | ||
| else | ||
| if [ "${{ needs.uploadAndroid.result }}" == "success" ]; then | ||
| isAtLeastOnePlatformDeployed="true" | ||
| fi | ||
| if [ "${{ needs.uploadAndroid.result }}" == "success" ]; then | ||
| isAtLeastOnePlatformDeployed="true" | ||
| fi | ||
| if [ "${{ needs.iOS.result }}" == "success" ] || \ | ||
|
|
@@ -768,14 +711,8 @@ jobs: | |
| isAllPlatformsDeployed="true" | ||
| fi | ||
| if [ ${{ github.ref }} == 'refs/heads/production' ]; then | ||
| if [ "${{ needs.submitAndroid.result }}" != "success" ]; then | ||
| isAllPlatformsDeployed="false" | ||
| fi | ||
| else | ||
| if [ "${{ needs.uploadAndroid.result }}" != "success" ]; then | ||
| isAllPlatformsDeployed="false" | ||
| fi | ||
| if [ "${{ needs.uploadAndroid.result }}" != "success" ]; then | ||
| isAllPlatformsDeployed="false" | ||
| fi | ||
| echo "IS_ALL_PLATFORMS_DEPLOYED=$isAllPlatformsDeployed" >> "$GITHUB_OUTPUT" | ||
|
|
@@ -923,7 +860,7 @@ jobs: | |
| name: Post a Slack message when all platforms deploy successfully | ||
| runs-on: ubuntu-latest | ||
| if: ${{ always() && fromJSON(needs.checkDeploymentSuccess.outputs.IS_ALL_PLATFORMS_DEPLOYED) }} | ||
| needs: [prep, buildAndroid, uploadAndroid, submitAndroid, android_hybrid, desktop, iOS, iOS_hybrid, web, checkDeploymentSuccess, createPrerelease, finalizeRelease] | ||
| needs: [prep, buildAndroid, uploadAndroid, android_hybrid, desktop, iOS, iOS_hybrid, web, checkDeploymentSuccess, createPrerelease, finalizeRelease] | ||
| steps: | ||
| - name: 'Announces the deploy in the #announce Slack room' | ||
| uses: 8398a7/action-slack@v3 | ||
|
|
@@ -977,11 +914,11 @@ jobs: | |
| postGithubComments: | ||
| uses: ./.github/workflows/postDeployComments.yml | ||
| if: ${{ always() && fromJSON(needs.checkDeploymentSuccess.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED) }} | ||
| needs: [prep, buildAndroid, uploadAndroid, submitAndroid, android_hybrid, desktop, iOS, iOS_hybrid, web, checkDeploymentSuccess, createPrerelease, finalizeRelease] | ||
| needs: [prep, buildAndroid, uploadAndroid, android_hybrid, desktop, iOS, iOS_hybrid, web, checkDeploymentSuccess, createPrerelease, finalizeRelease] | ||
| with: | ||
| version: ${{ needs.prep.outputs.APP_VERSION }} | ||
| env: ${{ github.ref == 'refs/heads/production' && 'production' || 'staging' }} | ||
| android: ${{ github.ref == 'refs/heads/production' && needs.submitAndroid.result || needs.uploadAndroid.result }} | ||
| android: ${{ github.ref == 'refs/heads/production' || needs.uploadAndroid.result }} | ||
| android_hybrid: ${{ needs.android_hybrid.result }} | ||
| ios: ${{ needs.iOS.result }} | ||
| ios_hybrid: ${{ needs.iOS_hybrid.result }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,8 @@ jobs: | |
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Setup NodeJS | ||
| uses: ./.github/actions/composite/setupNode | ||
|
|
@@ -22,6 +24,22 @@ jobs: | |
| git config --global user.email "[email protected]" | ||
| git config --global user.name "Test" | ||
| - name: Get common ancestor commit | ||
| run: | | ||
| git fetch origin main | ||
| common_ancestor=$(git merge-base "${{ github.sha }}" origin/main) | ||
| echo "COMMIT_HASH=$common_ancestor" >> "$GITHUB_ENV" | ||
| - name: Clean up deleted files | ||
| run: | | ||
| DELETED_FILES=$(git diff --name-only --diff-filter=D "$COMMIT_HASH" "${{ github.sha }}") | ||
| for file in $DELETED_FILES; do | ||
| if [ -n "$file" ]; then | ||
| rm -f "$file" | ||
| echo "Deleted file: $file" | ||
| fi | ||
| done | ||
| - name: Run performance testing script | ||
| shell: bash | ||
| run: | | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule Mobile-Expensify
updated
from af5499 to d81135
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export * from '@expensify/react-native-live-markdown/mock'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
docs/articles/new-expensify/billing-and-subscriptions/Tax-exempt.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| --- | ||
| title: Tax Exempt | ||
| description: Tax-exempt status in Expensify for organizations recognized by the IRS or local tax authorities. | ||
| --- | ||
|
|
||
| # Overview | ||
| If your organization is recognized by the IRS or other local tax authorities as tax-exempt, that means you don’t need to pay any tax on your Expensify monthly bill. Please follow these instructions to request tax-exempt status. | ||
| # How to request tax-exempt status in Expensify | ||
| 1. Go to **Settings > Subscription > Subscription details**. | ||
| 2. Click **More** in the top right, then **Request tax exempt status**. | ||
| 3. After you've requested tax-exempt status, Concierge (our support service) will start a conversation with you. They will ask you to upload a PDF of your tax-exempt documentation. This document should include your VAT number (or "RUT" in Chile). You can use one of the following documents: 501(c), ST-119, or a foreign tax-exempt declaration. | ||
| 4. Our team will review your document and let you know if we need any more information. | ||
| 5. Once everything is verified, we'll update your account accordingly. | ||
|
|
||
| {:width="100%"} | ||
|
|
||
| Once your account is marked as tax-exempt, the corresponding state tax will no longer be applied to future billing. | ||
|
|
||
| If you need to remove your tax-exempt status, let your account manager know or contact Concierge. | ||
|
|
||
| {% include faq-begin.md %} | ||
| ## What happens to my past Expensify bills that incorrectly had tax added to them? | ||
| Expensify can provide a refund for the tax you were charged on your previous bills. Please let your Account Manager know or contact Concierge if this is the case. | ||
|
|
||
| {% include faq-end.md %} | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.