From 33d65994f259c7a049c4ab6318b6d2a27df9a029 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Wed, 13 Oct 2021 18:19:41 -0700 Subject: [PATCH 1/2] Merge pull request #5838 from Expensify/version-BUILD-ec48d3526cf738f8b082394baa7c8899dc5fbb23 (cherry picked from commit c9926d910fd3ebe4ebb16d0c7cea43dea0a732c3) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index ac9757b21e59..6a8f5a4d529f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -150,8 +150,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001010715 - versionName "1.1.7-15" + versionCode 1001010716 + versionName "1.1.7-16" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 8aeea8184954..2edf5cebebdc 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.7.15 + 1.1.7.16 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 9f5c8ae7db65..b460baf60e08 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.7.15 + 1.1.7.16 diff --git a/package-lock.json b/package-lock.json index f6fa350230fd..543560726780 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.7-15", + "version": "1.1.7-16", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7622a73d2c22..1aa63fc3d5c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.7-15", + "version": "1.1.7-16", "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.", From d3dfca830145bad469e0a37dbe3def67d56f00a0 Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Wed, 13 Oct 2021 18:17:32 -0700 Subject: [PATCH 2/2] Merge pull request #5829 from Expensify/amal-fix-report-filtering Use showStates in report params so that report state filters work in OldDot (cherry picked from commit ec48d3526cf738f8b082394baa7c8899dc5fbb23) --- src/pages/workspace/bills/WorkspaceBillsFirstSection.js | 3 +-- src/pages/workspace/bills/WorkspaceBillsVBAView.js | 3 +-- src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js | 3 +-- src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js | 3 +-- src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js index c4c618494075..3b2cbdb47c5f 100644 --- a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js +++ b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js @@ -49,8 +49,7 @@ const WorkspaceBillsFirstSection = ({ menuItems={[ { title: translate('workspace.bills.viewAllBills'), - // eslint-disable-next-line max-len - onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"bill","states":{"Open":true,"Processing":true,"Approved":true,"Reimbursed":true,"Archived":true},"isAdvancedFilterMode":true}`), + onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=bill&showStates=Open,Processing,Approved,Reimbursed,Archived&isAdvancedFilterMode=true`), icon: Bill, shouldShowRightIcon: true, iconRight: NewWindow, diff --git a/src/pages/workspace/bills/WorkspaceBillsVBAView.js b/src/pages/workspace/bills/WorkspaceBillsVBAView.js index a69a56b326cb..243aa362cbcf 100644 --- a/src/pages/workspace/bills/WorkspaceBillsVBAView.js +++ b/src/pages/workspace/bills/WorkspaceBillsVBAView.js @@ -30,8 +30,7 @@ const WorkspaceBillsVBAView = ({translate, policyID}) => ( menuItems={[ { title: translate('workspace.common.bills'), - // eslint-disable-next-line max-len - onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"bill","states":{"Open":false,"Processing":true,"Approved":true,"Reimbursed":false,"Archived":false},"isAdvancedFilterMode":true}`), + onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=bill&showStates=Processing,Approved&isAdvancedFilterMode=true`), icon: Bill, shouldShowRightIcon: true, iconRight: NewWindow, diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js index 5f5ebd4ec6e7..73ed6395dfe2 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js +++ b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js @@ -34,8 +34,7 @@ const WorkspaceInvoicesFirstSection = ({translate, policyID}) => ( }, { title: translate('workspace.invoices.viewAllInvoices'), - // eslint-disable-next-line max-len - onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"invoice","states":{"Open":true,"Processing":true,"Approved":true,"Reimbursed":true,"Archived":true},"isAdvancedFilterMode":true}`), + onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=invoice&showStates=Open,Processing,Approved,Reimbursed,Archived&isAdvancedFilterMode=true`), icon: Invoice, shouldShowRightIcon: true, iconRight: NewWindow, diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js b/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js index 821421d4f6de..87674bed4c2b 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js +++ b/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js @@ -30,8 +30,7 @@ const WorkspaceInvoicesVBAView = ({translate, policyID}) => ( menuItems={[ { title: translate('workspace.invoices.viewUnpaidInvoices'), - // eslint-disable-next-line max-len - onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"invoice","states":{"Open":false,"Processing":true,"Approved":false,"Reimbursed":false,"Archived":false},"isAdvancedFilterMode":true}`), + onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=invoice&showStates=Processing&isAdvancedFilterMode=true`), icon: CircleHourglass, shouldShowRightIcon: true, iconRight: NewWindow, diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js b/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js index a1e14b804015..9770a3e99125 100644 --- a/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js +++ b/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js @@ -54,8 +54,7 @@ const WorkspaceReimburseVBAView = ({translate, policyID}) => ( menuItems={[ { title: translate('workspace.reimburse.reimburseReceipts'), - // eslint-disable-next-line max-len - onPress: () => openOldDotLink(`reports?param={"startDate":","endDate":","reportName":","policyID":"${policyID}","from":"all","type":"expense","states":{"Open":false,"Processing":false,"Approved":false,"Reimbursed":false,"Archived":true},"isAdvancedFilterMode":true}`), + onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`), icon: Bank, shouldShowRightIcon: true, iconRight: NewWindow,