Merge branch 'master' into renovate/react-native-tcp-socket-6.x

.github/workflows/build-ios-release-pullrequest.yml

@@ -207,7 +207,7 @@ jobs:
       - name: Set Up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.6
+          ruby-version: 3.4.8
 
       - name: System Debug Information
         run: |
@@ -478,7 +478,7 @@ jobs:
       - name: Set Up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.6
+          ruby-version: 3.4.8
           
       - name: Install Dependencies with Bundler
         run: |

.github/workflows/build-mac-catalyst.yml

@@ -71,7 +71,7 @@ jobs:
         if: github.event_name == 'workflow_dispatch' || steps.labels.outputs.has_mac_dmg == 'true'
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.6
+          ruby-version: 3.4.8
           bundler-cache: true
 
       - name: Install Node modules

.github/workflows/build-release-apk.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.6
+          ruby-version: 3.4.8
           bundler-cache: true
 
       - name: Cache Ruby Gems
@@ -105,7 +105,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1.6
+          ruby-version: 3.4.8
           bundler-cache: true
 
       - name: Install dependencies with Bundler

.github/workflows/e2e.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1.6"
+          ruby-version: "3.4.8"
 
       - name: Cache Ruby gems
         uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5

.ruby-version

@@ -1 +1 @@
-3.1.6
+3.4.8

BlueComponents.tsx

@@ -48,7 +48,7 @@ interface BlueTextProps extends TextProps {
   h4?: boolean;
 }
 
-export const BlueText: React.FC<BlueTextProps> = ({ bold = false, h1, h2, h3, h4, ...props }) => {
+export const BlueText: React.FC<BlueTextProps> = ({ bold = false, h1, h2, h3, h4, style: passedStyle, ...props }) => {
   const { colors } = useTheme();
   const { direction } = useLocale();
 
@@ -71,7 +71,7 @@ export const BlueText: React.FC<BlueTextProps> = ({ bold = false, h1, h2, h3, h4
       fontWeight: hasHeading ? undefined : bold ? 'bold' : 'normal',
       ...headingStyle,
     },
-    props.style,
+    passedStyle,
   );
   return <Text style={style} {...props} />;
 };

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby "3.1.6"
+ruby "3.4.8"
 gem "fastlane", "~> 2.232.0"
 # Exclude problematic versions of cocoapods and activesupport that causes build failures.
 gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.9)
+    CFPropertyList (3.0.8)
     abbrev (0.1.2)
     activesupport (7.2.3)
       base64
@@ -344,7 +344,7 @@ DEPENDENCIES
   xcodeproj (< 1.26.0)
 
 RUBY VERSION
-   ruby 3.1.6p260
+   ruby 3.4.8p72
 
 BUNDLED WITH
    2.3.27

package-lock.json

@@ -89,13 +89,13 @@
         "react-native-keychain": "9.2.3",
         "react-native-linear-gradient": "2.8.3",
         "react-native-localize": "3.7.0",
-        "react-native-permissions": "5.4.4",
+        "react-native-permissions": "5.5.0",
         "react-native-prompt-android": "github:BlueWallet/react-native-prompt-android#ed168d66fed556bc2ed07cf498770f058b78a376",
         "react-native-push-notification": "8.1.1",
         "react-native-qrcode-svg": "6.3.21",
         "react-native-quick-actions": "0.3.13",
         "react-native-reanimated": "3.19.5",
-        "react-native-safe-area-context": "5.5.2",
+        "react-native-safe-area-context": "5.7.0",
         "react-native-screens": "4.18.0",
         "react-native-secure-key-store": "github:BlueWallet/react-native-secure-key-store#2076b4849e88aa0a78e08bfbb4ce3923e0925cbc",
         "react-native-share": "12.2.5",
@@ -16669,14 +16669,14 @@
       }
     },
     "node_modules/react-native-permissions": {
-      "version": "5.4.4",
-      "resolved": "https://registry.npmjs.org/react-native-permissions/-/react-native-permissions-5.4.4.tgz",
-      "integrity": "sha512-WB5lRCBGXETfuaUhem2vgOceb9+URCeyfKpLGFSwoOffLuyJCA6+NTR3l1KLkrK4Ykxsig37z16/shUVufmt7A==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/react-native-permissions/-/react-native-permissions-5.5.0.tgz",
+      "integrity": "sha512-bbsCN8eFFVVinOmeExXMPRAAddPgD74r95ab6x9j6ycUcXIHRe5A+07iqnpVMxvIwF8KV/ZF/+8Y1BJgkGtyyg==",
       "license": "MIT",
       "peerDependencies": {
-        "react": ">=18.1.0",
-        "react-native": ">=0.70.0",
-        "react-native-windows": ">=0.70.0"
+        "react": "*",
+        "react-native": "*",
+        "react-native-windows": "*"
       },
       "peerDependenciesMeta": {
         "react-native-windows": {
@@ -16744,9 +16744,9 @@
       }
     },
     "node_modules/react-native-safe-area-context": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-5.5.2.tgz",
-      "integrity": "sha512-t4YVbHa9uAGf+pHMabGrb0uHrD5ogAusSu842oikJ3YKXcYp6iB4PTGl0EZNkUIR3pCnw/CXKn42OCfhsS0JIw==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-5.7.0.tgz",
+      "integrity": "sha512-/9/MtQz8ODphjsLdZ+GZAIcC/RtoqW9EeShf7Uvnfgm/pzYrJ75y3PV/J1wuAV1T5Dye5ygq4EAW20RoBq0ABQ==",
       "license": "MIT",
       "peerDependencies": {
         "react": "*",

package.json

@@ -161,13 +161,13 @@
     "react-native-keychain": "9.2.3",
     "react-native-linear-gradient": "2.8.3",
     "react-native-localize": "3.7.0",
-    "react-native-permissions": "5.4.4",
+    "react-native-permissions": "5.5.0",
     "react-native-prompt-android": "github:BlueWallet/react-native-prompt-android#ed168d66fed556bc2ed07cf498770f058b78a376",
     "react-native-push-notification": "8.1.1",
     "react-native-qrcode-svg": "6.3.21",
     "react-native-quick-actions": "0.3.13",
     "react-native-reanimated": "3.19.5",
-    "react-native-safe-area-context": "5.5.2",
+    "react-native-safe-area-context": "5.7.0",
     "react-native-screens": "4.18.0",
     "react-native-secure-key-store": "github:BlueWallet/react-native-secure-key-store#2076b4849e88aa0a78e08bfbb4ce3923e0925cbc",
     "react-native-share": "12.2.5",