diff --git a/.github/workflows/deployExpensifyHelp.yml b/.github/workflows/deployExpensifyHelp.yml index 831ec0c0b95e..5572c3704967 100644 --- a/.github/workflows/deployExpensifyHelp.yml +++ b/.github/workflows/deployExpensifyHelp.yml @@ -51,6 +51,8 @@ jobs: accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} projectName: helpdot directory: ./docs/_site + # Add the conditional on this step to prevent execution for pull requests from forks + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository - name: Setup Cloudflare CLI run: pip3 install cloudflare==2.19.0 diff --git a/android/app/build.gradle b/android/app/build.gradle index e6b32dcd4d4b..e4116d33ba74 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -98,8 +98,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001045200 - versionName "1.4.52-0" + versionCode 1001045301 + versionName "1.4.53-1" } flavorDimensions "default" diff --git a/docs/articles/expensify-classic/copilots-and-delegates/Act-as-a-copilot.md b/docs/articles/expensify-classic/copilots-and-delegates/Act-as-a-copilot.md new file mode 100644 index 000000000000..04bc82a90774 --- /dev/null +++ b/docs/articles/expensify-classic/copilots-and-delegates/Act-as-a-copilot.md @@ -0,0 +1,42 @@ +--- +title: Act as a Copilot +description: How to access another account after being granted Copilot permissions +--- +
+ +After being assigned as a Copilot, you can access the account you’ve been given Copilot permissions to via the Expensify website or the mobile app. + +{% include selector.html values="desktop, mobile" %} + +{% include option.html value="desktop" %} +To switch to Copilot mode, +1. Click your profile icon in the upper left side of the page. +2. In the “Copilot Access” section of the dropdown, choose the account you wish to access. + +The Expensify header will change to blue, and an airplane icon will appear to show that you are in copilot mode. You can return to your own account any time by clicking your profile icon and selecting **Return to your account**. + +{% include end-option.html %} + +{% include option.html value="mobile" %} +To switch to Copilot mode, +1. Tap the menu icon in the top left. +2. Tap your profile icon. +3. Tap **Switch to Copilot Mode** and choose the account. + +An airplane icon will appear to show that you are in copilot mode. To return to your own account, follow the same steps above and select **Return to your account**. + +{% include end-option.html %} + +{% include end-selector.html %} + +# FAQs + +**Can a Copilot’s secondary login be used to forward receipts?** + +Yes, a Copilot can use any of the email addresses tied to their account to forward receipts into the account they are copiloting. To ensure a receipt is routed to the Expensify account you are copiloting instead of your own account, email the receipt to receipts@expensify.com with the email address of the account you are copiloting as the subject line of the email. + +**Can I add another copilot to an account that I’m copiloting?** + +No, only the original account holder can add another Copilot to their account. + +
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 3991493df583..5ac5e5c13af6 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.4.52 + 1.4.53 CFBundleSignature ???? CFBundleURLTypes @@ -40,7 +40,7 @@ CFBundleVersion - 1.4.52.0 + 1.4.53.1 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index c04d2b7d3802..c6f84a5c53a5 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.4.52 + 1.4.53 CFBundleSignature ???? CFBundleVersion - 1.4.52.0 + 1.4.53.1 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 7d5db6a4159b..3f622696676b 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -11,9 +11,9 @@ CFBundleName $(PRODUCT_NAME) CFBundleShortVersionString - 1.4.52 + 1.4.53 CFBundleVersion - 1.4.52.0 + 1.4.53.1 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 5529a99e861d..705ba84bada9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.4.52-0", + "version": "1.4.53-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.4.52-0", + "version": "1.4.53-1", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 1f6e6ce85450..78c13f2768f4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.4.52-0", + "version": "1.4.53-1", "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.", diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index 8c48cbad561f..820937b1eb89 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -330,8 +330,8 @@ const ONYXKEYS = { ADD_DEBIT_CARD_FORM: 'addDebitCardForm', ADD_DEBIT_CARD_FORM_DRAFT: 'addDebitCardFormDraft', WORKSPACE_SETTINGS_FORM: 'workspaceSettingsForm', - WORKSPACE_CATEGORY_CREATE_FORM: 'workspaceCategoryCreate', - WORKSPACE_CATEGORY_CREATE_FORM_DRAFT: 'workspaceCategoryCreateDraft', + WORKSPACE_CATEGORY_FORM: 'workspaceCategoryForm', + WORKSPACE_CATEGORY_FORM_DRAFT: 'workspaceCategoryFormDraft', WORKSPACE_TAG_CREATE_FORM: 'workspaceTagCreate', WORKSPACE_TAG_CREATE_FORM_DRAFT: 'workspaceTagCreateDraft', WORKSPACE_SETTINGS_FORM_DRAFT: 'workspaceSettingsFormDraft', @@ -417,7 +417,7 @@ type AllOnyxKeys = DeepValueOf; type OnyxFormValuesMapping = { [ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM]: FormTypes.AddDebitCardForm; [ONYXKEYS.FORMS.WORKSPACE_SETTINGS_FORM]: FormTypes.WorkspaceSettingsForm; - [ONYXKEYS.FORMS.WORKSPACE_CATEGORY_CREATE_FORM]: FormTypes.WorkspaceCategoryCreateForm; + [ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM]: FormTypes.WorkspaceCategoryForm; [ONYXKEYS.FORMS.WORKSPACE_TAG_CREATE_FORM]: FormTypes.WorkspaceTagCreateForm; [ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM]: FormTypes.WorkspaceRateAndUnitForm; [ONYXKEYS.FORMS.CLOSE_ACCOUNT_FORM]: FormTypes.CloseAccountForm; diff --git a/src/ROUTES.ts b/src/ROUTES.ts index ad2d9c10700b..680c5bced9a9 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -555,7 +555,7 @@ const ROUTES = { }, WORKSPACE_CATEGORY_SETTINGS: { route: 'settings/workspaces/:policyID/categories/:categoryName', - getRoute: (policyID: string, categoryName: string) => `settings/workspaces/${policyID}/categories/${encodeURI(categoryName)}` as const, + getRoute: (policyID: string, categoryName: string) => `settings/workspaces/${policyID}/categories/${encodeURIComponent(categoryName)}` as const, }, WORKSPACE_CATEGORIES_SETTINGS: { route: 'settings/workspaces/:policyID/categories/settings', @@ -569,6 +569,10 @@ const ROUTES = { route: 'settings/workspaces/:policyID/categories/new', getRoute: (policyID: string) => `settings/workspaces/${policyID}/categories/new` as const, }, + WORKSPACE_CATEGORY_EDIT: { + route: 'workspace/:policyID/categories/:categoryName/edit', + getRoute: (policyID: string, categoryName: string) => `workspace/${policyID}/categories/${encodeURI(categoryName)}/edit` as const, + }, WORKSPACE_TAGS: { route: 'settings/workspaces/:policyID/tags', getRoute: (policyID: string) => `settings/workspaces/${policyID}/tags` as const, diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 6c742f08bfb7..7ccb24aa19e5 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -231,6 +231,7 @@ const SCREENS = { SHARE: 'Workspace_Profile_Share', NAME: 'Workspace_Profile_Name', CATEGORY_CREATE: 'Category_Create', + CATEGORY_EDIT: 'Category_Edit', CATEGORY_SETTINGS: 'Category_Settings', CATEGORIES_SETTINGS: 'Categories_Settings', MORE_FEATURES: 'Workspace_More_Features', diff --git a/src/components/AvatarCropModal/AvatarCropModal.tsx b/src/components/AvatarCropModal/AvatarCropModal.tsx index 2998b2258ef1..eac41b6d627a 100644 --- a/src/components/AvatarCropModal/AvatarCropModal.tsx +++ b/src/components/AvatarCropModal/AvatarCropModal.tsx @@ -404,9 +404,8 @@ function AvatarCropModal({imageUri = '', imageName = '', imageType = '', onClose >