Skip to content

Commit 37031db

Browse files
JulesssssJulesssss
committed
another merge to resolve falsesubmodule conflict
2 parents 177f2e6 + 2232b35 commit 37031db

File tree

82 files changed

+998
-736
lines changed

Some content is hidden

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

82 files changed

+998
-736
lines changed

‎.github/workflows/compareNDandODbuilds.yml

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
name: Build and profile Android apps
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
validateActor:
8+
runs-on: ubuntu-latest
9+
outputs:
10+
READY_TO_BUILD: ${{ fromJSON(steps.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) && fromJSON(steps.hasReadyToBuildLabel.outputs.HAS_READY_TO_BUILD_LABEL) }}
11+
steps:
12+
- name: Is Expensify employee
13+
id: isExpensifyEmployee
14+
run: |
15+
if gh api /orgs/Expensify/teams/expensify-expensify/memberships/${{ github.actor }} --silent; then
16+
echo "IS_EXPENSIFY_EMPLOYEE=true" >> "$GITHUB_OUTPUT"
17+
else
18+
echo "IS_EXPENSIFY_EMPLOYEE=false" >> "$GITHUB_OUTPUT"
19+
fi
20+
env:
21+
GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
22+
23+
- id: hasReadyToBuildLabel
24+
name: Set HAS_READY_TO_BUILD_LABEL flag
25+
run: |
26+
echo "HAS_READY_TO_BUILD_LABEL=$(gh pr view "${{ env.PULL_REQUEST_NUMBER }}" --repo Expensify/App --json labels --jq '.labels[].name' | grep -q 'Ready To Build' && echo 'true')" >> "$GITHUB_OUTPUT"
27+
if [[ "$HAS_READY_TO_BUILD_LABEL" != 'true' ]]; then
28+
echo "The 'Ready to Build' label is not attached to the PR #${{ env.PULL_REQUEST_NUMBER }}"
29+
fi
30+
env:
31+
GITHUB_TOKEN: ${{ github.token }}
32+
33+
buildHybridAppAndroid:
34+
name: Build HybridApp Android
35+
needs: [validateActor]
36+
runs-on: macos-15-xlarge
37+
steps:
38+
- name: Checkout
39+
uses: actions/checkout@v4
40+
with:
41+
submodules: true
42+
ref: ${{ github.event.pull_request.head.sha }}
43+
token: ${{ secrets.OS_BOTIFY_TOKEN }}
44+
45+
- name: Update submodule to match main
46+
run: |
47+
git submodule update --init --remote
48+
cd Mobile-Expensify
49+
git fetch
50+
git checkout main
51+
52+
- name: Configure MapBox SDK
53+
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
54+
55+
- name: Setup Node
56+
id: setup-node
57+
uses: ./.github/actions/composite/setupNode
58+
with:
59+
IS_HYBRID_BUILD: 'true'
60+
61+
- name: Build Android Release
62+
working-directory: Mobile-Expensify/Android
63+
run: |
64+
if ! ./gradlew --profile assembleRelease
65+
then
66+
echo "❌ Android HybridApp failed to build: Please reach out to Contributor+ and/or Expensify engineers for help in #expensify-open-source to resolve."
67+
exit 1
68+
else
69+
echo "✅ Build succeeded. Printing Gradle profile report:"
70+
# Print the latest generated profile report
71+
PROFILE_REPORT=$(find build/reports/profile -maxdepth 1 -type f)
72+
cat "$PROFILE_REPORT"
73+
fi
74+
75+
buildStandaloneAndroid:
76+
name: Build Standalone Android
77+
needs: [ validateActor ]
78+
runs-on: macos-15-xlarge
79+
steps:
80+
- name: Checkout
81+
uses: actions/checkout@v4
82+
with:
83+
ref: ${{ github.event.pull_request.head.sha }}
84+
token: ${{ secrets.OS_BOTIFY_TOKEN }}
85+
86+
- name: Configure MapBox SDK
87+
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
88+
89+
- name: Setup Node
90+
id: setup-node
91+
uses: ./.github/actions/composite/setupNode
92+
with:
93+
IS_HYBRID_BUILD: 'false'
94+
95+
- name: Build Android Release
96+
working-directory: android
97+
run: |
98+
if ! ./gradlew --profile assembleProductionRelease
99+
then
100+
echo "❌ Android Standalone failed to build: Please reach out to Contributor+ and/or Expensify engineers for help in #expensify-open-source to resolve."
101+
exit 1
102+
else
103+
echo "✅ Build succeeded. Printing Gradle profile report:"
104+
# Print the latest generated profile report
105+
PROFILE_REPORT=$(find build/reports/profile -maxdepth 1 -type f)
106+
cat "$PROFILE_REPORT"
107+
fi

‎android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ android {
110110
minSdkVersion rootProject.ext.minSdkVersion
111111
targetSdkVersion rootProject.ext.targetSdkVersion
112112
multiDexEnabled rootProject.ext.multiDexEnabled
113-
versionCode 1009008907
114-
versionName "9.0.89-7"
113+
versionCode 1009009002
114+
versionName "9.0.90-2"
115115
// Supported language variants must be declared here to avoid from being removed during the compilation.
116116
// This also helps us to not include unnecessary language variants in the APK.
117117
resConfigs "en", "es"

‎docs/articles/expensify-classic/expensify-partner-program/Referral-Program.md

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
---
2-
title: New Expensify Referral Program
3-
description: Share your invite link with a friend, start a chat with a coworker, request money from your boss -- we'll pay you $250 if your referral adopts New Expensify.
2+
title: Refer a Friend to New Expensify!
3+
description: Share your invite link with a friend, start a chat with a coworker or request money from your boss
44
---
55
<!-- The lines above are required by Jekyll to process the .md file -->
66

77
# About
88

9-
[New Expensify](https://new.expensify.com/) is growing thanks to members like you who love it so much that they tell their friends, family, colleagues, managers, and fellow business founders to use it, too.
10-
11-
As a thank you, every time you bring a new customer into New Expensify, you'll get $250. Here's how it works.
9+
New Expensify's referral program is currently paused. Please check back later.
1210

13-
# How to get paid to refer anyone to New Expensify
11+
[New Expensify](https://new.expensify.com/) is growing thanks to members like you who love it so much that they tell their friends, family, colleagues, managers, and fellow business founders to use it, too.
1412

15-
The sky's the limit for this referral program! Your referral can be anyone - a friend, family member, boss, coworker, neighbor, or even social media follower. We're making it as easy as possible to get that cold hard $$$.
13+
# How to refer a friend to New Expensify
1614

1715
1. There are a bunch of different ways to refer someone to New Expensify:
1816
- Start a chat
@@ -24,33 +22,9 @@ The sky's the limit for this referral program! Your referral can be anyone - a f
2422
- Invite them to a room
2523
- Add them to a workspace
2624

27-
2. You'll get $250 for each referral as long as:
28-
- You're the first to refer them to Expensify
29-
- They start an annual subscription with two or more active users
30-
- They make two payments toward that annual subscription
31-
32-
For now, referral rewards will be paid via direct deposit into bank accounts that are connected to Expensify.
3325

3426
{% include faq-begin.md %}
3527

36-
- **How will I know if I'm the first person to refer a company to Expensify?**
37-
38-
Successful referrers are notified after their referral pays for two months of an annual Expensify subscription. We'll check for the earliest recorded referrer of a member on the workspace, and if that's you, we'll let you know.
39-
40-
- **How will you pay me if I am successful?**
41-
42-
For now, Expensify will pay successful referrers via direct deposit to the Deposit-Only bank account you have on file. Referral payouts will happen once a month. If you don't have a Deposit-Only bank account connected to Expensify at the time of your referral payout, your deposit will be processed in the next batch.
43-
44-
Learn how to add a Deposit-Only bank account [here](https://community.expensify.com/discussion/4641/how-to-add-a-deposit-only-bank-account-both-personal-and-business).
45-
46-
- **I’m outside of the US, how do I get paid?**
47-
48-
While our referral payouts are in USD, you'll be able to get paid via a Wise Borderless account. Learn more [here](https://community.expensify.com/discussion/5940/how-to-get-reimbursed-outside-the-us-with-wise-for-non-us-employees).
49-
50-
- **My referral wasn’t counted! How can I appeal?**
51-
52-
Expensify reserves the right to modify the terms of the referral program at any time, and pays out referral bonuses for eligible members at its own discretion. If you think there's been a mistake, please send a message to [email protected] with the email of your referral and our team will review your case.
53-
5428
- **Where can I find my referral link?**
5529

5630
In New Expensify, go to **Settings** > **Share code** > **Get $250** to retrieve your invite link.

0 commit comments

Comments
 (0)