mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-23 23:27:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into widgetcenterup

Browse source
This commit is contained in:
Marcos Rodriguez Vélez 2021-08-03 12:28:18 -04:00
commit 520c064fd2
4 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
App.js
View file

@ -336,7 +336,7 @@ const App = () => {
<Notifications onProcessNotifications={processPushNotifications} />
{renderClipboardContentModal()}
</NavigationContainer>
{walletsInitialized && !isDesktop && <WatchConnectivity />}
{walletsInitialized && !isDesktop && <WatchConnectivity />}
</View>
<DeviceQuickActions />
<WalletImport />

46
screen/receive/details.js
View file

@ -164,29 +164,31 @@ const ReceiveDetails = () => {
</>
)}
<TouchableWithoutFeedback style={styles.qrCodeContainer} testID="BitcoinAddressQRCodeContainer" onLongPress={showToolTipMenu}>
<ToolTipMenu
ref={toolTip}
anchorRef={qrCode}
actions={[
{
id: 'shareQRCode',
text: loc.receive.details_share,
onPress: handleShareQRCode,
},
]}
/>
<>
<ToolTipMenu
ref={toolTip}
anchorRef={qrCode}
actions={[
{
id: 'shareQRCode',
text: loc.receive.details_share,
onPress: handleShareQRCode,
},
]}
/>
<QRCode
value={bip21encoded}
logo={require('../../img/qr-code.png')}
size={(is.ipad() && 300) || 300}
logoSize={90}
color="#000000"
logoBackgroundColor={colors.brandingColor}
backgroundColor="#FFFFFF"
ecl="H"
getRef={qrCode}
/>
<QRCode
value={bip21encoded}
logo={require('../../img/qr-code.png')}
size={(is.ipad() && 300) || 300}
logoSize={90}
color="#000000"
logoBackgroundColor={colors.brandingColor}
backgroundColor="#FFFFFF"
ecl="H"
getRef={qrCode}
/>
</>
</TouchableWithoutFeedback>
<BlueCopyTextToClipboard text={isCustom ? bip21encoded : address} />
</View>

2
screen/wallets/details.js
View file

@ -14,6 +14,7 @@ import {
Linking,
StyleSheet,
StatusBar,
ScrollView,
PermissionsAndroid,
InteractionManager,
ActivityIndicator,
@ -33,7 +34,6 @@ import {
MultisigHDWallet,
HDAezeedWallet,
} from '../../class';
import { ScrollView } from 'react-native-gesture-handler';
import loc from '../../loc';
import { useTheme, useRoute, useNavigation } from '@react-navigation/native';
import RNFS from 'react-native-fs';

3
screen/wallets/pleaseBackupLNDHub.js
View file

@ -1,8 +1,7 @@
import React, { useCallback, useContext, useEffect, useState } from 'react';
import { useNavigation, useRoute, useTheme } from '@react-navigation/native';
import { View, StyleSheet, BackHandler, StatusBar } from 'react-native';
import { View, StyleSheet, ScrollView, BackHandler, StatusBar } from 'react-native';
import QRCode from 'react-native-qrcode-svg';
import { ScrollView } from 'react-native-gesture-handler';
import { BlueButton, BlueCopyTextToClipboard, BlueSpacing20, BlueTextCentered, SafeBlueArea } from '../../BlueComponents';
import navigationStyle from '../../components/navigationStyle';