diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index ba2dc70fdd2..9371fed8072 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -6,8 +6,8 @@
   "license": "AGPL-3.0",
   "scripts": {
     "android-dev": "react-native run-android --mode devDebug --appIdSuffix dev",
-    "android-prod-debug": "react-native run-android --variant prodDebug",
-    "android-prod-release": "yarn run android:bundle && react-native run-android --variant prodRelease",
+    "android-prod-debug": "react-native run-android --mode prodDebug",
+    "android-prod-release": "yarn run android:bundle && react-native run-android --mode prodRelease",
     "android:bundle": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/build/intermediates/res/merged/release/",
     "build": "yarn bundle:web && yarn install:pods && yarn android:bundle",
     "clear-cache": "watchman watch-del-all && rm -rf $TMPDIR/react-native-packager-cache-* && rm -rf $TMPDIR/metro-bundler-cache-*",
diff --git a/packages/web/src/javascripts/Hooks/useSafeAreaPadding.ts b/packages/web/src/javascripts/Hooks/useSafeAreaPadding.ts
index e1ef243d4a1..acc44acc464 100644
--- a/packages/web/src/javascripts/Hooks/useSafeAreaPadding.ts
+++ b/packages/web/src/javascripts/Hooks/useSafeAreaPadding.ts
@@ -14,9 +14,9 @@ export const useAvailableSafeAreaPadding = () => {
   const [isKeyboardVisible, setIsKeyboardVisible] = useState(false)
   useEffect(() => {
     return application.addNativeMobileEventListener((event) => {
-      if (event === ReactNativeToWebEvent.KeyboardWillShow) {
+      if (event === ReactNativeToWebEvent.KeyboardWillShow || event === ReactNativeToWebEvent.KeyboardDidShow) {
         setIsKeyboardVisible(true)
-      } else if (event === ReactNativeToWebEvent.KeyboardWillHide) {
+      } else if (event === ReactNativeToWebEvent.KeyboardWillHide || event === ReactNativeToWebEvent.KeyboardDidHide) {
         setIsKeyboardVisible(false)
       }
     })