mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2025-02-22 15:04:50 +01:00
FIX: lnPayURL scan wallet currency in BTC or local currency
This commit is contained in:
parent
28e35166cf
commit
69ba77d8ff
2 changed files with 15 additions and 4 deletions
|
@ -131,7 +131,7 @@ async function init(clearLastUpdatedTime = false) {
|
|||
return updateExchangeRate();
|
||||
}
|
||||
|
||||
function satoshiToLocalCurrency(satoshi) {
|
||||
function satoshiToLocalCurrency(satoshi, format = true) {
|
||||
if (!exchangeRates['BTC_' + preferredFiatCurrency.endPointKey]) {
|
||||
updateExchangeRate();
|
||||
return '...';
|
||||
|
@ -145,6 +145,8 @@ function satoshiToLocalCurrency(satoshi) {
|
|||
b = b.toPrecision(2);
|
||||
}
|
||||
|
||||
if (format === false) return b;
|
||||
|
||||
let formatter;
|
||||
try {
|
||||
formatter = new Intl.NumberFormat(preferredFiatCurrency.locale, {
|
||||
|
|
|
@ -2,6 +2,7 @@ import React, { useState, useEffect, useContext } from 'react';
|
|||
import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
|
||||
import AsyncStorage from '@react-native-async-storage/async-storage';
|
||||
import { I18nManager, Image, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
|
||||
import { useNavigation, useRoute, useTheme } from '@react-navigation/native';
|
||||
import { Icon } from 'react-native-elements';
|
||||
|
||||
import {
|
||||
|
@ -20,7 +21,6 @@ import { BitcoinUnit, Chain } from '../../models/bitcoinUnits';
|
|||
import loc, { formatBalanceWithoutSuffix, formatBalance } from '../../loc';
|
||||
import Biometric from '../../class/biometrics';
|
||||
import { BlueStorageContext } from '../../blue_modules/storage-context';
|
||||
import { useNavigation, useRoute, useTheme } from '@react-navigation/native';
|
||||
import alert from '../../components/Alert';
|
||||
const prompt = require('../../blue_modules/prompt');
|
||||
const currency = require('../../blue_modules/currency');
|
||||
|
@ -73,9 +73,18 @@ const LnurlPay = () => {
|
|||
|
||||
useEffect(() => {
|
||||
if (payload) {
|
||||
setAmount(payload.min);
|
||||
let newAmount = payload.min;
|
||||
switch (unit) {
|
||||
case BitcoinUnit.BTC:
|
||||
newAmount = currency.satoshiToBTC(newAmount);
|
||||
break;
|
||||
case BitcoinUnit.LOCAL_CURRENCY:
|
||||
newAmount = currency.satoshiToLocalCurrency(newAmount, false);
|
||||
break;
|
||||
}
|
||||
setAmount(newAmount);
|
||||
}
|
||||
}, [payload]);
|
||||
}, [payload]); // eslint-disable-line react-hooks/exhaustive-deps
|
||||
|
||||
const onWalletSelect = wallet => {
|
||||
setParams({ walletID: wallet.getID() });
|
||||
|
|
Loading…
Add table
Reference in a new issue