From 38a41bc6737cdbd899ce1cba194be4ac8f52ee91 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 17 Oct 2023 16:37:20 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 app/build.gradle.kts                          | 42 ++++++++-----------
 .../extension/AppExtensionConfigurations.kt   |  1 +
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e6e2daa7a3..1ff2af8354 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,37 +9,28 @@ plugins {
     id("configuration")
 }
 
-configurations {
-    all {
-        exclude(group = "org.bouncycastle", module = "bcprov-jdk15to18")
-        exclude(group = "com.github.komputing.kethereum")
+configurations.all {
+    exclude(group = "org.bouncycastle", module = "bcprov-jdk15to18")
+    exclude(group = "com.github.komputing.kethereum")
 
-        resolutionStrategy {
-            dependencySubstitution {
-                substitute(module("com.facebook.react:react-native"))
-                    .using(module("com.facebook.react:react-android:0.72.4"))
-                    .because(
-                        "The current version of SPR Client (3.6.2) is not compatible with the latest " +
-                            "React Native version"
-                    )
+    resolutionStrategy {
+        dependencySubstitution {
+            substitute(module("com.facebook.react:react-native"))
+                .using(module("com.facebook.react:react-android:0.72.4"))
 
-                substitute(module("com.facebook.react:hermes-engine"))
-                    .using(module("com.facebook.react:hermes-android:0.72.4"))
-                    .because(
-                        "The current version of SPR Client (3.6.2) is not compatible with the latest " +
-                            "Hermes Engine version"
-                    )
-            }
-
-            force(
-                "org.bouncycastle:bcpkix-jdk15on:1.70",
-                "com.facebook.react:react-android:0.72.4",
-                "com.facebook.react:hermes-android:0.72.4",
-            )
+            substitute(module("com.facebook.react:hermes-engine"))
+                .using(module("com.facebook.react:hermes-android:0.72.4"))
         }
+
+        force(
+            "org.bouncycastle:bcpkix-jdk15on:1.70",
+            "com.facebook.react:react-android:0.72.4",
+            "com.facebook.react:hermes-android:0.72.4",
+        )
     }
 }
 
+
 dependencies {
     implementation(files("libs/walletconnect-1.5.6.aar"))
     implementation(project(":domain:legacy"))
@@ -179,6 +170,7 @@ dependencies {
     implementation(deps.walletConnectCore)
     implementation(deps.walletConnectWeb3)
     implementation(deps.prettyLogger)
+    implementation("com.facebook.react:react-android:0.72.4")
     implementation(deps.sprClient) {
         exclude(group = "com.github.stephenc.jcip")
     }
diff --git a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/extension/AppExtensionConfigurations.kt b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/extension/AppExtensionConfigurations.kt
index 1ba8b81a2d..05b2b465c2 100644
--- a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/extension/AppExtensionConfigurations.kt
+++ b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/extension/AppExtensionConfigurations.kt
@@ -76,6 +76,7 @@ private fun AndroidBuildType.configureBuildVariant(extension: AppExtension, buil
         BuildType.External,
         -> {
             initWith(extension.buildTypes.getByName(BuildType.Release.id))
+            matchingFallbacks.add(BuildType.Release.id)
             signingConfig = extension.signingConfigs.getByName(BuildType.Debug.id)
         }
     }