diff --git a/Cargo-minimal.lock b/Cargo-minimal.lock
index 1548005e7..415f97e8e 100644
--- a/Cargo-minimal.lock
+++ b/Cargo-minimal.lock
@@ -2825,7 +2825,7 @@ dependencies = [
  "socks",
  "thiserror 2.0.18",
  "tokio",
- "uniffi 0.30.0",
+ "uniffi",
  "uniffi-bindgen-cs",
  "uniffi-dart",
  "url",
@@ -3960,12 +3960,6 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803"
 
-[[package]]
-name = "siphasher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9913c75df657d84a03fa689c016b0bb2863ff0b497b26a8d6e9703f8d5df03a8"
-
 [[package]]
 name = "siphasher"
 version = "1.0.0"
@@ -4757,22 +4751,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 
-[[package]]
-name = "uniffi"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c866f627c3f04c3df068b68bb2d725492caaa539dd313e2a9d26bb85b1a32f4e"
-dependencies = [
- "anyhow",
- "camino",
- "cargo_metadata 0.19.0",
- "clap 4.5.45",
- "uniffi_bindgen 0.30.0",
- "uniffi_core 0.30.0",
- "uniffi_macros 0.30.0",
- "uniffi_pipeline 0.30.0",
-]
-
 [[package]]
 name = "uniffi"
 version = "0.31.2"
@@ -4780,12 +4758,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46eefd5468602930da46b1f49d3448c6dfc2e81295f93120f23f8174fd70267f"
 dependencies = [
  "anyhow",
+ "camino",
  "cargo_metadata 0.19.0",
- "uniffi_bindgen 0.31.2",
+ "clap 4.5.45",
+ "uniffi_bindgen",
  "uniffi_build",
- "uniffi_core 0.31.2",
- "uniffi_macros 0.31.2",
- "uniffi_pipeline 0.31.2",
+ "uniffi_core",
+ "uniffi_macros",
+ "uniffi_pipeline",
 ]
 
 [[package]]
@@ -4805,9 +4785,9 @@ dependencies = [
  "serde_json",
  "textwrap 0.16.0",
  "toml 0.8.0",
- "uniffi_bindgen 0.31.2",
- "uniffi_meta 0.31.2",
- "uniffi_udl 0.31.2",
+ "uniffi_bindgen",
+ "uniffi_meta",
+ "uniffi_udl",
 ]
 
 [[package]]
@@ -4826,37 +4806,11 @@ dependencies = [
  "serde",
  "stringcase 0.4.0",
  "toml 0.8.0",
- "uniffi 0.31.2",
- "uniffi_bindgen 0.31.2",
+ "uniffi",
+ "uniffi_bindgen",
  "uniffi_dart_macro",
 ]
 
-[[package]]
-name = "uniffi_bindgen"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c8ca600167641ebe7c8ba9254af40492dda3397c528cc3b2f511bd23e8541a5"
-dependencies = [
- "anyhow",
- "askama 0.13.0",
- "camino",
- "cargo_metadata 0.19.0",
- "fs-err 2.7.0",
- "glob",
- "goblin",
- "heck 0.5.0",
- "indexmap 2.6.0",
- "once_cell",
- "serde",
- "tempfile",
- "textwrap 0.16.0",
- "toml 0.8.0",
- "uniffi_internal_macros 0.30.0",
- "uniffi_meta 0.30.0",
- "uniffi_pipeline 0.30.0",
- "uniffi_udl 0.30.0",
-]
-
 [[package]]
 name = "uniffi_bindgen"
 version = "0.31.2"
@@ -4877,10 +4831,10 @@ dependencies = [
  "tempfile",
  "textwrap 0.16.0",
  "toml 0.8.0",
- "uniffi_internal_macros 0.31.2",
- "uniffi_meta 0.31.2",
- "uniffi_pipeline 0.31.2",
- "uniffi_udl 0.31.2",
+ "uniffi_internal_macros",
+ "uniffi_meta",
+ "uniffi_pipeline",
+ "uniffi_udl",
 ]
 
 [[package]]
@@ -4891,19 +4845,7 @@ checksum = "744fe15bcd3e2b1712a4573a45ce749af19cf28d69027ca5789619014955668c"
 dependencies = [
  "anyhow",
  "camino",
- "uniffi_bindgen 0.31.2",
-]
-
-[[package]]
-name = "uniffi_core"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e7a5a038ebffe8f4cf91416b154ef3c2468b18e828b7009e01b1b99938089f9"
-dependencies = [
- "anyhow",
- "bytes",
- "once_cell",
- "static_assertions",
+ "uniffi_bindgen",
 ]
 
 [[package]]
@@ -4929,20 +4871,7 @@ dependencies = [
  "quote",
  "stringcase 0.3.0",
  "syn 1.0.74",
- "uniffi 0.31.2",
-]
-
-[[package]]
-name = "uniffi_internal_macros"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c2a6f93e7b73726e2015696ece25ca0ac5a5f1cf8d6a7ab5214dd0a01d2edf"
-dependencies = [
- "anyhow",
- "indexmap 2.6.0",
- "proc-macro2",
- "quote",
- "syn 2.0.87",
+ "uniffi",
 ]
 
 [[package]]
@@ -4958,23 +4887,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "uniffi_macros"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c6309fc36c7992afc03bc0c5b059c656bccbef3f2a4bc362980017f8936141"
-dependencies = [
- "camino",
- "fs-err 2.7.0",
- "once_cell",
- "proc-macro2",
- "quote",
- "serde",
- "syn 2.0.87",
- "toml 0.8.0",
- "uniffi_meta 0.30.0",
-]
-
 [[package]]
 name = "uniffi_macros"
 version = "0.31.2"
@@ -4989,19 +4901,7 @@ dependencies = [
  "serde",
  "syn 2.0.87",
  "toml 0.8.0",
- "uniffi_meta 0.31.2",
-]
-
-[[package]]
-name = "uniffi_meta"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a138823392dba19b0aa494872689f97d0ee157de5852e2bec157ce6de9cdc22"
-dependencies = [
- "anyhow",
- "siphasher 0.3.0",
- "uniffi_internal_macros 0.30.0",
- "uniffi_pipeline 0.30.0",
+ "uniffi_meta",
 ]
 
 [[package]]
@@ -5011,22 +4911,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58d5b94fc92803d21b2928bd15c6f06e57609b95caf98ea561c99cda1b6d2a25"
 dependencies = [
  "anyhow",
- "siphasher 1.0.0",
- "uniffi_internal_macros 0.31.2",
- "uniffi_pipeline 0.31.2",
-]
-
-[[package]]
-name = "uniffi_pipeline"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c27c4b515d25f8e53cc918e238c39a79c3144a40eaf2e51c4a7958973422c29"
-dependencies = [
- "anyhow",
- "heck 0.5.0",
- "indexmap 2.6.0",
- "tempfile",
- "uniffi_internal_macros 0.30.0",
+ "siphasher",
+ "uniffi_internal_macros",
+ "uniffi_pipeline",
 ]
 
 [[package]]
@@ -5039,19 +4926,7 @@ dependencies = [
  "heck 0.5.0",
  "indexmap 2.6.0",
  "tempfile",
- "uniffi_internal_macros 0.31.2",
-]
-
-[[package]]
-name = "uniffi_udl"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0adacdd848aeed7af4f5af7d2f621d5e82531325d405e29463482becfdeafca"
-dependencies = [
- "anyhow",
- "textwrap 0.16.0",
- "uniffi_meta 0.30.0",
- "weedle2",
+ "uniffi_internal_macros",
 ]
 
 [[package]]
@@ -5062,7 +4937,7 @@ checksum = "fc0a1d0a0252ce1af9e8ce78ba67ac0d8937fb2bedaf10cbddd43d3614d06ec6"
 dependencies = [
  "anyhow",
  "textwrap 0.16.0",
- "uniffi_meta 0.31.2",
+ "uniffi_meta",
  "weedle2",
 ]
 
diff --git a/Cargo-recent.lock b/Cargo-recent.lock
index c0910787b..a997aae9e 100644
--- a/Cargo-recent.lock
+++ b/Cargo-recent.lock
@@ -2919,7 +2919,7 @@ dependencies = [
  "socks",
  "thiserror 2.0.18",
  "tokio",
- "uniffi 0.30.0",
+ "uniffi",
  "uniffi-bindgen-cs",
  "uniffi-dart",
  "url",
@@ -4158,12 +4158,6 @@ version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
 
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
 [[package]]
 name = "siphasher"
 version = "1.0.3"
@@ -4899,22 +4893,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
-[[package]]
-name = "uniffi"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c866f627c3f04c3df068b68bb2d725492caaa539dd313e2a9d26bb85b1a32f4e"
-dependencies = [
- "anyhow",
- "camino",
- "cargo_metadata 0.19.2",
- "clap 4.6.1",
- "uniffi_bindgen 0.30.0",
- "uniffi_core 0.30.0",
- "uniffi_macros 0.30.0",
- "uniffi_pipeline 0.30.0",
-]
-
 [[package]]
 name = "uniffi"
 version = "0.31.2"
@@ -4922,12 +4900,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46eefd5468602930da46b1f49d3448c6dfc2e81295f93120f23f8174fd70267f"
 dependencies = [
  "anyhow",
+ "camino",
  "cargo_metadata 0.19.2",
- "uniffi_bindgen 0.31.2",
+ "clap 4.6.1",
+ "uniffi_bindgen",
  "uniffi_build",
- "uniffi_core 0.31.2",
- "uniffi_macros 0.31.2",
- "uniffi_pipeline 0.31.2",
+ "uniffi_core",
+ "uniffi_macros",
+ "uniffi_pipeline",
 ]
 
 [[package]]
@@ -4947,9 +4927,9 @@ dependencies = [
  "serde_json",
  "textwrap",
  "toml 0.9.12+spec-1.1.0",
- "uniffi_bindgen 0.31.2",
- "uniffi_meta 0.31.2",
- "uniffi_udl 0.31.2",
+ "uniffi_bindgen",
+ "uniffi_meta",
+ "uniffi_udl",
 ]
 
 [[package]]
@@ -4968,37 +4948,11 @@ dependencies = [
  "serde",
  "stringcase 0.4.0",
  "toml 0.9.12+spec-1.1.0",
- "uniffi 0.31.2",
- "uniffi_bindgen 0.31.2",
+ "uniffi",
+ "uniffi_bindgen",
  "uniffi_dart_macro",
 ]
 
-[[package]]
-name = "uniffi_bindgen"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c8ca600167641ebe7c8ba9254af40492dda3397c528cc3b2f511bd23e8541a5"
-dependencies = [
- "anyhow",
- "askama 0.13.1",
- "camino",
- "cargo_metadata 0.19.2",
- "fs-err 2.11.0",
- "glob",
- "goblin",
- "heck 0.5.0",
- "indexmap 2.14.0",
- "once_cell",
- "serde",
- "tempfile",
- "textwrap",
- "toml 0.9.12+spec-1.1.0",
- "uniffi_internal_macros 0.30.0",
- "uniffi_meta 0.30.0",
- "uniffi_pipeline 0.30.0",
- "uniffi_udl 0.30.0",
-]
-
 [[package]]
 name = "uniffi_bindgen"
 version = "0.31.2"
@@ -5019,10 +4973,10 @@ dependencies = [
  "tempfile",
  "textwrap",
  "toml 0.9.12+spec-1.1.0",
- "uniffi_internal_macros 0.31.2",
- "uniffi_meta 0.31.2",
- "uniffi_pipeline 0.31.2",
- "uniffi_udl 0.31.2",
+ "uniffi_internal_macros",
+ "uniffi_meta",
+ "uniffi_pipeline",
+ "uniffi_udl",
 ]
 
 [[package]]
@@ -5033,19 +4987,7 @@ checksum = "744fe15bcd3e2b1712a4573a45ce749af19cf28d69027ca5789619014955668c"
 dependencies = [
  "anyhow",
  "camino",
- "uniffi_bindgen 0.31.2",
-]
-
-[[package]]
-name = "uniffi_core"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e7a5a038ebffe8f4cf91416b154ef3c2468b18e828b7009e01b1b99938089f9"
-dependencies = [
- "anyhow",
- "bytes",
- "once_cell",
- "static_assertions",
+ "uniffi_bindgen",
 ]
 
 [[package]]
@@ -5071,20 +5013,7 @@ dependencies = [
  "quote",
  "stringcase 0.3.0",
  "syn 1.0.109",
- "uniffi 0.31.2",
-]
-
-[[package]]
-name = "uniffi_internal_macros"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c2a6f93e7b73726e2015696ece25ca0ac5a5f1cf8d6a7ab5214dd0a01d2edf"
-dependencies = [
- "anyhow",
- "indexmap 2.14.0",
- "proc-macro2",
- "quote",
- "syn 2.0.118",
+ "uniffi",
 ]
 
 [[package]]
@@ -5100,23 +5029,6 @@ dependencies = [
  "syn 2.0.118",
 ]
 
-[[package]]
-name = "uniffi_macros"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c6309fc36c7992afc03bc0c5b059c656bccbef3f2a4bc362980017f8936141"
-dependencies = [
- "camino",
- "fs-err 2.11.0",
- "once_cell",
- "proc-macro2",
- "quote",
- "serde",
- "syn 2.0.118",
- "toml 0.9.12+spec-1.1.0",
- "uniffi_meta 0.30.0",
-]
-
 [[package]]
 name = "uniffi_macros"
 version = "0.31.2"
@@ -5131,19 +5043,7 @@ dependencies = [
  "serde",
  "syn 2.0.118",
  "toml 0.9.12+spec-1.1.0",
- "uniffi_meta 0.31.2",
-]
-
-[[package]]
-name = "uniffi_meta"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a138823392dba19b0aa494872689f97d0ee157de5852e2bec157ce6de9cdc22"
-dependencies = [
- "anyhow",
- "siphasher 0.3.11",
- "uniffi_internal_macros 0.30.0",
- "uniffi_pipeline 0.30.0",
+ "uniffi_meta",
 ]
 
 [[package]]
@@ -5153,22 +5053,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58d5b94fc92803d21b2928bd15c6f06e57609b95caf98ea561c99cda1b6d2a25"
 dependencies = [
  "anyhow",
- "siphasher 1.0.3",
- "uniffi_internal_macros 0.31.2",
- "uniffi_pipeline 0.31.2",
-]
-
-[[package]]
-name = "uniffi_pipeline"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c27c4b515d25f8e53cc918e238c39a79c3144a40eaf2e51c4a7958973422c29"
-dependencies = [
- "anyhow",
- "heck 0.5.0",
- "indexmap 2.14.0",
- "tempfile",
- "uniffi_internal_macros 0.30.0",
+ "siphasher",
+ "uniffi_internal_macros",
+ "uniffi_pipeline",
 ]
 
 [[package]]
@@ -5181,19 +5068,7 @@ dependencies = [
  "heck 0.5.0",
  "indexmap 2.14.0",
  "tempfile",
- "uniffi_internal_macros 0.31.2",
-]
-
-[[package]]
-name = "uniffi_udl"
-version = "0.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0adacdd848aeed7af4f5af7d2f621d5e82531325d405e29463482becfdeafca"
-dependencies = [
- "anyhow",
- "textwrap",
- "uniffi_meta 0.30.0",
- "weedle2",
+ "uniffi_internal_macros",
 ]
 
 [[package]]
@@ -5204,7 +5079,7 @@ checksum = "fc0a1d0a0252ce1af9e8ce78ba67ac0d8937fb2bedaf10cbddd43d3614d06ec6"
 dependencies = [
  "anyhow",
  "textwrap",
- "uniffi_meta 0.31.2",
+ "uniffi_meta",
  "weedle2",
 ]
 
diff --git a/payjoin-ffi/Cargo.toml b/payjoin-ffi/Cargo.toml
index 509062010..96c373ae6 100644
--- a/payjoin-ffi/Cargo.toml
+++ b/payjoin-ffi/Cargo.toml
@@ -34,7 +34,7 @@ serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 thiserror = "2.0.18"
 tokio = { version = "1.52.3", features = ["full"], optional = true }
-uniffi = { version = "0.30.0", features = ["cli"] }
+uniffi = { version = "0.31.2", features = ["cli"] }
 uniffi-bindgen-cs = { git = "https://github.com/NordSecurity/uniffi-bindgen-cs", tag = "v0.11.0+v0.31.0", optional = true }
 uniffi-dart = { git = "https://github.com/Uniffi-Dart/uniffi-dart.git", tag = "v0.2.1+v0.31.2", optional = true }
 url = "2.5.4"
diff --git a/payjoin-ffi/javascript/package-lock.json b/payjoin-ffi/javascript/package-lock.json
index 67d0461b2..59d64f613 100644
--- a/payjoin-ffi/javascript/package-lock.json
+++ b/payjoin-ffi/javascript/package-lock.json
@@ -8,7 +8,8 @@
             "name": "payjoin",
             "version": "0.1.1",
             "dependencies": {
-                "uniffi-bindgen-react-native": "github:spacebear21/uniffi-bindgen-react-native#50229433d02f1a37d34f0bdfe7ea615e9a364142"
+                "@ubjs/core": "^0.31.0-3",
+                "uniffi-bindgen-react-native": "github:spacebear21/uniffi-bindgen-react-native#d10f04d83299"
             },
             "devDependencies": {
                 "@types/node": "25.9.1",
@@ -469,6 +470,12 @@
                 "undici-types": ">=7.24.0 <7.24.7"
             }
         },
+        "node_modules/@ubjs/core": {
+            "version": "0.31.0-3",
+            "resolved": "https://registry.npmjs.org/@ubjs/core/-/core-0.31.0-3.tgz",
+            "integrity": "sha512-39XrJgUZ2VVb561sSnkXPhczNoeBsNiSRArecsV0JE7CJq69ajFkcn9/tBAUS2NpgHkLIDU+z6Ks2+1wXnboxg==",
+            "license": "MPL-2.0"
+        },
         "node_modules/esbuild": {
             "version": "0.28.1",
             "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz",
@@ -583,8 +590,8 @@
             "license": "MIT"
         },
         "node_modules/uniffi-bindgen-react-native": {
-            "version": "0.31.0-2",
-            "resolved": "git+ssh://git@github.com/spacebear21/uniffi-bindgen-react-native.git#50229433d02f1a37d34f0bdfe7ea615e9a364142",
+            "version": "0.31.0-3",
+            "resolved": "git+ssh://git@github.com/spacebear21/uniffi-bindgen-react-native.git#d10f04d83299688d1ed7427841e2c8348a64e4a3",
             "license": "MPL-2.0",
             "bin": {
                 "ubrn": "bin/cli.cjs",
diff --git a/payjoin-ffi/javascript/package.json b/payjoin-ffi/javascript/package.json
index e0ab73cb5..0805956d1 100644
--- a/payjoin-ffi/javascript/package.json
+++ b/payjoin-ffi/javascript/package.json
@@ -43,6 +43,7 @@
         "./web-vite": "./dist/web/vite.index.js"
     },
     "dependencies": {
-        "uniffi-bindgen-react-native": "github:spacebear21/uniffi-bindgen-react-native#50229433d02f1a37d34f0bdfe7ea615e9a364142"
+        "@ubjs/core": "^0.31.0-3",
+        "uniffi-bindgen-react-native": "github:spacebear21/uniffi-bindgen-react-native#d10f04d83299"
     }
 }
diff --git a/payjoin-ffi/javascript/wasm-manifest-patch.toml b/payjoin-ffi/javascript/wasm-manifest-patch.toml
index fbc89c3c6..284d4a5c6 100644
--- a/payjoin-ffi/javascript/wasm-manifest-patch.toml
+++ b/payjoin-ffi/javascript/wasm-manifest-patch.toml
@@ -9,10 +9,10 @@
 # the library and CLI versions causes "unreachable" panics at runtime.
 wasm-bindgen = "=0.2.108"
 
-# uniffi_core 0.30 requires this feature for wasm32 builds to remove the
+# uniffi_core 0.31 requires this feature for wasm32 builds to remove the
 # Send bound on futures, which is not applicable in single-threaded WASM.
 [dependencies.uniffi_core]
-version = "0.30"
+version = "0.31"
 default-features = false
 features = ["wasm-unstable-single-threaded"]