diff --git a/native/package.json b/native/package.json
index 404d1adf6..a219f89a6 100644
--- a/native/package.json
+++ b/native/package.json
@@ -1,122 +1,122 @@
 {
   "name": "native",
   "version": "0.0.1",
   "private": true,
   "license": "BSD-3-Clause",
   "scripts": {
     "clean": "yarn clean-android && yarn clean-ios && rm -rf node_modules/",
-    "clean-android": "cd android && rm -rf build app/build app/.cxx",
+    "clean-android": "rm -rf android/build android/app/build android/app/.cxx",
     "clean-ios": "rm -rf ios/Pods/",
     "clean-all": "yarn clean && rm -rf ~/Library/Developer/Xcode/DerivedData/Comm-*; cd android && (./gradlew clean || true)",
-    "postinstall": "cd ../ && echo '{\"name\": \"olm\", \"version\": \"3.2.4\"}' > ./node_modules/olm/package.json && yarn patch-package && yarn flow-mono create-symlinks native && cd native && yarn jetify && npx pod-patch && cd ios && (pod install || true)",
+    "postinstall": "cd ../ && echo '{\"name\": \"olm\", \"version\": \"3.2.4\"}' > ./node_modules/olm/package.json && yarn patch-package && yarn flow-mono create-symlinks native && cd native && yarn jetify && npx pod-patch && ((cd ios && pod install) || true)",
     "start": "yarn react-native start",
     "dev": "yarn concurrently --names=\"REDUX,METRO\" -c \"bgGreen.bold,bgBlue.bold\" \"yarn redux-devtools\" \"yarn start\"",
     "test": "yarn jest",
     "logfirebase": "adb shell logcat | grep -E -i 'FIRMessagingModule|firebase'",
     "redux-devtools": "redux-devtools --port=8043",
     "codegen-jsi": "flow && babel codegen/src/ -d codegen/dist/ && node codegen/dist",
     "codegen-grpc": "protoc -I=cpp/CommonCpp/grpc/protos --cpp_out=cpp/CommonCpp/grpc/_generated --grpc_out=cpp/CommonCpp/grpc/_generated --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` cpp/CommonCpp/grpc/protos/*.proto && ./scripts/mark-generated.sh"
   },
   "devDependencies": {
     "@babel/cli": "^7.8.4",
     "@babel/core": "^7.13.14",
     "@babel/node": "^7.8.7",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
     "@babel/plugin-proposal-optional-chaining": "^7.13.12",
     "@babel/preset-flow": "^7.9.0",
     "@redux-devtools/cli": "1.0.0-10",
     "babel-jest": "^26.6.3",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-plugin-transform-remove-strict-mode": "0.0.2",
     "comm-react-native-codegen": "npm:react-native-codegen@0.0.7",
     "flow-bin": "^0.158.0",
     "flow-mono-cli": "^1.5.0",
     "flow-typed": "^3.2.1",
     "fs-extra": "^8.1.0",
     "gaxios": "^4.3.2",
     "googleapis": "^89.0.0",
     "jest": "^26.6.3",
     "jetifier": "^1.6.4",
     "jsonwebtoken": "^8.5.1",
     "metro-react-native-babel-preset": "^0.66.2",
     "patch-package": "^6.4.7",
     "pod-patch": "^0.0.9",
     "postinstall-postinstall": "^2.0.0",
     "react-native-codegen": "^0.0.13",
     "react-native-flipper": "^0.98.0",
     "react-test-renderer": "17.0.2",
     "redux-flipper": "^1.4.2",
     "remote-redux-devtools": "git+https://git@github.com/zalmoxisus/remote-redux-devtools.git",
     "remotedev": "git+https://git@github.com/zalmoxisus/remotedev.git",
     "sqlite3": "git+https://github.com/mapbox/node-sqlite3#918052b538b0effe6c4a44c74a16b2749c08a0d2"
   },
   "dependencies": {
     "@commapp/sqlcipher-amalgamation": "^4.4.3-a",
     "@react-native-community/art": "^1.2.0",
     "@react-native-community/async-storage": "^1.6.1",
     "@react-native-community/clipboard": "^1.5.1",
     "@react-native-community/masked-view": "^0.1.10",
     "@react-native-community/netinfo": "^6.0.0",
     "@react-navigation/bottom-tabs": "^5.11.1",
     "@react-navigation/devtools": "^5.1.17",
     "@react-navigation/material-top-tabs": "^5.3.9",
     "@react-navigation/native": "^5.8.9",
     "@react-navigation/stack": "^5.12.8",
     "base-64": "^0.1.0",
     "expo": "43.0.0",
     "expo-haptics": "~11.0.3",
     "expo-image-manipulator": "~10.1.2",
     "expo-media-library": "~13.0.3",
     "expo-secure-store": "~11.0.3",
     "expo-splash-screen": "~0.13.5",
     "find-root": "^1.1.0",
     "invariant": "^2.2.4",
     "lib": "0.0.1",
     "lodash": "^4.17.21",
     "lottie-ios": "3.1.8",
     "lottie-react-native": "^4.0.2",
     "md5": "^2.2.1",
     "olm": "git+https://gitlab.matrix.org/matrix-org/olm.git#v3.2.4",
     "react": "17.0.2",
     "react-native": "0.66.4",
     "react-native-background-upload": "^6.5.1",
     "react-native-camera": "^3.31.0",
     "react-native-dark-mode": "^0.2.0-rc.1",
     "react-native-device-info": "^8.0.7",
     "react-native-exit-app": "^1.1.0",
     "react-native-fast-image": "^8.3.0",
     "react-native-ffmpeg": "^0.4.4",
     "react-native-figma-squircle": "^0.1.2",
     "react-native-firebase": "^5.6.0",
     "react-native-floating-action": "^1.21.0",
     "react-native-fs": "2.15.2",
     "react-native-gesture-handler": "^1.10.3",
     "react-native-in-app-message": "^1.0.2",
     "react-native-keyboard-input": "6.0.1",
     "react-native-keychain": "^8.0.0",
     "react-native-notifications": "git+https://git@github.com/ashoat/react-native-notifications.git",
     "react-native-orientation-locker": "^1.1.6",
     "react-native-progress": "^4.1.2",
     "react-native-reanimated": "^2.3.1",
     "react-native-safe-area-context": "^3.1.9",
     "react-native-safe-area-view": "^2.0.0",
     "react-native-screens": "~3.8.0",
     "react-native-svg": "^12.1.1",
     "react-native-tab-view": "^2.15.2",
     "react-native-vector-icons": "^6.6.0",
     "react-native-video": "~5.1.1",
     "react-redux": "^7.1.1",
     "reactotron-react-native": "^4.0.2",
     "reactotron-redux": "^3.1.1",
     "redux": "^4.0.4",
     "redux-persist": "^6.0.0",
     "redux-thunk": "^2.2.0",
     "reselect": "^4.0.0",
     "shallowequal": "^1.0.2",
     "simple-markdown": "^0.7.2",
     "tinycolor2": "^1.4.1"
   },
   "jest": {
     "preset": "react-native"
   }
 }