Merge branch 'master' into psb

2025-03-13 19:16:52 +01:00 · 2025-01-26 12:28:13 -04:00 · 2025-01-26 12:28:13 -04:00 · 021a1fd352
commit 021a1fd352
parent f6a6d7c41e 49c5e67f45
25 changed files with 3389 additions and 2294 deletions
--- a/.github/workflows/build-release-apk.yml
+++ b/.github/workflows/build-release-apk.yml
@ -4,7 +4,7 @@ on:
  pull_request:
    branches:
      - master
-    types: [opened, synchronize, reopened]
+    types: [opened, synchronize, reopened, labeled, unlabeled]
  push:
    branches:
      - master
@ -102,7 +102,7 @@ jobs:
  browserstack:
    runs-on: ubuntu-latest
    needs: buildReleaseApk
-    if: ${{ github.event_name == 'pull_request' }}
+    if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'browserstack') }}

    steps:
      - name: Checkout code
--- a/1
+++ b/1
@ -6,5 +6,6 @@ gem 'rubyzip', '2.4.1'
 gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
 gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
 gem "fastlane", ">= 2.225.0"
+gem 'xcodeproj', '< 1.26.0'
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -5,7 +5,7 @@ GEM
      base64
      nkf
      rexml
-    activesupport (7.2.2)
+    activesupport (7.2.2.1)
      base64
      benchmark (>= 0.3)
      bigdecimal
@ -25,30 +25,30 @@ GEM
    artifactory (3.0.17)
    atomos (0.1.3)
    aws-eventstream (1.3.0)
-    aws-partitions (1.1002.0)
-    aws-sdk-core (3.212.0)
+    aws-partitions (1.1042.0)
+    aws-sdk-core (3.217.0)
      aws-eventstream (~> 1, >= 1.3.0)
      aws-partitions (~> 1, >= 1.992.0)
      aws-sigv4 (~> 1.9)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.95.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-kms (1.97.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.170.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-sdk-s3 (1.178.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.11.0)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    base64 (0.2.0)
    benchmark (0.4.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
    claide (1.1.0)
-    cocoapods (1.16.2)
+    cocoapods (1.15.2)
      addressable (~> 2.8)
      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.16.2)
+      cocoapods-core (= 1.15.2)
      cocoapods-deintegrate (>= 1.0.3, < 2.0)
      cocoapods-downloader (>= 2.1, < 3.0)
      cocoapods-plugins (>= 1.0.0, < 2.0)
@ -62,8 +62,8 @@ GEM
      molinillo (~> 0.8.0)
      nap (~> 1.0)
      ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.27.0, < 2.0)
-    cocoapods-core (1.16.2)
+      xcodeproj (>= 1.23.0, < 2.0)
+    cocoapods-core (1.15.2)
      activesupport (>= 5.0, < 8)
      addressable (~> 2.8)
      algoliasearch (~> 1.0)
@ -86,8 +86,8 @@ GEM
    colored2 (3.1.2)
    commander (4.6.0)
      highline (~> 2.0.0)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
    declarative (0.0.20)
    digest-crc (0.6.5)
      rake (>= 12.0.0, < 14.0.0)
@ -118,8 +118,8 @@ GEM
    faraday-em_synchrony (1.0.0)
    faraday-excon (1.1.0)
    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
    faraday-net_http (1.0.2)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
@ -127,8 +127,8 @@ GEM
    faraday-retry (1.0.3)
    faraday_middleware (1.2.1)
      faraday (~> 1.0)
-    fastimage (2.3.1)
-    fastlane (2.225.0)
+    fastimage (2.4.0)
+    fastlane (2.226.0)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@ -168,14 +168,14 @@ GEM
      tty-spinner (>= 0.8.0, < 1.0.0)
      word_wrap (~> 1.0.0)
      xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
+      xcpretty (~> 0.4.0)
      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
    fastlane-plugin-browserstack (0.3.3)
      rest-client (~> 2.0, >= 2.0.2)
    fastlane-plugin-bugsnag_sourcemaps_upload (0.2.0)
    fastlane-sirp (1.0.0)
      sysrandom (~> 1.0)
-    ffi (1.17.0)
+    ffi (1.17.1)
    fourflusher (2.3.1)
    fuzzy_match (2.0.4)
    gh_inspector (1.1.3)
@ -217,34 +217,34 @@ GEM
      signet (>= 0.16, < 2.a)
    highline (2.0.3)
    http-accept (1.7.0)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    i18n (1.14.6)
+    i18n (1.14.7)
      concurrent-ruby (~> 1.0)
    jmespath (1.6.2)
-    json (2.8.1)
-    jwt (2.9.3)
+    json (2.9.1)
+    jwt (2.10.1)
      base64
-    logger (1.6.1)
+    logger (1.6.5)
    mime-types (3.6.0)
      logger
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1105)
+    mime-types-data (3.2025.0107)
    mini_magick (4.13.2)
    mini_mime (1.1.5)
-    minitest (5.25.1)
+    minitest (5.25.4)
    molinillo (0.8.0)
    multi_json (1.15.0)
    multipart-post (2.4.1)
-    nanaimo (0.4.0)
+    nanaimo (0.3.0)
    nap (1.1.0)
    naturally (2.2.1)
    netrc (0.11.0)
    nkf (0.2.0)
-    optparse (0.5.0)
+    optparse (0.6.0)
    os (1.1.4)
-    plist (3.7.1)
+    plist (3.7.2)
    public_suffix (4.0.7)
    rake (13.2.1)
    representable (3.2.0)
@ -257,12 +257,12 @@ GEM
      mime-types (>= 1.16, < 4.0)
      netrc (~> 0.8)
    retriable (3.1.2)
-    rexml (3.3.9)
-    rouge (2.0.7)
+    rexml (3.4.0)
+    rouge (3.28.0)
    ruby-macho (2.5.1)
    ruby2_keywords (0.0.5)
    rubyzip (2.4.1)
-    securerandom (0.3.1)
+    securerandom (0.4.1)
    security (0.1.5)
    signet (0.19.0)
      addressable (~> 2.8)
@ -288,15 +288,15 @@ GEM
    uber (0.1.0)
    unicode-display_width (2.6.0)
    word_wrap (1.0.0)
-    xcodeproj (1.27.0)
+    xcodeproj (1.25.1)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
      colored2 (~> 3.1)
-      nanaimo (~> 0.4.0)
+      nanaimo (~> 0.3.0)
      rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+    xcpretty (0.4.0)
+      rouge (~> 3.28.0)
    xcpretty-travis-formatter (1.0.1)
      xcpretty (~> 0.2, >= 0.0.7)

@ -310,9 +310,10 @@ DEPENDENCIES
  fastlane-plugin-browserstack
  fastlane-plugin-bugsnag_sourcemaps_upload
  rubyzip (= 2.4.1)
+  xcodeproj (< 1.26.0)

 RUBY VERSION
   ruby 3.1.6p260

 BUNDLED WITH
-   2.5.18
+   2.3.27
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -83,7 +83,7 @@ android {
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
        versionCode 1
-        versionName "7.0.8"
+        versionName "7.0.9"
        testBuildType System.getProperty('testBuildType', 'debug')
        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
    }
--- a/android/app/src/main/assets/fiatUnits.json
+++ b/android/app/src/main/assets/fiatUnits.json
@ -293,6 +293,13 @@
        "symbol": "zł",
        "country": "Poland (Polish Zloty)"
    },
+    "PYG": {
+        "endPointKey": "PYG",
+        "locale": "es-PY",
+        "source": "CoinDesk",
+        "symbol": "₲",
+        "country": "Paraguay (Paraguayan Guarani)"
+    },
    "QAR": {
        "endPointKey": "QAR",
        "locale": "ar-QA",
--- a/android/app/src/main/java/io/bluewallet/bluewallet/MainApplication.kt
+++ b/android/app/src/main/java/io/bluewallet/bluewallet/MainApplication.kt
@ -12,6 +12,7 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
 import com.facebook.soloader.SoLoader
 import com.facebook.react.modules.i18nmanager.I18nUtil

@ -50,8 +51,7 @@ class MainApplication : Application(), ReactApplication {
        sharedPref.registerOnSharedPreferenceChangeListener(preferenceChangeListener)
        val sharedI18nUtilInstance = I18nUtil.getInstance()
        sharedI18nUtilInstance.allowRTL(applicationContext, true)
-        SoLoader.init(this, /* native exopackage */ false)
-
+        SoLoader.init(this, OpenSourceMergedSoMapping)
        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
            // If you opted-in for the New Architecture, we load the native entry point for this app.
            load()
--- a/android/build.gradle
+++ b/android/build.gradle
@ -3,8 +3,8 @@
 buildscript {
    ext {
        minSdkVersion = 24
-        buildToolsVersion = "34.0.0"
-        compileSdkVersion = 34
+        buildToolsVersion = "35.0.0"
+        compileSdkVersion = 35
        targetSdkVersion = 34
        googlePlayServicesVersion = "16.+"
        googlePlayServicesIidVersion = "16.0.1"
@ -58,8 +58,8 @@ subprojects {
    afterEvaluate {project ->
        if (project.hasProperty("android")) {
            android {
-                buildToolsVersion "34.0.0"
-                compileSdkVersion 34
+                buildToolsVersion "35.0.0"
+                compileSdkVersion 35
                 defaultConfig {
                    minSdkVersion 24
                }
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/android/gradlew
+++ b/android/gradlew
@ -86,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@ -248,4 +249,4 @@ eval "set -- $(
        tr '\n' ' '
    )" '"$@"'

-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"
--- a/android/gradlew.bat
+++ b/android/gradlew.bat
@ -1,94 +1,94 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/blue_modules/react-native-bw-file-access/ios/BwFileAccess.xcodeproj/project.pbxproj
+++ b/blue_modules/react-native-bw-file-access/ios/BwFileAccess.xcodeproj/project.pbxproj
@ -157,7 +157,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
@ -209,7 +209,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
--- a/components/ManageWalletsListItem.tsx
+++ b/components/ManageWalletsListItem.tsx
@ -1,5 +1,5 @@
 import React, { useCallback, useState } from 'react';
-import { View, StyleSheet, ViewStyle, TouchableOpacity, ActivityIndicator } from 'react-native';
+import { View, StyleSheet, ViewStyle, TouchableOpacity, ActivityIndicator, Platform } from 'react-native';
 import { Icon, ListItem } from '@rneui/base';
 import { ExtendedTransaction, LightningTransaction, TWallet } from '../class/wallets/types';
 import { WalletCarouselItem } from './WalletsCarousel';
@ -66,7 +66,7 @@ const RightSwipeContent: React.FC<Partial<SwipeContentProps>> = ({ onPress }) =>
    accessibilityRole="button"
    accessibilityLabel="Delete Wallet"
  >
-    <Icon name="delete-outline" color="#FFFFFF" />
+    <Icon name={Platform.OS === 'android' ? 'delete' : 'delete-outline'} color="#FFFFFF" />
  </TouchableOpacity>
 );

--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@ -128,18 +128,18 @@ end

        You can test it on the following devices:
        
-        - [Google Pixel 9 (Android 15)](https://app-live.browserstack.com/dashboard#os=android&os_version=15.0&device=Google+Pixel+8&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true)
-        - [Google Pixel 8 (Android 14)](https://app-live.browserstack.com/dashboard#os=android&os_version=14.0&device=Google+Pixel+8&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true)
-        - [Google Pixel 7 (Android 13)](https://app-live.browserstack.com/dashboard#os=android&os_version=13.0&device=Google+Pixel+7&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true)
-        - [Google Pixel 5 (Android 12)](https://app-live.browserstack.com/dashboard#os=android&os_version=12.0&device=Google+Pixel+5&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true)
-        - [Google Pixel 3a (Android 9)](https://app-live.browserstack.com/dashboard#os=android&os_version=9.0&device=Google+Pixel+3a&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true)
+        - [Google Pixel 9 (Android 15)](https://app-live.browserstack.com/dashboard#os=android&os_version=15.0&device=Google+Pixel+8&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true&browser=chrome)
+        - [Google Pixel 8 (Android 14)](https://app-live.browserstack.com/dashboard#os=android&os_version=14.0&device=Google+Pixel+8&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true&browser=chrome)
+        - [Google Pixel 7 (Android 13)](https://app-live.browserstack.com/dashboard#os=android&os_version=13.0&device=Google+Pixel+7&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true&browser=chrome)
+        - [Google Pixel 5 (Android 12)](https://app-live.browserstack.com/dashboard#os=android&os_version=12.0&device=Google+Pixel+5&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true&browser=chrome)
+        - [Google Pixel 3a (Android 9)](https://app-live.browserstack.com/dashboard#os=android&os_version=9.0&device=Google+Pixel+3a&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true&browser=chrome)
        
-        - [Samsung Galaxy Z Fold 6 (Android 14)](https://app-live.browserstack.com/dashboard#os=android&os_version=14.0&device=Samsung+Galaxy+Z+Fold+6&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true)
-        - [Samsung Galaxy Z Fold 5 (Android 13)](https://app-live.browserstack.com/dashboard#os=android&os_version=13.0&device=Samsung+Galaxy+Z+Fold+5&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true)
-        - [Samsung Galaxy Tab S9 (Android 13)](https://app-live.browserstack.com/dashboard#os=android&os_version=13.0&device=Samsung+Galaxy+Tab+S9&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true)
-        - [Samsung Galaxy Note 9 (Android 8.1)](https://app-live.browserstack.com/dashboard#os=android&os_version=8.1&device=Samsung+Galaxy+Note+9&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true)
+        - [Samsung Galaxy Z Fold 6 (Android 14)](https://app-live.browserstack.com/dashboard#os=android&os_version=14.0&device=Samsung+Galaxy+Z+Fold+6&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true&browser=chrome)
+        - [Samsung Galaxy Z Fold 5 (Android 13)](https://app-live.browserstack.com/dashboard#os=android&os_version=13.0&device=Samsung+Galaxy+Z+Fold+5&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true&browser=chrome)
+        - [Samsung Galaxy Tab S9 (Android 13)](https://app-live.browserstack.com/dashboard#os=android&os_version=13.0&device=Samsung+Galaxy+Tab+S9&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true&browser=chrome)
+        - [Samsung Galaxy Note 9 (Android 8.1)](https://app-live.browserstack.com/dashboard#os=android&os_version=8.1&device=Samsung+Galaxy+Note+9&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true&browser=chrome)

-        - [OnePlus 11R (Android 13)](https://app-live.browserstack.com/dashboard#os=android&os_version=13.0&device=OnePlus+11R&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true)
+        - [OnePlus 11R (Android 13)](https://app-live.browserstack.com/dashboard#os=android&os_version=13.0&device=OnePlus+11R&app_hashed_id=#{browserstack_hashed_id}&scale_to_fit=true&speed=1&start=true&browser=chrome)
        **Filename**: [#{apk_filename}](#{apk_download_url})
        **BrowserStack App URL**: #{app_url}
      COMMENT
--- a/ios/BlueWallet.xcodeproj/project.pbxproj
+++ b/ios/BlueWallet.xcodeproj/project.pbxproj
@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 77;
+	objectVersion = 63;
 	objects = {

 /* Begin PBXBuildFile section */
@ -993,6 +993,7 @@
 				};
 			};
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "BlueWallet" */;
+			compatibilityVersion = "Xcode 15.3";
 			developmentRegion = en_US;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@ -1029,7 +1030,6 @@
 				6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */,
 				B41B76832B66B2FF002C48D5 /* XCRemoteSwiftPackageReference "bugsnag-cocoa" */,
 			);
-			preferredProjectObjectVersion = 77;
 			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@ -1453,7 +1453,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1703136999;
+				CURRENT_PROJECT_VERSION = 1703137999;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = A7W54YZ4WU;
@ -1516,7 +1516,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1703136999;
+				CURRENT_PROJECT_VERSION = 1703137999;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = A7W54YZ4WU;
@ -1575,7 +1575,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1703136999;
+				CURRENT_PROJECT_VERSION = 1703137999;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "";
@ -1618,7 +1618,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1703136999;
+				CURRENT_PROJECT_VERSION = 1703137999;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
@ -1662,7 +1662,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1703136999;
+				CURRENT_PROJECT_VERSION = 1703137999;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "";
@ -1718,7 +1718,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1703136999;
+				CURRENT_PROJECT_VERSION = 1703137999;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
@ -1905,7 +1905,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1703136999;
+				CURRENT_PROJECT_VERSION = 1703137999;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "";
@ -1958,7 +1958,7 @@
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1703136999;
+				CURRENT_PROJECT_VERSION = 1703137999;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
@ -2010,7 +2010,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1703136999;
+				CURRENT_PROJECT_VERSION = 1703137999;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "";
@ -2059,7 +2059,7 @@
 				"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1703136999;
+				CURRENT_PROJECT_VERSION = 1703137999;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
--- a/ios/Podfile
+++ b/ios/Podfile
@ -6,8 +6,8 @@ def node_require(script)
      {paths: [process.argv[1]]},
    )", __dir__]).strip
 end
-
-min_ios_version_supported = '14.0'
+ENV['RCT_NEW_ARCH_ENABLED'] = '0'
+min_ios_version_supported = '15.1'
 node_require('react-native/scripts/react_native_pods.rb')
 node_require('react-native-permissions/scripts/setup.rb')

@ -54,7 +54,7 @@ post_install do |installer|
  )
  installer.pods_project.targets.each do |target|
    target.build_configurations.each do |config|
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.1'
      
      if ['React-Core-AccessibilityResources'].include? target.name 
        config.build_settings['CODE_SIGN_STYLE'] = "Manual"
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
--- a/loc/en.json
+++ b/loc/en.json
@ -10,7 +10,6 @@
    "never": "Never",
    "of": "{number} of {total}",
    "ok": "OK",
-    "customize": "Customize",
    "enter_url": "Enter URL",
    "storage_is_encrypted": "Your storage is encrypted. Password is required to decrypt it.",
    "yes": "Yes",
@ -403,7 +402,7 @@
    "add_wallet_name": "Name",
    "add_wallet_type": "Type",
    "add_wallet_seed_length": "Seed Length",
-    "add_wallet_seed_length_message": "Choose the length of the seed phrase you wish to use for this wallet.",
+    "add_wallet_seed_length_message": "Seed phrase length",
    "add_wallet_seed_length_12": "12 words",
    "add_wallet_seed_length_24": "24 words",
    "clipboard_bitcoin": "You have a Bitcoin address on your clipboard. Would you like to use it for a transaction?",
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,20 +1,21 @@
 {
  "name": "bluewallet",
-  "version": "7.0.8",
+  "version": "7.0.9",
  "license": "MIT",
  "repository": {
    "type": "git",
    "url": "https://github.com/BlueWallet/BlueWallet.git"
  },
  "devDependencies": {
-    "@babel/core": "^7.20.0",
-    "@babel/runtime": "^7.20.0",
+    "@babel/core": "^7.26.0",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/runtime": "^7.26.0",
    "@jest/reporters": "^27.5.1",
-    "@react-native/babel-preset": "^0.75.4",
-    "@react-native/eslint-config": "^0.76.0",
-    "@react-native/js-polyfills": "^0.75.4",
-    "@react-native/metro-babel-transformer": "^0.75.4",
-    "@react-native/typescript-config": "^0.75.4",
+    "@react-native/babel-preset": "0.76.6",
+    "@react-native/eslint-config": "^0.76.6",
+    "@react-native/js-polyfills": "^0.76.6",
+    "@react-native/metro-babel-transformer": "^0.76.6",
+    "@react-native/typescript-config": "0.76.6",
    "@types/bip38": "^3.1.2",
    "@types/bs58check": "^2.1.0",
    "@types/create-hash": "^1.2.2",
@ -40,6 +41,7 @@
    "eslint-plugin-react-native": "^4.1.0",
    "jest": "^29.6.3",
    "jest-environment-node": "^29.7.0",
+    "metro-react-native-babel-preset": "0.76.8",
    "node-fetch": "^2.6.7",
    "prettier": "^3.2.5",
    "react-test-renderer": "18.3.1",
@ -77,6 +79,9 @@
    "@babel/preset-env": "7.25.8",
    "@bugsnag/react-native": "8.1.3",
    "@bugsnag/source-maps": "2.3.3",
+    "@react-native-community/cli": "15.0.1",
+    "@react-native-community/cli-platform-android": "15.0.1",
+    "@react-native-community/cli-platform-ios": "15.0.1",
    "@keystonehq/bc-ur-registry": "0.7.0",
    "@lodev09/react-native-true-sheet": "github:BlueWallet/react-native-true-sheet#c6fee8925120d94328dc2aace45d4fa0a111d57f",
    "@ngraveio/bc-ur": "1.1.13",
@ -85,8 +90,8 @@
    "@react-native-clipboard/clipboard": "1.16.1",
    "@react-native-community/push-notification-ios": "1.11.0",
    "@react-native-menu/menu": "https://github.com/BlueWallet/menu.git#14bab79",
-    "@react-native/gradle-plugin": "0.75.4",
-    "@react-native/metro-config": "0.75.4",
+    "@react-native/gradle-plugin": "0.76.6",
+    "@react-native/metro-config": "0.76.6",
    "@react-navigation/drawer": "6.7.2",
    "@react-navigation/native": "6.1.18",
    "@react-navigation/native-stack": "6.11.0",
@ -124,13 +129,13 @@
    "prop-types": "15.8.1",
    "react": "18.3.1",
    "react-localization": "github:BlueWallet/react-localization#ae7969a",
-    "react-native": "0.75.4",
+    "react-native": "0.76.6",
    "react-native-biometrics": "3.0.1",
    "react-native-blue-crypto": "github:BlueWallet/react-native-blue-crypto#3cb5442",
    "react-native-camera-kit": "14.1.0",
    "react-native-crypto": "2.2.0",
    "react-native-default-preference": "https://github.com/BlueWallet/react-native-default-preference.git#6338a1f1235e4130b8cfc2dd3b53015eeff2870c",
-    "react-native-device-info": "13.2.0",
+    "react-native-device-info": "14.0.0",
    "react-native-document-picker": "9.3.1",
    "react-native-draglist": "github:BlueWallet/react-native-draglist#a4af02f",
    "react-native-fs": "2.20.0",
@ -145,7 +150,7 @@
    "react-native-permissions": "5.2.4",
    "react-native-prompt-android": "github:BlueWallet/react-native-prompt-android#ed168d66fed556bc2ed07cf498770f058b78a376",
    "react-native-push-notification": "8.1.1",
-    "react-native-qrcode-svg": "6.3.2",
+    "react-native-qrcode-svg": "6.3.12",
    "react-native-quick-actions": "0.3.13",
    "react-native-randombytes": "3.6.1",
    "react-native-rate": "1.2.12",
@ -162,7 +167,7 @@
    "readable-stream": "3.6.2",
    "realm": "20.1.0",
    "rn-nodeify": "10.3.0",
-    "rn-qr-generator": "https://github.com/BlueWallet/rn-qr-generator.git#eacee6d6546eb5b43bfd257255d0a7aa3bd90165",
+    "rn-qr-generator": "https://github.com/BlueWallet/rn-qr-generator.git#731ed8eb445f65f3a659632232e18ff7e1ce56d6",
    "scryptsy": "2.1.0",
    "silent-payments": "github:BlueWallet/SilentPayments#7ac4d17",
    "slip39": "https://github.com/BlueWallet/slip39-js#d316ee6",
--- a/screen/send/psbtMultisigQRCode.js
+++ b/screen/send/psbtMultisigQRCode.js
@ -13,7 +13,7 @@ import { useTheme } from '../../components/themes';
 import loc from '../../loc';

 const PsbtMultisigQRCode = () => {
-  const { navigate } = useNavigation();
+  const navigation = useNavigation();
  const { colors } = useTheme();
  const openScannerButton = useRef();
  const { params } = useRoute();
@ -55,21 +55,22 @@ const PsbtMultisigQRCode = () => {
        presentAlert({ message: loc.wallets.import_error });
      } else {
        // psbt base64?
-        navigate({ name: 'PsbtMultisig', params: { receivedPSBTBase64: ret.data }, merge: true });
+        navigation.navigate({ name: 'PsbtMultisig', params: { receivedPSBTBase64: ret.data }, merge: true });
      }
    },
-    [navigate],
+    [navigation],
  );

  useEffect(() => {
    const data = params.onBarScanned;
    if (data) {
      onBarScanned({ data });
+      navigation.setParams({ onBarScanned: undefined });
    }
-  }, [onBarScanned, params.onBarScanned]);
+  }, [onBarScanned, params.onBarScanned, navigation]);

  const openScanner = () => {
-    navigate('ScanQRCode', {
+    navigation.navigate('ScanQRCode', {
      showFileImportButton: true,
    });
  };
--- a/screen/wallets/Add.tsx
+++ b/screen/wallets/Add.tsx
@ -105,7 +105,7 @@ const WalletsAdd: React.FC = () => {
  const colorScheme = useColorScheme();
  //
  const { addWallet, saveToDisk } = useStorage();
-  const { entropy: entropyHex } = useRoute<RouteProps>().params || {};
+  const { entropy: entropyHex, words } = useRoute<RouteProps>().params || {};
  const entropy = entropyHex ? Buffer.from(entropyHex, 'hex') : undefined;
  const { navigate, goBack, setOptions, setParams } = useExtendedNavigation<NavigationProps>();
  const stylesHook = {
@ -132,7 +132,7 @@ const WalletsAdd: React.FC = () => {

  const entropyButtonText = useMemo(() => {
    if (!entropy) {
-      return loc.wallets.add_entropy_provide;
+      return loc.wallets.add_wallet_seed_length_message;
    }
    return loc.formatString(loc.wallets.add_entropy_bytes, {
      bytes: entropy?.length,
@ -141,7 +141,7 @@ const WalletsAdd: React.FC = () => {

  const confirmResetEntropy = useCallback(
    (newWalletType: ButtonSelected) => {
-      if (entropy) {
+      if (entropy || words) {
        Alert.alert(
          loc.wallets.add_entropy_reset_title,
          loc.wallets.add_entropy_reset_message,
@ -154,7 +154,7 @@ const WalletsAdd: React.FC = () => {
              text: loc._.ok,
              style: 'destructive',
              onPress: () => {
-                setParams({ entropy: undefined });
+                setParams({ entropy: undefined, words: undefined });
                setSelectedWalletType(newWalletType);
              },
            },
@ -166,44 +166,9 @@ const WalletsAdd: React.FC = () => {
        setSelectedWalletType(newWalletType);
      }
    },
-    [entropy, setParams],
+    [entropy, setParams, words],
  );

-  const navigateToEntropy = useCallback(() => {
-    Alert.alert(
-      loc.wallets.add_wallet_seed_length,
-      loc.wallets.add_wallet_seed_length_message,
-      [
-        {
-          text: loc._.cancel,
-          onPress: () => {},
-          style: 'cancel',
-        },
-        {
-          text: loc.settings.electrum_reset,
-          onPress: () => {
-            confirmResetEntropy(ButtonSelected.ONCHAIN);
-          },
-          style: 'destructive',
-        },
-        {
-          text: loc.wallets.add_wallet_seed_length_12,
-          onPress: () => {
-            navigate('ProvideEntropy', { words: 12, entropy: entropy?.toString('hex') });
-          },
-          style: 'default',
-        },
-        {
-          text: loc.wallets.add_wallet_seed_length_24,
-          onPress: () => {
-            navigate('ProvideEntropy', { words: 24, entropy: entropy?.toString('hex') });
-          },
-        },
-      ],
-      { cancelable: true },
-    );
-  }, [confirmResetEntropy, entropy, navigate]);
-
  const toolTipActions = useMemo(() => {
    const walletSubactions: Action[] = [
      {
@ -239,21 +204,35 @@ const WalletsAdd: React.FC = () => {
      displayInline: true,
    };

-    const entropyAction = {
+    const entropySubActions: Action[] = [
+      {
+        id: '12_words',
+        text: loc.wallets.add_wallet_seed_length_12,
+        menuState: words === 12,
+      },
+      {
+        id: '24_words',
+        text: loc.wallets.add_wallet_seed_length_24,
+        menuState: words === 24,
+      },
+      { ...CommonToolTipActions.ResetToDefault, hidden: !entropy },
+    ];
+
+    const entropyAction: Action = {
      ...CommonToolTipActions.Entropy,
      text: entropyButtonText,
-      menuState: !!entropy,
+      subactions: entropySubActions,
    };

    const entropyActions: Action = {
      id: 'entropy',
-      text: loc._.customize,
+      text: loc.wallets.add_entropy_provide,
      subactions: [entropyAction],
      displayInline: true,
    };

    return selectedWalletType === ButtonSelected.ONCHAIN ? [walletAction, entropyActions] : [walletAction];
-  }, [entropy, entropyButtonText, selectedIndex, selectedWalletType]);
+  }, [selectedWalletType, selectedIndex, entropy, words, entropyButtonText]);

  const handleOnLightningButtonPressed = useCallback(() => {
    confirmResetEntropy(ButtonSelected.OFFCHAIN);
@ -272,14 +251,18 @@ const WalletsAdd: React.FC = () => {
            setSelectedIndex(2);
          } else if (id === LightningCustodianWallet.type) {
            handleOnLightningButtonPressed();
-          } else if (id === CommonToolTipActions.Entropy.id) {
-            navigateToEntropy();
+          } else if (id === '12_words') {
+            navigate('ProvideEntropy', { words: 12, entropy: entropy?.toString('hex') });
+          } else if (id === '24_words') {
+            navigate('ProvideEntropy', { words: 24, entropy: entropy?.toString('hex') });
+          } else if (id === CommonToolTipActions.ResetToDefault.id) {
+            confirmResetEntropy(ButtonSelected.ONCHAIN);
          }
        }}
        actions={toolTipActions}
      />
    ),
-    [handleOnLightningButtonPressed, navigateToEntropy, toolTipActions],
+    [handleOnLightningButtonPressed, toolTipActions, entropy, confirmResetEntropy, navigate],
  );

  useEffect(() => {
@ -287,7 +270,7 @@ const WalletsAdd: React.FC = () => {
      headerRight: () => HeaderRight,
      statusBarStyle: Platform.select({ ios: 'light', default: colorScheme === 'dark' ? 'light' : 'dark' }),
    });
-  }, [HeaderRight, colorScheme, colors.foregroundColor, navigateToEntropy, setOptions, toolTipActions]);
+  }, [HeaderRight, colorScheme, colors.foregroundColor, setOptions, toolTipActions]);

  useEffect(() => {
    getLNDHub()
--- a/screen/wallets/ExportMultisigCoordinationSetup.tsx
+++ b/screen/wallets/ExportMultisigCoordinationSetup.tsx
@ -1,6 +1,6 @@
 import { RouteProp, useFocusEffect, useNavigation, useRoute } from '@react-navigation/native';
 import React, { useCallback, useMemo, useReducer, useRef } from 'react';
-import { ActivityIndicator, InteractionManager, ScrollView, StyleSheet, TextInput, View } from 'react-native';
+import { ActivityIndicator, InteractionManager, ScrollView, StyleSheet, Text, View } from 'react-native';
 import { BlueSpacing20, BlueText } from '../../BlueComponents';
 import { TWallet } from '../../class/wallets/types';
 import { DynamicQRCode } from '../../components/DynamicQRCode';
@ -178,9 +178,9 @@ const ExportMultisigCoordinationSetup: React.FC = () => {
      )}

      <BlueSpacing20 />
-      <TextInput multiline editable={false} style={[styles.secret, stylesHook.secret]}>
+      <Text selectable style={[styles.secret, stylesHook.secret]}>
        {xpub}
-      </TextInput>
+      </Text>
    </>
  ) : null;

--- a/screen/wallets/ProvideEntropy.tsx
+++ b/screen/wallets/ProvideEntropy.tsx
@ -326,7 +326,7 @@ const ProvideEntropy = () => {
            /* Convert Buffer to hex string before navigating as React Navigation
              does not support passing Buffer objects between screens
            */
-            navigation.navigate('AddWallet', { entropy: buf.toString('hex') });
+            navigation.navigate('AddWallet', { entropy: buf.toString('hex'), words });
          },
          style: 'default',
        },
--- a/scripts/build-release-apk.sh
+++ b/scripts/build-release-apk.sh
@ -25,4 +25,4 @@ mv ./app/build/outputs/apk/release/app-release-unsigned.apk "./app/build/outputs
 echo wheres waldo?
 find $ANDROID_HOME | grep apksigner | grep -v jar

-$ANDROID_HOME/build-tools/34.0.0/apksigner sign --ks ./bluewallet-release-key.keystore --ks-pass=pass:$KEYSTORE_PASSWORD "./app/build/outputs/apk/release/BlueWallet-${VERSION_NAME}($BUILD_NUMBER).apk"
+$ANDROID_HOME/build-tools/35.0.0/apksigner sign --ks ./bluewallet-release-key.keystore --ks-pass=pass:$KEYSTORE_PASSWORD "./app/build/outputs/apk/release/BlueWallet-${VERSION_NAME}($BUILD_NUMBER).apk"
--- a/tests/e2e/detox-build-release-apk.sh
+++ b/tests/e2e/detox-build-release-apk.sh
@ -14,5 +14,5 @@ cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=rele
 echo wheres waldo?
 find $ANDROID_HOME | grep apksigner | grep -v jar
 mv ./android/app/build/outputs/apk/release/app-release-unsigned.apk ./android/app/build/outputs/apk/release/app-release.apk
-$ANDROID_HOME/build-tools/34.0.0/apksigner sign --ks detox.keystore   --ks-pass=pass:123456 ./android/app/build/outputs/apk/release/app-release.apk
-$ANDROID_HOME/build-tools/34.0.0/apksigner sign --ks detox.keystore   --ks-pass=pass:123456 ./android/app/build/outputs/apk/androidTest/release/app-release-androidTest.apk
+$ANDROID_HOME/build-tools/35.0.0/apksigner sign --ks detox.keystore   --ks-pass=pass:123456 ./android/app/build/outputs/apk/release/app-release.apk
+$ANDROID_HOME/build-tools/35.0.0/apksigner sign --ks detox.keystore   --ks-pass=pass:123456 ./android/app/build/outputs/apk/androidTest/release/app-release-androidTest.apk