mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2025-02-22 15:04:50 +01:00
Merge branch 'master' into renovate/realm-12.x
This commit is contained in:
Marcos Rodriguez Vélez
GitHub
commit
305f3633e4
15 changed files with 123 additions and 79 deletions
|
|
@ -1,17 +1,14 @@
|
|||
name: Build Release Pull Request (iOS)
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types: [opened, reopened, synchronize, labeled, unlabeled]
|
||||
branches:
|
||||
- master
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
if: contains(github.event.pull_request.labels.*.name, 'testflight')
|
||||
runs-on: macos-14
|
||||
timeout-minutes: 180
|
||||
outputs:
|
||||
|
|
@ -129,7 +126,7 @@ jobs:
|
|||
|
||||
|
||||
testflight-upload:
|
||||
if: ${{ github.event_name == 'workflow_dispatch' }}
|
||||
if: contains(github.event.pull_request.labels.*.name, 'testflight')
|
||||
needs: build
|
||||
runs-on: macos-14
|
||||
env:
|
||||
|
|
@ -176,3 +173,21 @@ jobs:
|
|||
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
|
||||
run: bundle exec fastlane ios upload_to_testflight_lane
|
||||
working-directory: ./ios
|
||||
- name: Post PR Comment
|
||||
uses: actions/github-script@v6
|
||||
if: success() # Ensures the message is only posted if previous steps succeed
|
||||
env:
|
||||
BUILD_NUMBER: ${{ needs.build.outputs.new_build_number }}
|
||||
LATEST_COMMIT_MESSAGE: ${{ needs.build.outputs.latest_commit_message }}
|
||||
with:
|
||||
script: |
|
||||
const buildNumber = process.env.BUILD_NUMBER;
|
||||
const latestCommitMessage = process.env.LATEST_COMMIT_MESSAGE;
|
||||
const message = `The build ${buildNumber} has been uploaded to TestFlight. The most recent commit for this build is:\n\n '${latestCommitMessage}'`;
|
||||
const prNumber = context.payload.pull_request.number;
|
||||
const repo = context.repo;
|
||||
github.rest.issues.createComment({
|
||||
...repo,
|
||||
issue_number: prNumber,
|
||||
body: message,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ import Success from './screen/send/success';
|
|||
|
||||
import UnlockWith from './UnlockWith';
|
||||
import { isDesktop, isHandset, isTablet } from './blue_modules/environment';
|
||||
import navigationStyle from './components/navigationStyle';
|
||||
import { useTheme } from './components/themes';
|
||||
import loc from './loc';
|
||||
import LappBrowser from './screen/lnd/browser';
|
||||
|
|
@ -107,15 +108,19 @@ const WalletsRoot = () => {
|
|||
<WalletsStack.Screen name="RBFCancel" component={RBFCancel} options={RBFCancel.navigationOptions(theme)} />
|
||||
<WalletsStack.Screen name="Settings" component={Settings} options={Settings.navigationOptions(theme)} />
|
||||
<WalletsStack.Screen name="SelectWallet" component={SelectWallet} options={SelectWallet.navigationOptions(theme)} />
|
||||
<WalletsStack.Screen name="Currency" component={Currency} options={{ title: loc.settings.currency }} />
|
||||
<WalletsStack.Screen name="Currency" component={Currency} options={navigationStyle({ title: loc.settings.currency })(theme)} />
|
||||
<WalletsStack.Screen name="About" component={About} options={About.navigationOptions(theme)} />
|
||||
<WalletsStack.Screen name="ReleaseNotes" component={ReleaseNotes} options={ReleaseNotes.navigationOptions(theme)} />
|
||||
<WalletsStack.Screen name="Selftest" component={Selftest} options={Selftest.navigationOptions(theme)} />
|
||||
<WalletsStack.Screen name="Licensing" component={Licensing} options={Licensing.navigationOptions(theme)} />
|
||||
<WalletsStack.Screen name="DefaultView" component={DefaultView} options={DefaultView.navigationOptions(theme)} />
|
||||
<WalletsStack.Screen name="Language" component={Language} options={{ title: loc.settings.language }} />
|
||||
<WalletsStack.Screen name="Language" component={Language} options={navigationStyle({ title: loc.settings.language })(theme)} />
|
||||
<WalletsStack.Screen name="EncryptStorage" component={EncryptStorage} options={EncryptStorage.navigationOptions(theme)} />
|
||||
<WalletsStack.Screen name="GeneralSettings" component={GeneralSettings} options={{ title: loc.settings.general }} />
|
||||
<WalletsStack.Screen
|
||||
name="GeneralSettings"
|
||||
component={GeneralSettings}
|
||||
options={navigationStyle({ title: loc.settings.general })(theme)}
|
||||
/>
|
||||
<WalletsStack.Screen name="NetworkSettings" component={NetworkSettings} options={NetworkSettings.navigationOptions(theme)} />
|
||||
<WalletsStack.Screen
|
||||
name="NotificationSettings"
|
||||
|
|
@ -125,7 +130,7 @@ const WalletsRoot = () => {
|
|||
<WalletsStack.Screen
|
||||
name="PlausibleDeniability"
|
||||
component={PlausibleDeniability}
|
||||
options={{ title: loc.plausibledeniability.title }}
|
||||
options={navigationStyle({ title: loc.plausibledeniability.title })(theme)}
|
||||
/>
|
||||
<WalletsStack.Screen name="LightningSettings" component={LightningSettings} options={LightningSettings.navigationOptions(theme)} />
|
||||
<WalletsStack.Screen name="ElectrumSettings" component={ElectrumSettings} options={ElectrumSettings.navigationOptions(theme)} />
|
||||
|
|
@ -170,7 +175,11 @@ const AddWalletRoot = () => {
|
|||
<AddWalletStack.Screen
|
||||
name="AddWallet"
|
||||
component={AddWallet}
|
||||
options={{ headerBackButtonMenuEnabled: true, headerBackVisible: false, title: loc.wallets.add_title }}
|
||||
options={navigationStyle({
|
||||
closeButton: true,
|
||||
headerBackVisible: false,
|
||||
title: loc.wallets.add_title,
|
||||
})(theme)}
|
||||
/>
|
||||
<AddWalletStack.Screen name="ImportWallet" component={ImportWallet} options={ImportWallet.navigationOptions(theme)} />
|
||||
<AddWalletStack.Screen
|
||||
|
|
@ -187,7 +196,11 @@ const AddWalletRoot = () => {
|
|||
<AddWalletStack.Screen
|
||||
name="PleaseBackup"
|
||||
component={PleaseBackup}
|
||||
options={{ gestureEnabled: false, headerBackVisible: false, title: loc.pleasebackup.title }}
|
||||
options={navigationStyle({
|
||||
gestureEnabled: false,
|
||||
headerBackVisible: false,
|
||||
title: loc.pleasebackup.title,
|
||||
})(theme)}
|
||||
/>
|
||||
<AddWalletStack.Screen
|
||||
name="PleaseBackupLNDHub"
|
||||
|
|
@ -405,6 +418,8 @@ const ReceiveDetailsStackRoot = () => {
|
|||
|
||||
const WalletXpubStack = createNativeStackNavigator();
|
||||
const WalletXpubStackRoot = () => {
|
||||
const theme = useTheme();
|
||||
|
||||
return (
|
||||
<WalletXpubStack.Navigator
|
||||
id="WalletXpubRoot"
|
||||
|
|
@ -414,11 +429,11 @@ const WalletXpubStackRoot = () => {
|
|||
<WalletXpubStack.Screen
|
||||
name="WalletXpub"
|
||||
component={WalletXpub}
|
||||
options={{
|
||||
options={navigationStyle({
|
||||
closeButton: true,
|
||||
headerBackVisible: false,
|
||||
headerBackButtonMenuEnabled: true,
|
||||
headerTitle: loc.wallets.xpub_title,
|
||||
}}
|
||||
})(theme)}
|
||||
/>
|
||||
</WalletXpubStack.Navigator>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ const navigationStyle = (
|
|||
closeButton?: boolean;
|
||||
closeButtonFunc?: (deps: { navigation: any; route: any }) => React.ReactElement;
|
||||
},
|
||||
formatter: OptionsFormatter,
|
||||
formatter?: OptionsFormatter,
|
||||
): NavigationOptionsGetter => {
|
||||
return theme =>
|
||||
({ navigation, route }) => {
|
||||
|
|
@ -63,7 +63,6 @@ const navigationStyle = (
|
|||
|
||||
if (!headerBackVisible) {
|
||||
headerLeft = () => <></>;
|
||||
// @ts-ignore: Fix later
|
||||
opts.headerLeft = headerLeft;
|
||||
}
|
||||
|
||||
|
|
@ -73,7 +72,6 @@ const navigationStyle = (
|
|||
fontWeight: '600',
|
||||
color: theme.colors.foregroundColor,
|
||||
},
|
||||
// @ts-ignore: Fix later
|
||||
headerRight,
|
||||
headerBackTitleVisible: false,
|
||||
headerTintColor: theme.colors.foregroundColor,
|
||||
|
|
@ -94,9 +92,6 @@ export const navigationStyleTx = (opts: NativeStackNavigationOptions, formatter:
|
|||
return theme =>
|
||||
({ navigation, route }) => {
|
||||
let options: NativeStackNavigationOptions = {
|
||||
headerStyle: {
|
||||
backgroundColor: theme.colors.customHeader,
|
||||
},
|
||||
headerTitleStyle: {
|
||||
fontWeight: '600',
|
||||
color: theme.colors.foregroundColor,
|
||||
|
|
@ -104,7 +99,6 @@ export const navigationStyleTx = (opts: NativeStackNavigationOptions, formatter:
|
|||
// headerBackTitle: null,
|
||||
headerBackTitleVisible: false,
|
||||
headerTintColor: theme.colors.foregroundColor,
|
||||
// @ts-ignore: Fix later
|
||||
headerLeft: () => (
|
||||
<TouchableOpacity
|
||||
accessibilityRole="button"
|
||||
|
|
|
|||
|
|
@ -481,7 +481,7 @@ PODS:
|
|||
- React-Core
|
||||
- RNDefaultPreference (1.4.4):
|
||||
- React-Core
|
||||
- RNDeviceInfo (10.13.0):
|
||||
- RNDeviceInfo (10.13.1):
|
||||
- React-Core
|
||||
- RNFS (2.20.0):
|
||||
- React-Core
|
||||
|
|
@ -849,7 +849,7 @@ SPEC CHECKSUMS:
|
|||
RNCClipboard: 60fed4b71560d7bfe40e9d35dea9762b024da86d
|
||||
RNCPushNotificationIOS: 64218f3c776c03d7408284a819b2abfda1834bc8
|
||||
RNDefaultPreference: 08bdb06cfa9188d5da97d4642dac745218d7fb31
|
||||
RNDeviceInfo: 5e4695f906aeb624855cee8d568a46037e4a50f7
|
||||
RNDeviceInfo: 4f9c7cfd6b9db1b05eb919620a001cf35b536423
|
||||
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
|
||||
RNGestureHandler: 7909c50383a18f0cb10ce1db7262b9a6da504c03
|
||||
RNHandoff: d3b0754cca3a6bcd9b25f544f733f7f033ccf5fa
|
||||
|
|
|
|||
|
|
@ -90,12 +90,14 @@ struct WalletInformationWidget: Widget {
|
|||
}
|
||||
.configurationDisplayName("Balance")
|
||||
.description("View your accumulated balance.").supportedFamilies([.systemSmall])
|
||||
.contentMarginsDisabledIfAvailable()
|
||||
} else {
|
||||
return StaticConfiguration(kind: kind, provider: WalletInformationWidgetProvider()) { entry in
|
||||
WalletInformationWidgetEntryView(entry: entry)
|
||||
}
|
||||
.configurationDisplayName("Balance")
|
||||
.description("View your accumulated balance.").supportedFamilies([.systemSmall])
|
||||
.contentMarginsDisabledIfAvailable()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,12 +87,14 @@ struct MarketWidget: Widget {
|
|||
}
|
||||
.configurationDisplayName("Market")
|
||||
.description("View the current market information.").supportedFamilies([.systemSmall])
|
||||
.contentMarginsDisabledIfAvailable()
|
||||
} else {
|
||||
return StaticConfiguration(kind: kind, provider: MarketWidgetProvider()) { entry in
|
||||
MarketWidgetEntryView(entry: entry)
|
||||
}
|
||||
.configurationDisplayName("Market")
|
||||
.description("View the current market information.").supportedFamilies([.systemSmall])
|
||||
.contentMarginsDisabledIfAvailable()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,12 +99,14 @@ struct PriceWidgetProvider: TimelineProvider {
|
|||
}
|
||||
.configurationDisplayName("Price")
|
||||
.description("View the current price of Bitcoin.").supportedFamilies([.systemSmall])
|
||||
.contentMarginsDisabledIfAvailable()
|
||||
} else {
|
||||
return StaticConfiguration(kind: kind, provider: PriceWidgetProvider()) { entry in
|
||||
PriceWidgetEntryView(entry: entry)
|
||||
}
|
||||
.configurationDisplayName("Price")
|
||||
.description("View the current price of Bitcoin.").supportedFamilies([.systemSmall])
|
||||
.contentMarginsDisabledIfAvailable()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -119,6 +119,7 @@ struct WalletInformationAndMarketWidget: Widget {
|
|||
}
|
||||
.configurationDisplayName("Wallet and Market")
|
||||
.description("View your total wallet balance and network prices.").supportedFamilies([.systemMedium, .systemLarge])
|
||||
.contentMarginsDisabledIfAvailable()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,3 +19,18 @@ struct Widgets: WidgetBundle {
|
|||
WalletInformationAndMarketWidget()
|
||||
}
|
||||
}
|
||||
|
||||
extension WidgetConfiguration
|
||||
{
|
||||
func contentMarginsDisabledIfAvailable() -> some WidgetConfiguration
|
||||
{
|
||||
if #available(iOSApplicationExtension 17.0, *)
|
||||
{
|
||||
return self.contentMarginsDisabled()
|
||||
}
|
||||
else
|
||||
{
|
||||
return self
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -514,6 +514,7 @@
|
|||
"i_have_mnemonics": "I have a seed for this key.",
|
||||
"type_your_mnemonics": "Insert a seed to import your existing Vault key.",
|
||||
"this_is_cosigners_xpub": "This is the co-signer’s XPUB—ready to be imported into another wallet. It is safe to share it.",
|
||||
"this_is_cosigners_xpub_airdrop": "If you share via AirDrop the receivers have to be in the coordination screen.",
|
||||
"wallet_key_created": "Your Vault key was created. Take a moment to safely backup your mnemonic seed.",
|
||||
"are_you_sure_seed_will_be_lost": "Are you sure? Your mnemonic seed will be lost if you don’t have a backup.",
|
||||
"forget_this_seed": "Forget this seed and use the XPUB instead.",
|
||||
|
|
|
|||
92
package-lock.json
generated
92
package-lock.json
generated
|
|
@ -19,9 +19,9 @@
|
|||
"@react-native-async-storage/async-storage": "1.22.2",
|
||||
"@react-native-clipboard/clipboard": "1.13.2",
|
||||
"@react-native-community/push-notification-ios": "1.11.0",
|
||||
"@react-navigation/drawer": "6.6.7",
|
||||
"@react-navigation/native": "6.1.10",
|
||||
"@react-navigation/native-stack": "6.9.18",
|
||||
"@react-navigation/drawer": "6.6.9",
|
||||
"@react-navigation/native": "6.1.12",
|
||||
"@react-navigation/native-stack": "6.9.20",
|
||||
"@remobile/react-native-qrcode-local-image": "https://github.com/BlueWallet/react-native-qrcode-local-image",
|
||||
"@spsina/bip47": "github:BlueWallet/bip47#0a2f02c90350802f2ec93afa4e6c8843be2d687c",
|
||||
"aezeed": "0.0.5",
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
"react-native-camera-kit": "13.0.0",
|
||||
"react-native-crypto": "2.2.0",
|
||||
"react-native-default-preference": "1.4.4",
|
||||
"react-native-device-info": "10.13.0",
|
||||
"react-native-device-info": "10.13.1",
|
||||
"react-native-document-picker": "https://github.com/BlueWallet/react-native-document-picker#27fddb9d9a88fff09a41ce654f7008cfd33cb4c4",
|
||||
"react-native-draggable-flatlist": "github:BlueWallet/react-native-draggable-flatlist#ebfddc4",
|
||||
"react-native-elements": "3.4.3",
|
||||
|
|
@ -6364,9 +6364,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@react-navigation/core": {
|
||||
"version": "6.4.10",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.10.tgz",
|
||||
"integrity": "sha512-oYhqxETRHNHKsipm/BtGL0LI43Hs2VSFoWMbBdHK9OqgQPjTVUitslgLcPpo4zApCcmBWoOLX2qPxhsBda644A==",
|
||||
"version": "6.4.11",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.11.tgz",
|
||||
"integrity": "sha512-kOCyOc1L0lAl53DbyNl3OkUJwSFKSaVCsV8leJawUXMXJ1FTT3nbS3xMOqbZuchxIbl8T62sZ7YnlWG/21rcMw==",
|
||||
"dependencies": {
|
||||
"@react-navigation/routers": "^6.1.9",
|
||||
"escape-string-regexp": "^4.0.0",
|
||||
|
|
@ -6380,11 +6380,11 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@react-navigation/drawer": {
|
||||
"version": "6.6.7",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.6.7.tgz",
|
||||
"integrity": "sha512-9hSJySPQcG33vV199uzkI3jHewvAGjVFF2bhC28TkQYDKtp/DmtTvjCEiecOm+qep1Qp4ksh5vBo2P0A1hF6vQ==",
|
||||
"version": "6.6.9",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.6.9.tgz",
|
||||
"integrity": "sha512-fWRp7f2AzLJ5KsQHTeXR+ihVwDeERWigIU4FKa+uoFjPC6ncWzj7kpZYb5/nEJzFOH3ERODLfva6rUf4cPYKcA==",
|
||||
"dependencies": {
|
||||
"@react-navigation/elements": "^1.3.22",
|
||||
"@react-navigation/elements": "^1.3.24",
|
||||
"color": "^4.2.3",
|
||||
"warn-once": "^0.1.0"
|
||||
},
|
||||
|
|
@ -6399,9 +6399,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@react-navigation/elements": {
|
||||
"version": "1.3.22",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.22.tgz",
|
||||
"integrity": "sha512-HYKucs0TwQT8zMvgoZbJsY/3sZfzeP8Dk9IDv4agst3zlA7ReTx4+SROCG6VGC7JKqBCyQykHIwkSwxhapoc+Q==",
|
||||
"version": "1.3.24",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.24.tgz",
|
||||
"integrity": "sha512-zgZV50qjlv3/N+MzNV0DIRmtg30IZcR0+LaTQRP/OxLtveQkgUG6wIEKl6SXO2ykC9yF9V82msdCzKl9uPSQCA==",
|
||||
"peerDependencies": {
|
||||
"@react-navigation/native": "^6.0.0",
|
||||
"react": "*",
|
||||
|
|
@ -6410,11 +6410,11 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@react-navigation/native": {
|
||||
"version": "6.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.10.tgz",
|
||||
"integrity": "sha512-jDG89TbZItY7W7rIcS1RqT63vWOPD4XuQLNKqZO0DY7mKnKh/CGBd0eg3nDMXUl143Qp//IxJKe2TfBQRDEU4A==",
|
||||
"version": "6.1.12",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.12.tgz",
|
||||
"integrity": "sha512-t6y7sDCr0HlMf+5TuVjLjyi0ySs0eNGfreDKcWOMEi5wooNFM4LhcUCdEVylpwCPfjQMW/lNVomNromqZFM6HQ==",
|
||||
"dependencies": {
|
||||
"@react-navigation/core": "^6.4.10",
|
||||
"@react-navigation/core": "^6.4.11",
|
||||
"escape-string-regexp": "^4.0.0",
|
||||
"fast-deep-equal": "^3.1.3",
|
||||
"nanoid": "^3.1.23"
|
||||
|
|
@ -6425,11 +6425,11 @@
|
|||
}
|
||||
},
|
||||
"node_modules/@react-navigation/native-stack": {
|
||||
"version": "6.9.18",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.9.18.tgz",
|
||||
"integrity": "sha512-PSe0qjROy8zD78ehW048NSuzWRktioSCJmB8LzWSR65ndgVaC2rO+xvgyjhHjqm01YdyVM1XTct2EorSjDV2Ow==",
|
||||
"version": "6.9.20",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.9.20.tgz",
|
||||
"integrity": "sha512-/QXOVJGLPNGv0RXisyI5ld9oaKAdVzwcF88Q1pOA1Icp8Yce036bcixJXBsVuUhqYCJ5cBtojWt5mW6za3cRBw==",
|
||||
"dependencies": {
|
||||
"@react-navigation/elements": "^1.3.22",
|
||||
"@react-navigation/elements": "^1.3.24",
|
||||
"warn-once": "^0.1.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
|
|
@ -19582,9 +19582,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/react-native-device-info": {
|
||||
"version": "10.13.0",
|
||||
"resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-10.13.0.tgz",
|
||||
"integrity": "sha512-AuZZXxZzQbv3JKE1bV0YPMXJVVTKQ3TJGpiBcYjJMOFZa0CE18kRgqHj3nKTM6KAD8CdCpjoEfuc128Rcs2TxA==",
|
||||
"version": "10.13.1",
|
||||
"resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-10.13.1.tgz",
|
||||
"integrity": "sha512-j/7Z+Yl9Cesjp8vKaVzbuJQKJSVs4ojXATt5WjwipZ0Ss0mBJjqtbc4x5dfZLmQ4y55VVa7c0v8KHca1iqY/TQ==",
|
||||
"peerDependencies": {
|
||||
"react-native": "*"
|
||||
}
|
||||
|
|
@ -27344,9 +27344,9 @@
|
|||
}
|
||||
},
|
||||
"@react-navigation/core": {
|
||||
"version": "6.4.10",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.10.tgz",
|
||||
"integrity": "sha512-oYhqxETRHNHKsipm/BtGL0LI43Hs2VSFoWMbBdHK9OqgQPjTVUitslgLcPpo4zApCcmBWoOLX2qPxhsBda644A==",
|
||||
"version": "6.4.11",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-6.4.11.tgz",
|
||||
"integrity": "sha512-kOCyOc1L0lAl53DbyNl3OkUJwSFKSaVCsV8leJawUXMXJ1FTT3nbS3xMOqbZuchxIbl8T62sZ7YnlWG/21rcMw==",
|
||||
"requires": {
|
||||
"@react-navigation/routers": "^6.1.9",
|
||||
"escape-string-regexp": "^4.0.0",
|
||||
|
|
@ -27357,37 +27357,37 @@
|
|||
}
|
||||
},
|
||||
"@react-navigation/drawer": {
|
||||
"version": "6.6.7",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.6.7.tgz",
|
||||
"integrity": "sha512-9hSJySPQcG33vV199uzkI3jHewvAGjVFF2bhC28TkQYDKtp/DmtTvjCEiecOm+qep1Qp4ksh5vBo2P0A1hF6vQ==",
|
||||
"version": "6.6.9",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/drawer/-/drawer-6.6.9.tgz",
|
||||
"integrity": "sha512-fWRp7f2AzLJ5KsQHTeXR+ihVwDeERWigIU4FKa+uoFjPC6ncWzj7kpZYb5/nEJzFOH3ERODLfva6rUf4cPYKcA==",
|
||||
"requires": {
|
||||
"@react-navigation/elements": "^1.3.22",
|
||||
"@react-navigation/elements": "^1.3.24",
|
||||
"color": "^4.2.3",
|
||||
"warn-once": "^0.1.0"
|
||||
}
|
||||
},
|
||||
"@react-navigation/elements": {
|
||||
"version": "1.3.22",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.22.tgz",
|
||||
"integrity": "sha512-HYKucs0TwQT8zMvgoZbJsY/3sZfzeP8Dk9IDv4agst3zlA7ReTx4+SROCG6VGC7JKqBCyQykHIwkSwxhapoc+Q=="
|
||||
"version": "1.3.24",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.24.tgz",
|
||||
"integrity": "sha512-zgZV50qjlv3/N+MzNV0DIRmtg30IZcR0+LaTQRP/OxLtveQkgUG6wIEKl6SXO2ykC9yF9V82msdCzKl9uPSQCA=="
|
||||
},
|
||||
"@react-navigation/native": {
|
||||
"version": "6.1.10",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.10.tgz",
|
||||
"integrity": "sha512-jDG89TbZItY7W7rIcS1RqT63vWOPD4XuQLNKqZO0DY7mKnKh/CGBd0eg3nDMXUl143Qp//IxJKe2TfBQRDEU4A==",
|
||||
"version": "6.1.12",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-6.1.12.tgz",
|
||||
"integrity": "sha512-t6y7sDCr0HlMf+5TuVjLjyi0ySs0eNGfreDKcWOMEi5wooNFM4LhcUCdEVylpwCPfjQMW/lNVomNromqZFM6HQ==",
|
||||
"requires": {
|
||||
"@react-navigation/core": "^6.4.10",
|
||||
"@react-navigation/core": "^6.4.11",
|
||||
"escape-string-regexp": "^4.0.0",
|
||||
"fast-deep-equal": "^3.1.3",
|
||||
"nanoid": "^3.1.23"
|
||||
}
|
||||
},
|
||||
"@react-navigation/native-stack": {
|
||||
"version": "6.9.18",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.9.18.tgz",
|
||||
"integrity": "sha512-PSe0qjROy8zD78ehW048NSuzWRktioSCJmB8LzWSR65ndgVaC2rO+xvgyjhHjqm01YdyVM1XTct2EorSjDV2Ow==",
|
||||
"version": "6.9.20",
|
||||
"resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.9.20.tgz",
|
||||
"integrity": "sha512-/QXOVJGLPNGv0RXisyI5ld9oaKAdVzwcF88Q1pOA1Icp8Yce036bcixJXBsVuUhqYCJ5cBtojWt5mW6za3cRBw==",
|
||||
"requires": {
|
||||
"@react-navigation/elements": "^1.3.22",
|
||||
"@react-navigation/elements": "^1.3.24",
|
||||
"warn-once": "^0.1.0"
|
||||
}
|
||||
},
|
||||
|
|
@ -37418,9 +37418,9 @@
|
|||
"integrity": "sha512-h0vtgiSKws3UmMRJykXAVM4ne1SgfoocUcoBD19ewRpQd6wqurE0HJRQGrSxcHK5LdKE7QPSIB1VX3YGIVS8Jg=="
|
||||
},
|
||||
"react-native-device-info": {
|
||||
"version": "10.13.0",
|
||||
"resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-10.13.0.tgz",
|
||||
"integrity": "sha512-AuZZXxZzQbv3JKE1bV0YPMXJVVTKQ3TJGpiBcYjJMOFZa0CE18kRgqHj3nKTM6KAD8CdCpjoEfuc128Rcs2TxA=="
|
||||
"version": "10.13.1",
|
||||
"resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-10.13.1.tgz",
|
||||
"integrity": "sha512-j/7Z+Yl9Cesjp8vKaVzbuJQKJSVs4ojXATt5WjwipZ0Ss0mBJjqtbc4x5dfZLmQ4y55VVa7c0v8KHca1iqY/TQ=="
|
||||
},
|
||||
"react-native-document-picker": {
|
||||
"version": "git+ssh://git@github.com/BlueWallet/react-native-document-picker.git#27fddb9d9a88fff09a41ce654f7008cfd33cb4c4",
|
||||
|
|
|
|||
|
|
@ -102,12 +102,12 @@
|
|||
"@keystonehq/bc-ur-registry": "0.6.4",
|
||||
"@ngraveio/bc-ur": "1.1.6",
|
||||
"@noble/secp256k1": "1.6.3",
|
||||
"@react-native-async-storage/async-storage": "1.22.2",
|
||||
"@react-native-async-storage/async-storage": "1.22.3",
|
||||
"@react-native-clipboard/clipboard": "1.13.2",
|
||||
"@react-native-community/push-notification-ios": "1.11.0",
|
||||
"@react-navigation/drawer": "6.6.7",
|
||||
"@react-navigation/native": "6.1.10",
|
||||
"@react-navigation/native-stack": "6.9.18",
|
||||
"@react-navigation/drawer": "6.6.9",
|
||||
"@react-navigation/native": "6.1.12",
|
||||
"@react-navigation/native-stack": "6.9.20",
|
||||
"@remobile/react-native-qrcode-local-image": "https://github.com/BlueWallet/react-native-qrcode-local-image",
|
||||
"@spsina/bip47": "github:BlueWallet/bip47#0a2f02c90350802f2ec93afa4e6c8843be2d687c",
|
||||
"aezeed": "0.0.5",
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
|||
import { BlueStorageContext } from '../../blue_modules/storage-context';
|
||||
import presentAlert from '../../components/Alert';
|
||||
import ListItem from '../../components/ListItem';
|
||||
import navigationStyle from '../../components/navigationStyle';
|
||||
import { useTheme } from '../../components/themes';
|
||||
import loc, { saveLanguage } from '../../loc';
|
||||
import { AvailableLanguages, TLanguage } from '../../loc/languages';
|
||||
|
|
@ -65,7 +64,5 @@ const Language = () => {
|
|||
/>
|
||||
);
|
||||
};
|
||||
// @ts-ignore: Fix later
|
||||
Language.navigationOptions = navigationStyle({}, opts => ({ ...opts, title: loc.settings.language }));
|
||||
|
||||
export default Language;
|
||||
|
|
|
|||
|
|
@ -648,7 +648,7 @@ const WalletsAddMultisigStep2 = () => {
|
|||
<BottomModal isVisible={isRenderCosignersXpubModalVisible} onClose={hideCosignersXpubModal}>
|
||||
<KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
|
||||
<View style={[styles.modalContent, stylesHook.modalContent, styles.alignItemsCenter]}>
|
||||
<Text style={[styles.headerText, stylesHook.textDestination]}>{loc.multisig.this_is_cosigners_xpub}</Text>
|
||||
<Text style={[styles.headerText, stylesHook.textDestination]}>{loc.multisig.this_is_cosigners_xpub} {Platform.OS === "ios" ? loc.multisig.this_is_cosigners_xpub_airdrop : ""}</Text>
|
||||
<BlueSpacing20 />
|
||||
<QRCodeComponent value={cosignerXpubURv2} size={260} />
|
||||
<BlueSpacing20 />
|
||||
|
|
|
|||
|
|
@ -522,7 +522,7 @@ const ViewEditMultisigCosigners = ({ route }: Props) => {
|
|||
<BottomModal isVisible={isShareModalVisible} onClose={hideShareModal} doneButton>
|
||||
<KeyboardAvoidingView enabled={!isPad} behavior={Platform.OS === 'ios' ? 'position' : undefined}>
|
||||
<View style={[styles.modalContent, stylesHook.modalContent, styles.alignItemsCenter]}>
|
||||
<Text style={[styles.headerText, stylesHook.textDestination]}>{loc.multisig.this_is_cosigners_xpub}</Text>
|
||||
<Text style={[styles.headerText, stylesHook.textDestination]}>{loc.multisig.this_is_cosigners_xpub} {Platform.OS === "ios" ? loc.multisig.this_is_cosigners_xpub_airdrop : ""}</Text>
|
||||
<QRCodeComponent value={exportStringURv2} size={260} isLogoRendered={false} />
|
||||
<BlueSpacing20 />
|
||||
<View style={styles.squareButtonWrapper}>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue