Skip to content

Commit cead0a2

Browse files
committed
Merge branch 'main' of github.com:Expensify/App into jsenyitko-table-exploration
2 parents f05078f + 7ef6d9e commit cead0a2

124 files changed

Lines changed: 2040 additions & 3431 deletions

File tree

Some content is hidden

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

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009037302
115-
versionName "9.3.73-2"
114+
versionCode 1009037304
115+
versionName "9.3.73-4"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"

config/eslint/eslint.seatbelt.tsv

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@
496496
"../../src/pages/domain/Groups/PreferredWorkspaceToggle.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
497497
"../../src/pages/domain/Saml/SamlLoginSectionContent.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
498498
"../../src/pages/inbox/DeleteTransactionNavigateBackHandler.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
499-
"../../src/pages/inbox/ReportFetchHandler.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
499+
"../../src/pages/inbox/ReportFetchHandler.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 3
500500
"../../src/pages/inbox/ReportNavigateAwayHandler.tsx" "react-hooks/exhaustive-deps" 1
501501
"../../src/pages/inbox/hooks/useReportWasDeleted.ts" "react-hooks/set-state-in-effect" 1
502502
"../../src/pages/inbox/report/ContextMenu/BaseReportActionContextMenu.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
@@ -505,20 +505,21 @@
505505
"../../src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx" "@typescript-eslint/no-deprecated/getReportNameDeprecated" 1
506506
"../../src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx" "@typescript-eslint/no-deprecated/ConfirmModal" 1
507507
"../../src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
508-
"../../src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx" "react-hooks/refs" 29
508+
"../../src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx" "react-hooks/refs" 30
509509
"../../src/pages/inbox/report/ListBoundaryLoader.tsx" "react-hooks/set-state-in-effect" 1
510510
"../../src/pages/inbox/report/PureReportActionItem.tsx" "react-hooks/refs" 2
511511
"../../src/pages/inbox/report/PureReportActionItem.tsx" "react-hooks/set-state-in-effect" 1
512512
"../../src/pages/inbox/report/ReactionList/HeaderReactionList.tsx" "no-restricted-syntax" 1
513-
"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
514-
"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions.tsx" "react-hooks/refs" 7
513+
"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
514+
"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx" "react-hooks/preserve-manual-memoization" 2
515+
"../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx" "react-hooks/refs" 8
515516
"../../src/pages/inbox/report/ReportActionCompose/SuggestionEmoji.tsx" "react-hooks/refs" 1
516517
"../../src/pages/inbox/report/ReportActionCompose/SuggestionMention.tsx" "react-hooks/refs" 3
517518
"../../src/pages/inbox/report/ReportActionItemMessage.tsx" "@typescript-eslint/no-deprecated/getReportName" 1
518-
"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
519+
"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
519520
"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx" "no-restricted-syntax" 1
520521
"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx" "react-hooks/preserve-manual-memoization" 1
521-
"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx" "react-hooks/refs" 5
522+
"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx" "react-hooks/refs" 6
522523
"../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx" "react-hooks/set-state-in-effect" 1
523524
"../../src/pages/inbox/report/ReportActionsList.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 4
524525
"../../src/pages/inbox/report/ReportActionsList.tsx" "react-hooks/refs" 5

docs/articles/new-expensify/billing-and-subscriptions/Add-a-payment-card-and-view-your-subscription.md

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
---
22
title: Manage Expensify Subscription
3-
description: Learn how to manage your subscription, update billing details, cancel early, or delete a workspace in New Expensify.
3+
description: Learn how to manage your subscription, update billing details, request to cancel your subscription, or delete a workspace in New Expensify.
44
keywords: [New Expensify, billing owner, manage subscription, update payment card, cancel subscription, delete workspace, billing and subscriptions, subscription settings, can't delete workspace, can't cancel subscription]
55
internalScope: Audience is billing owners and Workspace Admins. Covers how to manage a paid subscription in New Expensify, including billing permissions and ownership transfer. Does not cover free workspaces or plan upgrades.
66
---
77

8-
You can manage your Expensify subscription anytime from your account settings—update your billing info, request early cancellation, or delete a workspace if you're the billing owner.
9-
10-
View and manage your subscription under **Account > Subscription**.
8+
You can manage your Expensify subscription in **Account > Subscription**. From there, you can update your billing information, request to cancel your subscription, or delete a workspace if you're the billing owner.
119

1210
---
1311

@@ -16,7 +14,7 @@ View and manage your subscription under **Account > Subscription**.
1614
Only the **billing owner** can:
1715

1816
- Add or change the payment card
19-
- Request early cancellation of an annual plan
17+
- Request to cancel an annual subscription
2018
- Delete a paid workspace
2119

2220
If you don’t see these options, you’re likely not the billing owner.
@@ -72,14 +70,12 @@ To access the **Subscription** section:
7270

7371
---
7472

75-
# How to request early cancellation of an annual subscription
76-
73+
# How to request to cancel an annual subscription
74+
## How to request to cancel an annual subscription
7775
1. Go to **Account > Subscription**.
78-
2. Click **Request early cancellation**.
76+
2. Click **Cancel subscription**.
7977
3. Follow the prompts. Your request may be processed automatically or reviewed by our team.
8078

81-
**Note:** This option is only available to the billing owner and early cancellation is not available to all members.
82-
8379
---
8480

8581
# How to stop billing for a paid workspace
@@ -89,7 +85,7 @@ To stop being charged for Expensify, you’ll need to either:
8985
- **Delete the paid workspace**, or
9086
- **Transfer billing ownership** to another member.
9187

92-
**Note:** If you're on an annual subscription, you can’t delete your last workspace unless you’ve first requested and received early cancellation.
88+
**Note:** If youre on an annual subscription, you can’t delete your last workspace unless you’ve first canceled your subscription.
9389

9490
---
9591

@@ -117,8 +113,8 @@ Only Workspace Admins can transfer billing ownership to themselves - it’s not
117113

118114
# What to do if you can’t update a subscription
119115

120-
If you're blocked from updating billing settings, canceling early, or deleting a workspace, it's likely because you’re not the billing owner.
121-
116+
If youre blocked from updating billing settings, requesting to canceling your subscription, or deleting a workspace, its likely because you’re not the billing owner.
117+
If you're blocked from updating billing settings, requesting to cancel your subscription, or deleting a workspace, it's likely because you're not the billing owner.
122118
If you are a Workspace Admin, you can transfer billing ownership to yourself by following the steps to [transfer billing ownership](LINK).
123119

124120
---
@@ -127,13 +123,13 @@ If you are a Workspace Admin, you can transfer billing ownership to yourself by
127123

128124
## Why don’t I see the option to cancel or delete my workspace?
129125

130-
Only the billing owner can cancel a subscription or delete a workspace. To confirm if you're the billing owner, go to the **Workspaces** tab and check the **Billing owner** column for the relevant workspace.
126+
Only the billing owner can request to cancel a subscription or delete a workspace. To confirm if you're the billing owner, go to the **Workspaces** tab and check the **Billing owner** column for the relevant workspace.
131127

132128
---
133129

134130
## Can I delete a workspace if I’m on an annual subscription?
135131

136-
Only if you’ve been granted early cancellation. Otherwise, you’ll need to either wait for the subscription to end or request early cancellation first.
132+
Only if your subscription has been canceled. Otherwise, you’ll need to either wait for the subscription to end or cancel your subscription first.
137133

138134
---
139135

docs/articles/new-expensify/billing-and-subscriptions/Changing-Your-Workspace-Plan.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ To switch to a different plan:
2323
If you're on an Annual Subscription (a 12-month commitment), you may be eligible for early cancellation and a switch to a free account:
2424

2525
1. Use the **navigation tabs** (on the left on web, and at the bottom on mobile) to go to **Account > Subscription**.
26-
2. Select **Request early cancellation**.
26+
2. Select **Cancel subscription**.
2727
3. Follow the prompts. Your request may be processed automatically or reviewed by our team.
2828

29-
**Note:** Early cancellations are subject to eligibility review.
29+
**Note:** Cancellation requests are subject to eligibility review.
3030

3131
---
3232

ios/NewExpensify/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.3.73.2</string>
47+
<string>9.3.73.4</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.3.73</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.73.2</string>
16+
<string>9.3.73.4</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.3.73</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.73.2</string>
16+
<string>9.3.73.4</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.3.73-2",
3+
"version": "9.3.73-4",
44
"author": "Expensify, Inc.",
55
"homepage": "https://new.expensify.com",
66
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

0 commit comments

Comments
 (0)