From c66c5b2eee5cbcd3f20a5ac8f870ff41164e425b Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Fri, 11 Jun 2021 12:36:21 -0700 Subject: [PATCH 1/2] Merge pull request #3556 from Expensify/version-BUILD-584183f77615d2e07fe7a0247624cc10fc243cc4 (cherry picked from commit a0e0ad467c315111b3cdd66919769ca9e1acd27c) --- 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 279a5c45298c8..985a814d7ddcb 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -148,8 +148,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001006801 - versionName "1.0.68-1" + versionCode 1001006802 + versionName "1.0.68-2" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index d425a945d978e..db5c11963078b 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.68.1 + 1.0.68.2 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 588ac9c44c257..5d606f393e670 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.68.1 + 1.0.68.2 diff --git a/package-lock.json b/package-lock.json index dc29d642259b8..a706fc144fe79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.68-1", + "version": "1.0.68-2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 37537508e8e3e..b21d8bf4082e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.68-1", + "version": "1.0.68-2", "author": "Expensify, Inc.", "homepage": "https://expensify.cash", "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From f7b3699aaab7a52b990a5fa6a95d0c8a37eb64f5 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Fri, 11 Jun 2021 09:33:07 -1000 Subject: [PATCH 2/2] Merge pull request #3555 from Expensify/Rory-FixHotkeys Add capturing event listeners to the KeyboardShortcut library (cherry picked from commit 584183f77615d2e07fe7a0247624cc10fc243cc4) --- src/libs/KeyboardShortcut/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/KeyboardShortcut/index.js b/src/libs/KeyboardShortcut/index.js index c1496ce9c8153..250fa9c9c3d47 100644 --- a/src/libs/KeyboardShortcut/index.js +++ b/src/libs/KeyboardShortcut/index.js @@ -51,8 +51,8 @@ function bindHandlerToKeyupEvent(event) { } // Make sure we don't add multiple listeners -document.removeEventListener('keydown', bindHandlerToKeyupEvent); -document.addEventListener('keydown', bindHandlerToKeyupEvent); +document.removeEventListener('keydown', bindHandlerToKeyupEvent, {capture: true}); +document.addEventListener('keydown', bindHandlerToKeyupEvent, {capture: true}); /** * Module storing the different keyboard shortcut