From 37eaef14d90db40d34099e5c9b0c4687bba5ce10 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Mon, 2 Aug 2021 10:42:52 -0700 Subject: [PATCH 1/2] Merge pull request #4368 from Expensify/version-BUILD-cc82f8377c021db5dd52a470f1b045be3415774b (cherry picked from commit 89366788125f2dc5958207241724b1e3acebd138) --- android/app/build.gradle | 4 ++-- ios/ExpensifyCash/Info.plist | 2 +- ios/ExpensifyCashTests/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 250ee25973a4..5feb320ca858 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 1001008200 - versionName "1.0.82-0" + versionCode 1001008201 + versionName "1.0.82-1" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index c43f775c510c..9d3a7ce1c54c 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.82.0 + 1.0.82.1 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index b121d99320e1..46252fa8293a 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.82.0 + 1.0.82.1 diff --git a/package-lock.json b/package-lock.json index 7015b7eef394..ff5d6cb2cf2c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.82-0", + "version": "1.0.82-1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index dd8d39e531d2..7f6d52a4f8cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.82-0", + "version": "1.0.82-1", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From db3c3b653abeb09a825cb4d31b59929401a9bd60 Mon Sep 17 00:00:00 2001 From: Ionatan Wiznia Date: Mon, 2 Aug 2021 11:40:25 -0600 Subject: [PATCH 2/2] Merge pull request #4358 from rushatgabhane/fix-4356 Fix User is able to upload a file larger than 50mb (cherry picked from commit cc82f8377c021db5dd52a470f1b045be3415774b) --- src/components/AttachmentPicker/index.native.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/AttachmentPicker/index.native.js b/src/components/AttachmentPicker/index.native.js index beca94c97e50..db2efe74e535 100644 --- a/src/components/AttachmentPicker/index.native.js +++ b/src/components/AttachmentPicker/index.native.js @@ -50,6 +50,7 @@ function getDataForUpload(fileData) { name: fileData.fileName || fileData.name || 'chat_attachment', type: fileData.type, uri: fileData.uri, + size: fileData.size, }; }