Merge branch 'master' into widgetcenterup

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

View file

@ -164,6 +164,7 @@ const ReceiveDetails = () => {
</>
)}
<TouchableWithoutFeedback style={styles.qrCodeContainer} testID="BitcoinAddressQRCodeContainer" onLongPress={showToolTipMenu}>
<>
<ToolTipMenu
ref={toolTip}
anchorRef={qrCode}
@ -187,6 +188,7 @@ const ReceiveDetails = () => {
ecl="H"
getRef={qrCode}
/>
</>
</TouchableWithoutFeedback>
<BlueCopyTextToClipboard text={isCustom ? bip21encoded : address} />
</View>

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';

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';