bluewallet/BlueWallet
bluewallet/BlueWallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'master' into renovate/reactivecircus-android-emulator-runner-digest

Browse Source
This commit is contained in:
Overtorment 2026-03-30 12:31:33 +01:00 committed by GitHub
commit c935334ca7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -104,7 +104,7 @@ Grab an issue from [the backlog](https://github.com/BlueWallet/BlueWallet/issues
## Translations
We accept translations via [Transifex](https://www.transifex.com/bluewallet/bluewallet/)
We accept translations via [Transifex](https://explore.transifex.com/bluewallet/bluewallet/)
To participate you need to:
1. Sign up to Transifex

2
android/app/build.gradle
View File

@ -87,7 +87,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "7.2.7"
versionName "8.0.0"
testBuildType System.getProperty('testBuildType', 'debug')
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
// Keep compatibility across react-native-capture-protection flavor changes.

9
components/TooltipMenu.tsx
View File

@ -50,8 +50,8 @@ const ToolTipMenu = (props: ToolTipMenuProps) => {
const menuItem: ContextMenuAction = {
title: action.text,
subtitle: action.subtitle,
systemIcon: Platform.OS === 'ios' ? action.icon?.iconValue ?? action.image : undefined,
icon: Platform.OS === 'android' ? action.icon?.iconValue ?? action.image : undefined,
systemIcon: Platform.OS === 'ios' ? (action.icon?.iconValue ?? action.image) : undefined,
icon: Platform.OS === 'android' ? (action.icon?.iconValue ?? action.image) : undefined,
iconColor: typeof action.imageColor === 'string' ? action.imageColor : undefined,
destructive: Boolean(action.destructive),
disabled: Boolean(action.disabled),
@ -106,7 +106,7 @@ const ToolTipMenu = (props: ToolTipMenuProps) => {
const map = new Map<string, string>();
const registerAction = (action: Action) => {
if (action.id && action.text && !action.hidden) {
map.set(action.text, action.id);
map.set(action.text, String(action.id));
}
if (action.subactions) {
action.subactions.forEach(registerAction);
@ -158,8 +158,7 @@ const ToolTipMenu = (props: ToolTipMenuProps) => {
// Keep visual feedback on Android by default. iOS context-menu preview
// already applies a system press effect; opt in when needed.
const shouldApplyPressedStyle =
pressed &&
((Platform.OS === 'android' && enableAndroidRipple) || (Platform.OS === 'ios' && enableIOSPressOpacity));
pressed && ((Platform.OS === 'android' && enableAndroidRipple) || (Platform.OS === 'ios' && enableIOSPressOpacity));
if (shouldApplyPressedStyle) base.push(styles.pressed);
return base;
}}

16
ios/BlueWallet.xcodeproj/project.pbxproj
View File

@ -1379,7 +1379,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 7.2.7;
MARKETING_VERSION = 8.0.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
@ -1436,7 +1436,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 7.2.7;
MARKETING_VERSION = 8.0.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
@ -1485,7 +1485,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 7.2.7;
MARKETING_VERSION = 8.0.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
@ -1528,7 +1528,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 7.2.7;
MARKETING_VERSION = 8.0.0;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.Stickers;
@ -1580,7 +1580,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 7.2.7;
MARKETING_VERSION = 8.0.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
@ -1641,7 +1641,7 @@
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
"$(inherited)",
);
MARKETING_VERSION = 7.2.7;
MARKETING_VERSION = 8.0.0;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.MarketWidget;
@ -1836,7 +1836,7 @@
"$(inherited)",
);
MACOSX_DEPLOYMENT_TARGET = 12.4;
MARKETING_VERSION = 7.2.7;
MARKETING_VERSION = 8.0.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
@ -1894,7 +1894,7 @@
"$(inherited)",
);
MACOSX_DEPLOYMENT_TARGET = 12.4;
MARKETING_VERSION = 7.2.7;
MARKETING_VERSION = 8.0.0;
MTL_FAST_MATH = YES;
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.watch;

6
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "bluewallet",
"version": "7.2.7",
"version": "8.0.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "bluewallet",
"version": "7.2.7",
"version": "8.0.0",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
@ -75,7 +75,7 @@
"react-native-blue-crypto": "github:BlueWallet/react-native-blue-crypto#3cb5442",
"react-native-camera-kit-no-google": "16.2.0",
"react-native-capture-protection": "github:BlueWallet/react-native-capture-protection#bb78a40",
"react-native-context-menu-view": "github:BlueWallet/react-native-context-menu-view#main",
"react-native-context-menu-view": "github:BlueWallet/react-native-context-menu-view#144110b02afdb11b431741aef5da95e91b942a9b",
"react-native-default-preference": "https://github.com/BlueWallet/react-native-default-preference.git#6338a1f1235e4130b8cfc2dd3b53015eeff2870c",
"react-native-device-info": "14.1.1",
"react-native-draggable-flatlist": "4.0.3",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "bluewallet",
"version": "7.2.7",
"version": "8.0.0",
"license": "MIT",
"repository": {
"type": "git",