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

Merge branch 'master' into rn738

Browse source
This commit is contained in:
Marcos Rodriguez Velez 2024-05-18 11:44:43 -04:00
commit bc1704b4d6
No known key found for this signature in database
GPG key ID: 6030B2F48CCE86D7
4 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/TooltipMenu.ios.js
View file

@ -6,7 +6,7 @@ import { TouchableOpacity } from 'react-native';
const BaseToolTipMenu = (props, ref) => { const BaseToolTipMenu = (props, ref) => {
const menuItemMapped = ({ action, menuOptions }) => { const menuItemMapped = ({ action, menuOptions }) => {
const item = { const item = {
actionKey: action.id, actionKey: action.id.toString(),
actionTitle: action.text, actionTitle: action.text,
icon: action.icon, icon: action.icon,
menuOptions, menuOptions,

2
screen/send/details.js
View file

@ -334,7 +334,7 @@ const SendDetails = () => {
// we need to re-calculate fees if user opens-closes coin control // we need to re-calculate fees if user opens-closes coin control
useFocusEffect( useFocusEffect(
useCallback(() => { useCallback(() => {
LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut); setIsLoading(false);
setDumb(v => !v); setDumb(v => !v);
}, []), }, []),
); );

17
screen/settings/electrumSettings.js
View file

@ -31,11 +31,12 @@ import { BlueCurrentTheme } from '../../components/themes';
import { reloadAllTimelines } from '../../components/WidgetCommunication'; import { reloadAllTimelines } from '../../components/WidgetCommunication';
import { BlueStorageContext } from '../../blue_modules/storage-context'; import { BlueStorageContext } from '../../blue_modules/storage-context';
import presentAlert from '../../components/Alert'; import presentAlert from '../../components/Alert';
import { requestCameraAuthorization } from '../../helpers/scan-qr'; import { scanQrHelper } from '../../helpers/scan-qr';
import Button from '../../components/Button'; import Button from '../../components/Button';
import ListItem from '../../components/ListItem'; import ListItem from '../../components/ListItem';
import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback'; import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback';
import * as BlueElectrum from '../../blue_modules/BlueElectrum'; import * as BlueElectrum from '../../blue_modules/BlueElectrum';
import { navigationRef } from '../../NavigationService';
export default class ElectrumSettings extends Component { export default class ElectrumSettings extends Component {
static contextType = BlueStorageContext; static contextType = BlueStorageContext;
@ -225,17 +226,9 @@ export default class ElectrumSettings extends Component {
}); });
}; };
importScan = () => { importScan = async () => {
requestCameraAuthorization().then(() => const scanned = await scanQrHelper(navigationRef.navigate, 'ElectrumSettings', true);
this.props.navigation.navigate('ScanQRCodeRoot', { this.onBarScanned(scanned);
screen: 'ScanQRCode',
params: {
launchedBy: this.props.route.name,
onBarScanned: this.onBarScanned,
showFileImportButton: true,
},
}),
);
}; };
useSSLPortToggled = value => { useSSLPortToggled = value => {

8
screen/wallets/PaymentCodesList.tsx
View file

@ -107,7 +107,7 @@ export default function PaymentCodesList() {
}; };
const onToolTipPress = async (id: any, pc: string) => { const onToolTipPress = async (id: any, pc: string) => {
if (id === Actions.copyToClipboard) { if (String(id) === String(Actions.copyToClipboard)) {
Clipboard.setString(pc); Clipboard.setString(pc);
presentAlert({ message: loc.bip47.copied }); presentAlert({ message: loc.bip47.copied });
} }
@ -256,12 +256,12 @@ const styles = StyleSheet.create({
}, },
sectionListContainer: { flex: 1, width: '100%' }, sectionListContainer: { flex: 1, width: '100%' },
circle: { circle: {
width: 42, width: 35,
height: 42, height: 35,
borderRadius: 25, borderRadius: 25,
}, },
contactRowBody: { flex: 6, justifyContent: 'center', top: -3 }, contactRowBody: { flex: 6, justifyContent: 'center', top: -3 },
contactRowNameText: { marginLeft: 10, fontSize: 20, fontWeight: 'bold' }, contactRowNameText: { marginLeft: 10, fontSize: 16 },
contactRowContainer: { flexDirection: 'row', padding: 15 }, contactRowContainer: { flexDirection: 'row', padding: 15 },
stick: { borderStyle: 'solid', borderWidth: 0.5, borderColor: 'gray', opacity: 0.5, top: 0, left: -10, width: '110%' }, stick: { borderStyle: 'solid', borderWidth: 0.5, borderColor: 'gray', opacity: 0.5, top: 0, left: -10, width: '110%' },
}); });