fix merge conflicts; update pnpm

Author: transphorm

app/package.json

@@ -31,7 +31,6 @@
     "format": "pnpm nice && pnpm fmt:fix",
     "ia": "pnpm install-app",
     "imports:fix": "node ./scripts/alias-imports.cjs",
-    "postinstall": "pnpm exec patch-package --patch-dir ../patches || true",
     "install-app": "pnpm install-app:setup && pnpm clean:xcode-env-local",
     "install-app:mobile-deploy": "pnpm install && pnpm build:deps && pnpm clean:xcode-env-local",
     "install-app:setup": "pnpm install && pnpm build:deps && pnpm setup:android-deps && cd ios && ./scripts/install-ios-deps-if-needed.sh && cd ..",

package.json

@@ -88,7 +88,7 @@
     "tsx": "^4.22.3",
     "typescript": "^5.9.3"
   },
-  "packageManager": "pnpm@11.5.0+sha512.dbfcc4f81cf48597afd4bc391ffdf12c11f1a9fb83a395bfa6b0a2d9cc2fd8ffebafdb1ccbd529632153f793904c2615b7f09fe1a345473fd1c35845172a8eb1",
+  "packageManager": "pnpm@11.5.3+sha512.7ac1c919341c213a34dc0d02afb7143c5c26ac26ee8c4782deea821b8ac64d2134a081fd8941dae6e29bbb48f58dfc2b7fbceeccc07cb2f09d219d342a4969ed",
   "engines": {
     "node": ">=22 <23"
   },

pnpm-lock.yaml

@@ -29,10 +29,12 @@ allowBuilds:
   lmdb: true
   msgpackr-extract: true
   node-forge: true
+  node-forge@https://codeload.github.com/remicolin/forge/tar.gz/17a11a632dd0e50343b3b8393245a2696f78afbb: true
   protobufjs: true
   react-native-inappbrowser-reborn: true
   secp256k1: true
   snarkjs: true
+  snarkjs@https://codeload.github.com/sampritipanda/snarkjs/tar.gz/fef81fc51d17a734637555c6edbd585ecda02d9e: true
   unrs-resolver: true
 
 # @zk-email/relayer-utils pulls in node-pre-gyp-github via a git ref; pnpm 11's