From 9bd021cf01f2d404a1a853a9fe0fbd9ce698e8a2 Mon Sep 17 00:00:00 2001
From: jakubstec <kub9stec@gmail.com>
Date: Thu, 11 Jun 2026 11:33:48 +0200
Subject: [PATCH 1/2] fix(android): update reject overrides to use nullable
 code param for RN 0.84+ compatibility

---
 android/src/main/java/com/expensify/wallet/Utils.kt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/src/main/java/com/expensify/wallet/Utils.kt b/android/src/main/java/com/expensify/wallet/Utils.kt
index 6bb09ef..120b8e3 100644
--- a/android/src/main/java/com/expensify/wallet/Utils.kt
+++ b/android/src/main/java/com/expensify/wallet/Utils.kt
@@ -56,21 +56,21 @@ object Utils {
               )
             }
 
-            override fun reject(code: String, userInfo: WritableMap) {
+            override fun reject(code: String?, userInfo: WritableMap) {
               val errorMessage = "Error: $code\nUserInfo: $userInfo"
               continuation.resumeWithException(
                 Exception(errorMessage)
               )
             }
 
-            override fun reject(code: String, message: String?) {
+            override fun reject(code: String?, message: String?) {
               val errorMessage = "Error: $code\nMessage: ${message ?: "No message provided"}"
               continuation.resumeWithException(
                 Exception(errorMessage)
               )
             }
 
-            override fun reject(code: String, message: String?, userInfo: WritableMap) {
+            override fun reject(code: String?, message: String?, userInfo: WritableMap) {
               val errorMessage =
                 "Error: $code\nMessage: ${message ?: "No message provided"}\nUserInfo: $userInfo"
               continuation.resumeWithException(
@@ -78,21 +78,21 @@ object Utils {
               )
             }
 
-            override fun reject(code: String, message: String?, throwable: Throwable?) {
+            override fun reject(code: String?, message: String?, throwable: Throwable?) {
               val errorMessage = "Error: $code\nMessage: ${message ?: "No message provided"}"
               continuation.resumeWithException(
                 throwable ?: Exception(errorMessage)
               )
             }
 
-            override fun reject(code: String, throwable: Throwable?) {
+            override fun reject(code: String?, throwable: Throwable?) {
               val errorMessage = "Error: $code"
               continuation.resumeWithException(
                 throwable ?: Exception(errorMessage)
               )
             }
 
-            override fun reject(code: String, throwable: Throwable?, userInfo: WritableMap) {
+            override fun reject(code: String?, throwable: Throwable?, userInfo: WritableMap) {
               val errorMessage = "Error: $code\nUserInfo: $userInfo"
               continuation.resumeWithException(
                 throwable ?: Exception(errorMessage)

From 29cb036abfbb11639eb0acf68a2ecabb3e3dacf9 Mon Sep 17 00:00:00 2001
From: jakubstec <kub9stec@gmail.com>
Date: Mon, 15 Jun 2026 01:08:43 +0200
Subject: [PATCH 2/2] fix: add code variable fallback

---
 android/src/main/java/com/expensify/wallet/Utils.kt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/src/main/java/com/expensify/wallet/Utils.kt b/android/src/main/java/com/expensify/wallet/Utils.kt
index 120b8e3..34a7646 100644
--- a/android/src/main/java/com/expensify/wallet/Utils.kt
+++ b/android/src/main/java/com/expensify/wallet/Utils.kt
@@ -57,14 +57,14 @@ object Utils {
             }
 
             override fun reject(code: String?, userInfo: WritableMap) {
-              val errorMessage = "Error: $code\nUserInfo: $userInfo"
+              val errorMessage = "Error: ${code ?: "Unknown code"}\nUserInfo: $userInfo"
               continuation.resumeWithException(
                 Exception(errorMessage)
               )
             }
 
             override fun reject(code: String?, message: String?) {
-              val errorMessage = "Error: $code\nMessage: ${message ?: "No message provided"}"
+              val errorMessage = "Error: ${code ?: "Unknown code"}\nMessage: ${message ?: "No message provided"}"
               continuation.resumeWithException(
                 Exception(errorMessage)
               )
@@ -72,28 +72,28 @@ object Utils {
 
             override fun reject(code: String?, message: String?, userInfo: WritableMap) {
               val errorMessage =
-                "Error: $code\nMessage: ${message ?: "No message provided"}\nUserInfo: $userInfo"
+                "Error: ${code ?: "Unknown code"}\nMessage: ${message ?: "No message provided"}\nUserInfo: $userInfo"
               continuation.resumeWithException(
                 Exception(errorMessage)
               )
             }
 
             override fun reject(code: String?, message: String?, throwable: Throwable?) {
-              val errorMessage = "Error: $code\nMessage: ${message ?: "No message provided"}"
+              val errorMessage = "Error: ${code ?: "Unknown code"}\nMessage: ${message ?: "No message provided"}"
               continuation.resumeWithException(
                 throwable ?: Exception(errorMessage)
               )
             }
 
             override fun reject(code: String?, throwable: Throwable?) {
-              val errorMessage = "Error: $code"
+              val errorMessage = "Error: ${code ?: "Unknown code"}"
               continuation.resumeWithException(
                 throwable ?: Exception(errorMessage)
               )
             }
 
             override fun reject(code: String?, throwable: Throwable?, userInfo: WritableMap) {
-              val errorMessage = "Error: $code\nUserInfo: $userInfo"
+              val errorMessage = "Error: ${code ?: "Unknown code"}\nUserInfo: $userInfo"
               continuation.resumeWithException(
                 throwable ?: Exception(errorMessage)
               )