mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2025-03-04 04:13:49 +01:00
Merge branch 'master' into tooltipfix
This commit is contained in:
Marcos Rodriguez Velez
commit
d605f75745
15 changed files with 205 additions and 102 deletions
|
|
@ -1,7 +1,13 @@
|
|||
// https://levelup.gitconnected.com/debounce-in-javascript-improve-your-applications-performance-5b01855e086
|
||||
const debounce = <T extends (...args: any[]) => void>(func: T, wait: number) => {
|
||||
// blue_modules/debounce.ts
|
||||
type DebouncedFunction<T extends (...args: any[]) => void> = {
|
||||
(this: ThisParameterType<T>, ...args: Parameters<T>): void;
|
||||
cancel(): void;
|
||||
};
|
||||
|
||||
const debounce = <T extends (...args: any[]) => void>(func: T, wait: number): DebouncedFunction<T> => {
|
||||
let timeout: NodeJS.Timeout | null;
|
||||
return function executedFunction(this: ThisParameterType<T>, ...args: Parameters<T>) {
|
||||
const debouncedFunction = function (this: ThisParameterType<T>, ...args: Parameters<T>) {
|
||||
const later = () => {
|
||||
timeout = null;
|
||||
func.apply(this, args);
|
||||
|
|
@ -11,6 +17,15 @@ const debounce = <T extends (...args: any[]) => void>(func: T, wait: number) =>
|
|||
}
|
||||
timeout = setTimeout(later, wait);
|
||||
};
|
||||
|
||||
debouncedFunction.cancel = () => {
|
||||
if (timeout) {
|
||||
clearTimeout(timeout);
|
||||
}
|
||||
timeout = null;
|
||||
};
|
||||
|
||||
return debouncedFunction as DebouncedFunction<T>;
|
||||
};
|
||||
|
||||
export default debounce;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
import { useNavigation } from '@react-navigation/native';
|
||||
import React from 'react';
|
||||
import { Image, Keyboard, StyleSheet, Text, TextInput, View } from 'react-native';
|
||||
|
||||
|
|
@ -51,7 +50,6 @@ const AddressInput = ({
|
|||
keyboardType = 'default',
|
||||
}: AddressInputProps) => {
|
||||
const { colors } = useTheme();
|
||||
const { navigate } = useNavigation();
|
||||
const stylesHook = StyleSheet.create({
|
||||
root: {
|
||||
borderColor: colors.formBorder,
|
||||
|
|
@ -77,7 +75,7 @@ const AddressInput = ({
|
|||
case actionKeys.ScanQR:
|
||||
scanButtonTapped();
|
||||
if (launchedBy) {
|
||||
scanQrHelper(navigate, launchedBy)
|
||||
scanQrHelper(launchedBy)
|
||||
.then(value => onBarScanned({ data: value }))
|
||||
.catch(error => {
|
||||
presentAlert({ message: error.message });
|
||||
|
|
|
|||
|
|
@ -1,23 +1,17 @@
|
|||
import { Platform } from 'react-native';
|
||||
import { check, request, PERMISSIONS, RESULTS } from 'react-native-permissions';
|
||||
|
||||
import { navigationRef } from '../NavigationService';
|
||||
/**
|
||||
* Helper function that navigates to ScanQR screen, and returns promise that will resolve with the result of a scan,
|
||||
* and then navigates back. If QRCode scan was closed, promise resolves to null.
|
||||
*
|
||||
* @param navigateFunc {function}
|
||||
* @param currentScreenName {string}
|
||||
* @param showFileImportButton {boolean}
|
||||
*
|
||||
* @param onDismiss {function} - if camera is closed via X button it gets triggered
|
||||
* @return {Promise<string>}
|
||||
*/
|
||||
function scanQrHelper(
|
||||
navigateFunc: (scr: string | any, params?: any) => void,
|
||||
currentScreenName: string,
|
||||
showFileImportButton = true,
|
||||
onDismiss?: () => void,
|
||||
): Promise<string | null> {
|
||||
function scanQrHelper(currentScreenName: string, showFileImportButton = true, onDismiss?: () => void): Promise<string | null> {
|
||||
return requestCameraAuthorization().then(() => {
|
||||
return new Promise(resolve => {
|
||||
const params = {
|
||||
|
|
@ -28,10 +22,10 @@ function scanQrHelper(
|
|||
|
||||
params.onBarScanned = function (data: any) {
|
||||
setTimeout(() => resolve(data.data || data), 1);
|
||||
navigateFunc({ name: currentScreenName, params: {}, merge: true });
|
||||
navigationRef.navigate({ name: currentScreenName, params: {}, merge: true });
|
||||
};
|
||||
|
||||
navigateFunc('ScanQRCodeRoot', {
|
||||
navigationRef.navigate('ScanQRCodeRoot', {
|
||||
screen: 'ScanQRCode',
|
||||
params,
|
||||
});
|
||||
|
|
|
|||
23
hooks/useDebounce.ts
Normal file
23
hooks/useDebounce.ts
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
import { useState, useEffect } from 'react';
|
||||
import debounce from '../blue_modules/debounce';
|
||||
|
||||
const useDebounce = <T>(value: T, delay: number): T => {
|
||||
const [debouncedValue, setDebouncedValue] = useState<T>(value);
|
||||
|
||||
useEffect(() => {
|
||||
const handler = debounce((val: T) => {
|
||||
setDebouncedValue(val);
|
||||
}, delay);
|
||||
|
||||
handler(value);
|
||||
|
||||
|
||||
return () => {
|
||||
handler.cancel();
|
||||
};
|
||||
}, [value, delay]);
|
||||
|
||||
return debouncedValue;
|
||||
};
|
||||
|
||||
export default useDebounce;
|
||||
|
|
@ -186,6 +186,7 @@ export type TFiatUnit = {
|
|||
endPointKey: string;
|
||||
symbol: string;
|
||||
locale: string;
|
||||
country: string;
|
||||
source: 'CoinDesk' | 'Yadio' | 'Exir' | 'wazirx' | 'Bitstamp' | 'Kraken';
|
||||
};
|
||||
|
||||
|
|
@ -199,6 +200,7 @@ export type FiatUnitType = {
|
|||
endPointKey: string;
|
||||
symbol: string;
|
||||
locale: string;
|
||||
country: string;
|
||||
source: keyof typeof FiatUnitSource;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,336 +3,392 @@
|
|||
"endPointKey": "USD",
|
||||
"locale": "en-US",
|
||||
"source": "Kraken",
|
||||
"symbol": "$"
|
||||
"symbol": "$",
|
||||
"country": "United States (US Dollar)"
|
||||
},
|
||||
"AED": {
|
||||
"endPointKey": "AED",
|
||||
"locale": "ar-AE",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "د.إ."
|
||||
"symbol": "د.إ.",
|
||||
"country": "United Arab Emirates (UAE Dirham)"
|
||||
},
|
||||
"ANG": {
|
||||
"endPointKey": "ANG",
|
||||
"locale": "en-SX",
|
||||
"source": "CoinDesk",
|
||||
"symbol": "ƒ"
|
||||
"symbol": "ƒ",
|
||||
"country": "Sint Maarten (Netherlands Antillean Guilder)"
|
||||
},
|
||||
"ARS": {
|
||||
"endPointKey": "ARS",
|
||||
"locale": "es-AR",
|
||||
"source": "Yadio",
|
||||
"symbol": "$"
|
||||
"symbol": "$",
|
||||
"country": "Argentina (Argentine Peso)"
|
||||
},
|
||||
"AUD": {
|
||||
"endPointKey": "AUD",
|
||||
"locale": "en-AU",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "$"
|
||||
"symbol": "$",
|
||||
"country": "Australia (Australian Dollar)"
|
||||
},
|
||||
"AWG": {
|
||||
"endPointKey": "AWG",
|
||||
"locale": "nl-AW",
|
||||
"source": "CoinDesk",
|
||||
"symbol": "ƒ"
|
||||
"symbol": "ƒ",
|
||||
"country": "Aruba (Aruban Florin)"
|
||||
},
|
||||
"BHD": {
|
||||
"endPointKey": "BHD",
|
||||
"locale": "ar-BH",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "د.ب."
|
||||
"symbol": "د.ب.",
|
||||
"country": "Bahrain (Bahraini Dinar)"
|
||||
},
|
||||
"BRL": {
|
||||
"endPointKey": "BRL",
|
||||
"locale": "pt-BR",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "R$"
|
||||
"symbol": "R$",
|
||||
"country": "Brazil (Brazilian Real)"
|
||||
},
|
||||
"CAD": {
|
||||
"endPointKey": "CAD",
|
||||
"locale": "en-CA",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "$"
|
||||
"symbol": "$",
|
||||
"country": "Canada (Canadian Dollar)"
|
||||
},
|
||||
"CHF": {
|
||||
"endPointKey": "CHF",
|
||||
"locale": "de-CH",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "CHF"
|
||||
"symbol": "CHF",
|
||||
"country": "Switzerland (Swiss Franc)"
|
||||
},
|
||||
"CLP": {
|
||||
"endPointKey": "CLP",
|
||||
"locale": "es-CL",
|
||||
"source": "Yadio",
|
||||
"symbol": "$"
|
||||
"symbol": "$",
|
||||
"country": "Chile (Chilean Peso)"
|
||||
},
|
||||
"CNY": {
|
||||
"endPointKey": "CNY",
|
||||
"locale": "zh-CN",
|
||||
"source": "Coinbase",
|
||||
"symbol": "¥"
|
||||
"symbol": "¥",
|
||||
"country": "China (Chinese Yuan)"
|
||||
},
|
||||
"COP": {
|
||||
"endPointKey": "COP",
|
||||
"locale": "es-CO",
|
||||
"source": "CoinDesk",
|
||||
"symbol": "$"
|
||||
"symbol": "$",
|
||||
"country": "Colombia (Colombian Peso)"
|
||||
},
|
||||
"CZK": {
|
||||
"endPointKey": "CZK",
|
||||
"locale": "cs-CZ",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "Kč"
|
||||
"symbol": "Kč",
|
||||
"country": "Czech Republic (Czech Koruna)"
|
||||
},
|
||||
"DKK": {
|
||||
"endPointKey": "DKK",
|
||||
"locale": "da-DK",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "kr"
|
||||
"symbol": "kr",
|
||||
"country": "Denmark (Danish Krone)"
|
||||
},
|
||||
"EUR": {
|
||||
"endPointKey": "EUR",
|
||||
"locale": "en-IE",
|
||||
"source": "Kraken",
|
||||
"symbol": "€"
|
||||
"symbol": "€",
|
||||
"country": "European Union (Euro)"
|
||||
},
|
||||
"GBP": {
|
||||
"endPointKey": "GBP",
|
||||
"locale": "en-GB",
|
||||
"source": "Kraken",
|
||||
"symbol": "£"
|
||||
"symbol": "£",
|
||||
"country": "United Kingdom (British Pound)"
|
||||
},
|
||||
"HRK": {
|
||||
"endPointKey": "HRK",
|
||||
"locale": "hr-HR",
|
||||
"source": "CoinDesk",
|
||||
"symbol": "HRK"
|
||||
"symbol": "HRK",
|
||||
"country": "Croatia (Croatian Kuna)"
|
||||
},
|
||||
"HUF": {
|
||||
"endPointKey": "HUF",
|
||||
"locale": "hu-HU",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "Ft"
|
||||
"symbol": "Ft",
|
||||
"country": "Hungary (Hungarian Forint)"
|
||||
},
|
||||
"IDR": {
|
||||
"endPointKey": "IDR",
|
||||
"locale": "id-ID",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "Rp"
|
||||
"symbol": "Rp",
|
||||
"country": "Indonesia (Indonesian Rupiah)"
|
||||
},
|
||||
"ILS": {
|
||||
"endPointKey": "ILS",
|
||||
"locale": "he-IL",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "₪"
|
||||
"symbol": "₪",
|
||||
"country": "Israel (Israeli New Shekel)"
|
||||
},
|
||||
"INR": {
|
||||
"endPointKey": "INR",
|
||||
"locale": "hi-HN",
|
||||
"locale": "hi-IN",
|
||||
"source": "wazirx",
|
||||
"symbol": "₹"
|
||||
"symbol": "₹",
|
||||
"country": "India (Indian Rupee)"
|
||||
},
|
||||
"IRR": {
|
||||
"endPointKey": "IRR",
|
||||
"locale": "fa-IR",
|
||||
"source": "Exir",
|
||||
"symbol": "﷼"
|
||||
"symbol": "﷼",
|
||||
"country": "Iran (Iranian Rial)"
|
||||
},
|
||||
"IRT": {
|
||||
"endPointKey": "IRT",
|
||||
"locale": "fa-IR",
|
||||
"source": "Exir",
|
||||
"symbol": "تومان"
|
||||
"symbol": "تومان",
|
||||
"country": "Iran (Iranian Toman)"
|
||||
},
|
||||
"ISK": {
|
||||
"endPointKey": "ISK",
|
||||
"locale": "is-IS",
|
||||
"source": "CoinDesk",
|
||||
"symbol": "kr"
|
||||
"symbol": "kr",
|
||||
"country": "Iceland (Icelandic Króna)"
|
||||
},
|
||||
"JPY": {
|
||||
"endPointKey": "JPY",
|
||||
"locale": "ja-JP",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "¥"
|
||||
"symbol": "¥",
|
||||
"country": "Japan (Japanese Yen)"
|
||||
},
|
||||
"KES": {
|
||||
"endPointKey": "KES",
|
||||
"locale": "en-KE",
|
||||
"source": "CoinDesk",
|
||||
"symbol": "Ksh"
|
||||
"symbol": "Ksh",
|
||||
"country": "Kenya (Kenyan Shilling)"
|
||||
},
|
||||
"KRW": {
|
||||
"endPointKey": "KRW",
|
||||
"locale": "ko-KR",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "₩"
|
||||
"symbol": "₩",
|
||||
"country": "South Korea (South Korean Won)"
|
||||
},
|
||||
"KWD": {
|
||||
"endPointKey": "KWD",
|
||||
"locale": "ar-KW",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "د.ك."
|
||||
"symbol": "د.ك.",
|
||||
"country": "Kuwait (Kuwaiti Dinar)"
|
||||
},
|
||||
"LBP": {
|
||||
"endPointKey": "LBP",
|
||||
"locale": "ar-LB",
|
||||
"source": "YadioConvert",
|
||||
"symbol": "ل.ل."
|
||||
"symbol": "ل.ل.",
|
||||
"country": "Lebanon (Lebanese Pound)"
|
||||
},
|
||||
"LKR": {
|
||||
"endPointKey": "LKR",
|
||||
"locale": "si-LK",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "රු."
|
||||
"symbol": "රු.",
|
||||
"country": "Sri Lanka (Sri Lankan Rupee)"
|
||||
},
|
||||
"MXN": {
|
||||
"endPointKey": "MXN",
|
||||
"locale": "es-MX",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "$"
|
||||
"symbol": "$",
|
||||
"country": "Mexico (Mexican Peso)"
|
||||
},
|
||||
"MYR": {
|
||||
"endPointKey": "MYR",
|
||||
"locale": "ms-MY",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "RM"
|
||||
"symbol": "RM",
|
||||
"country": "Malaysia (Malaysian Ringgit)"
|
||||
},
|
||||
"MZN": {
|
||||
"endPointKey": "MZN",
|
||||
"locale": "seh-MZ",
|
||||
"source": "CoinDesk",
|
||||
"symbol": "MTn"
|
||||
"symbol": "MTn",
|
||||
"country": "Mozambique (Mozambican Metical)"
|
||||
},
|
||||
"NGN": {
|
||||
"endPointKey": "NGN",
|
||||
"locale": "en-NG",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "₦"
|
||||
"symbol": "₦",
|
||||
"country": "Nigeria (Nigerian Naira)"
|
||||
},
|
||||
"NOK": {
|
||||
"endPointKey": "NOK",
|
||||
"locale": "nb-NO",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "kr"
|
||||
"symbol": "kr",
|
||||
"country": "Norway (Norwegian Krone)"
|
||||
},
|
||||
"NZD": {
|
||||
"endPointKey": "NZD",
|
||||
"locale": "en-NZ",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "$"
|
||||
"symbol": "$",
|
||||
"country": "New Zealand (New Zealand Dollar)"
|
||||
},
|
||||
"OMR": {
|
||||
"endPointKey": "OMR",
|
||||
"locale": "ar-OM",
|
||||
"source": "CoinDesk",
|
||||
"symbol": "ر.ع."
|
||||
"symbol": "ر.ع.",
|
||||
"country": "Oman (Omani Rial)"
|
||||
},
|
||||
"PHP": {
|
||||
"endPointKey": "PHP",
|
||||
"locale": "en-PH",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "₱"
|
||||
"symbol": "₱",
|
||||
"country": "Philippines (Philippine Peso)"
|
||||
},
|
||||
"PLN": {
|
||||
"endPointKey": "PLN",
|
||||
"locale": "pl-PL",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "zł"
|
||||
"symbol": "zł",
|
||||
"country": "Poland (Polish Zloty)"
|
||||
},
|
||||
"QAR": {
|
||||
"endPointKey": "QAR",
|
||||
"locale": "ar-QA",
|
||||
"source": "CoinDesk",
|
||||
"symbol": "ر.ق."
|
||||
"symbol": "ر.ق.",
|
||||
"country": "Qatar (Qatari Riyal)"
|
||||
},
|
||||
"RON": {
|
||||
"endPointKey": "RON",
|
||||
"locale": "ro-RO",
|
||||
"source": "BNR",
|
||||
"symbol": "lei"
|
||||
"symbol": "lei",
|
||||
"country": "Romania (Romanian Leu)"
|
||||
},
|
||||
"RUB": {
|
||||
"endPointKey": "RUB",
|
||||
"locale": "ru-RU",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "₽"
|
||||
"symbol": "₽",
|
||||
"country": "Russia (Russian Ruble)"
|
||||
},
|
||||
"SAR": {
|
||||
"endPointKey": "SAR",
|
||||
"locale": "ar-SA",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "ر.س."
|
||||
"symbol": "ر.س.",
|
||||
"country": "Saudi Arabia (Saudi Riyal)"
|
||||
},
|
||||
"SEK": {
|
||||
"endPointKey": "SEK",
|
||||
"locale": "sv-SE",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "kr"
|
||||
"symbol": "kr",
|
||||
"country": "Sweden (Swedish Krona)"
|
||||
},
|
||||
"SGD": {
|
||||
"endPointKey": "SGD",
|
||||
"locale": "zh-SG",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "S$"
|
||||
"symbol": "S$",
|
||||
"country": "Singapore (Singapore Dollar)"
|
||||
},
|
||||
"THB": {
|
||||
"endPointKey": "THB",
|
||||
"locale": "th-TH",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "฿"
|
||||
"symbol": "฿",
|
||||
"country": "Thailand (Thai Baht)"
|
||||
},
|
||||
"TRY": {
|
||||
"endPointKey": "TRY",
|
||||
"locale": "tr-TR",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "₺"
|
||||
"symbol": "₺",
|
||||
"country": "Turkey (Turkish Lira)"
|
||||
},
|
||||
"TWD": {
|
||||
"endPointKey": "TWD",
|
||||
"locale": "zh-Hant-TW",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "NT$"
|
||||
"symbol": "NT$",
|
||||
"country": "Taiwan (New Taiwan Dollar)"
|
||||
},
|
||||
"TZS": {
|
||||
"endPointKey": "TZS",
|
||||
"locale": "en-TZ",
|
||||
"source": "CoinDesk",
|
||||
"symbol": "TSh"
|
||||
"symbol": "TSh",
|
||||
"country": "Tanzania (Tanzanian Shilling)"
|
||||
},
|
||||
"UAH": {
|
||||
"endPointKey": "UAH",
|
||||
"locale": "uk-UA",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "₴"
|
||||
"symbol": "₴",
|
||||
"country": "Ukraine (Ukrainian Hryvnia)"
|
||||
},
|
||||
"UGX": {
|
||||
"endPointKey": "UGX",
|
||||
"locale": "en-UG",
|
||||
"source": "CoinDesk",
|
||||
"symbol": "USh"
|
||||
"symbol": "USh",
|
||||
"country": "Uganda (Ugandan Shilling)"
|
||||
},
|
||||
"UYU": {
|
||||
"endPointKey": "UYU",
|
||||
"locale": "es-UY",
|
||||
"source": "CoinDesk",
|
||||
"symbol": "$"
|
||||
"symbol": "$",
|
||||
"country": "Uruguay (Uruguayan Peso)"
|
||||
},
|
||||
"VEF": {
|
||||
"endPointKey": "VEF",
|
||||
"locale": "es-VE",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "Bs."
|
||||
"symbol": "Bs.",
|
||||
"country": "Venezuela (Venezuelan Bolívar Fuerte)"
|
||||
},
|
||||
"VES": {
|
||||
"endPointKey": "VES",
|
||||
"locale": "es-VE",
|
||||
"source": "Yadio",
|
||||
"symbol": "Bs."
|
||||
"symbol": "Bs.",
|
||||
"country": "Venezuela (Venezuelan Bolívar Soberano)"
|
||||
},
|
||||
"ZAR": {
|
||||
"endPointKey": "ZAR",
|
||||
"locale": "en-ZA",
|
||||
"source": "CoinGecko",
|
||||
"symbol": "R"
|
||||
"symbol": "R",
|
||||
"country": "South Africa (South African Rand)"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import { useNavigation, useRoute } from '@react-navigation/native';
|
||||
import * as bitcoin from 'bitcoinjs-lib';
|
||||
import React, { useState } from 'react';
|
||||
import { useRoute } from '@react-navigation/native';
|
||||
import * as bitcoin from 'bitcoinjs-lib';
|
||||
import { ActivityIndicator, Keyboard, KeyboardAvoidingView, Linking, Platform, StyleSheet, TextInput, View } from 'react-native';
|
||||
|
||||
import * as BlueElectrum from '../../blue_modules/BlueElectrum';
|
||||
|
|
@ -37,7 +37,6 @@ interface SuccessScreenProps {
|
|||
|
||||
const Broadcast: React.FC = () => {
|
||||
const { name } = useRoute();
|
||||
const { navigate } = useNavigation();
|
||||
const [tx, setTx] = useState<string | undefined>();
|
||||
const [txHex, setTxHex] = useState<string | undefined>();
|
||||
const { colors } = useTheme();
|
||||
|
|
@ -83,7 +82,7 @@ const Broadcast: React.FC = () => {
|
|||
};
|
||||
|
||||
const handleQRScan = async () => {
|
||||
const scannedData = await scanQrHelper(navigate, name);
|
||||
const scannedData = await scanQrHelper(name);
|
||||
if (!scannedData) return;
|
||||
|
||||
if (scannedData.indexOf('+') === -1 && scannedData.indexOf('=') === -1 && scannedData.indexOf('=') === -1) {
|
||||
|
|
|
|||
|
|
@ -857,7 +857,7 @@ const SendDetails = () => {
|
|||
setIsLoading(true);
|
||||
setOptionsVisible(false);
|
||||
await new Promise(resolve => setTimeout(resolve, 100)); // sleep for animations
|
||||
const scannedData = await scanQrHelper(navigation.navigate, name);
|
||||
const scannedData = await scanQrHelper(name);
|
||||
if (!scannedData) return setIsLoading(false);
|
||||
|
||||
let tx;
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ const PsbtMultisigQRCode = () => {
|
|||
};
|
||||
|
||||
const openScanner = async () => {
|
||||
const scanned = await scanQrHelper(navigate, name, true);
|
||||
const scanned = await scanQrHelper(name, true);
|
||||
onBarScanned({ data: scanned });
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ import { useTheme } from '../../components/themes';
|
|||
import { useExtendedNavigation } from '../../hooks/useExtendedNavigation';
|
||||
import loc from '../../loc';
|
||||
import { FiatUnit, FiatUnitSource, FiatUnitType, getFiatRate } from '../../models/fiatUnit';
|
||||
import useDebounce from '../../hooks/useDebounce';
|
||||
|
||||
dayjs.extend(calendar);
|
||||
|
||||
|
|
@ -26,13 +27,20 @@ const Currency: React.FC = () => {
|
|||
const [isSavingNewPreferredCurrency, setIsSavingNewPreferredCurrency] = useState(false);
|
||||
const [selectedCurrency, setSelectedCurrency] = useState<FiatUnitType>(FiatUnit.USD);
|
||||
const [currencyRate, setCurrencyRate] = useState<CurrencyRate>({ LastUpdated: null, Rate: null });
|
||||
const [isSearchFocused, setIsSearchFocused] = useState(false);
|
||||
const { colors } = useTheme();
|
||||
const { setOptions } = useExtendedNavigation();
|
||||
const [search, setSearch] = useState('');
|
||||
const debouncedSearch = useDebounce(search, 300);
|
||||
|
||||
const data = useMemo(
|
||||
() => Object.values(FiatUnit).filter(item => item.endPointKey.toLowerCase().includes(search.toLowerCase())),
|
||||
[search],
|
||||
() =>
|
||||
Object.values(FiatUnit).filter(
|
||||
item =>
|
||||
item.endPointKey.toLowerCase().includes(debouncedSearch.toLowerCase()) ||
|
||||
item.country.toLowerCase().includes(debouncedSearch.toLowerCase()),
|
||||
),
|
||||
[debouncedSearch],
|
||||
);
|
||||
|
||||
const stylesHook = StyleSheet.create({
|
||||
|
|
@ -64,6 +72,8 @@ const Currency: React.FC = () => {
|
|||
setOptions({
|
||||
headerSearchBarOptions: {
|
||||
onChangeText: (event: NativeSyntheticEvent<{ text: string }>) => setSearch(event.nativeEvent.text),
|
||||
onFocus: () => setIsSearchFocused(true),
|
||||
onBlur: () => setIsSearchFocused(false),
|
||||
},
|
||||
});
|
||||
}, [setOptions]);
|
||||
|
|
@ -74,6 +84,7 @@ const Currency: React.FC = () => {
|
|||
title={`${item.endPointKey} (${item.symbol})`}
|
||||
containerStyle={StyleSheet.flatten([styles.flex, stylesHook.flex, { minHeight: 60 }])}
|
||||
checkmark={selectedCurrency.endPointKey === item.endPointKey}
|
||||
subtitle={item.country}
|
||||
onPress={async () => {
|
||||
setIsSavingNewPreferredCurrency(true);
|
||||
try {
|
||||
|
|
@ -86,7 +97,7 @@ const Currency: React.FC = () => {
|
|||
} catch (error: any) {
|
||||
console.log(error);
|
||||
presentAlert({
|
||||
message: error.message ? `${loc.settings.currency_fetch_error}: ${error.message}}` : loc.settings.currency_fetch_error,
|
||||
message: error.message ? `${loc.settings.currency_fetch_error}: ${error.message}` : loc.settings.currency_fetch_error,
|
||||
});
|
||||
} finally {
|
||||
setIsSavingNewPreferredCurrency(false);
|
||||
|
|
@ -95,6 +106,11 @@ const Currency: React.FC = () => {
|
|||
/>
|
||||
);
|
||||
|
||||
const selectedCurrencyVisible = useMemo(
|
||||
() => data.some(item => item.endPointKey === selectedCurrency.endPointKey),
|
||||
[data, selectedCurrency],
|
||||
);
|
||||
|
||||
return (
|
||||
<View style={[styles.flex, stylesHook.flex]}>
|
||||
<FlatList
|
||||
|
|
@ -105,19 +121,21 @@ const Currency: React.FC = () => {
|
|||
initialNumToRender={30}
|
||||
renderItem={renderItem}
|
||||
/>
|
||||
<BlueCard>
|
||||
<BlueText>
|
||||
{loc.settings.currency_source} {selectedCurrency?.source ?? FiatUnitSource.CoinDesk}
|
||||
</BlueText>
|
||||
<BlueSpacing10 />
|
||||
<BlueText>
|
||||
{loc.settings.rate}: {currencyRate.Rate ?? loc._.never}
|
||||
</BlueText>
|
||||
<BlueSpacing10 />
|
||||
<BlueText>
|
||||
{loc.settings.last_updated}: {dayjs(currencyRate.LastUpdated).calendar() ?? loc._.never}
|
||||
</BlueText>
|
||||
</BlueCard>
|
||||
{!isSearchFocused || selectedCurrencyVisible ? (
|
||||
<BlueCard>
|
||||
<BlueText>
|
||||
{loc.settings.currency_source} {selectedCurrency?.source ?? FiatUnitSource.CoinDesk}
|
||||
</BlueText>
|
||||
<BlueSpacing10 />
|
||||
<BlueText>
|
||||
{loc.settings.rate}: {currencyRate.Rate ?? loc._.never}
|
||||
</BlueText>
|
||||
<BlueSpacing10 />
|
||||
<BlueText>
|
||||
{loc.settings.last_updated}: {dayjs(currencyRate.LastUpdated).calendar() ?? loc._.never}
|
||||
</BlueText>
|
||||
</BlueCard>
|
||||
) : null}
|
||||
</View>
|
||||
);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ import ListItem from '../../components/ListItem';
|
|||
import { BlueCurrentTheme } from '../../components/themes';
|
||||
import { scanQrHelper } from '../../helpers/scan-qr';
|
||||
import loc from '../../loc';
|
||||
import { navigationRef } from '../../NavigationService';
|
||||
|
||||
export default class ElectrumSettings extends Component {
|
||||
static contextType = BlueStorageContext;
|
||||
|
|
@ -225,7 +224,7 @@ export default class ElectrumSettings extends Component {
|
|||
};
|
||||
|
||||
importScan = async () => {
|
||||
const scanned = await scanQrHelper(navigationRef.navigate, 'ElectrumSettings', true);
|
||||
const scanned = await scanQrHelper('ElectrumSettings', true);
|
||||
this.onBarScanned(scanned);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ import { useBiometrics } from '../../hooks/useBiometrics';
|
|||
import { useExtendedNavigation } from '../../hooks/useExtendedNavigation';
|
||||
import usePrivacy from '../../hooks/usePrivacy';
|
||||
import loc from '../../loc';
|
||||
import * as NavigationService from '../../NavigationService';
|
||||
import ActionSheet from '../ActionSheet';
|
||||
|
||||
const ViewEditMultisigCosigners: React.FC = () => {
|
||||
|
|
@ -513,7 +512,7 @@ const ViewEditMultisigCosigners: React.FC = () => {
|
|||
|
||||
const scanOrOpenFile = async () => {
|
||||
setIsProvideMnemonicsModalVisible(false);
|
||||
const scanned = await scanQrHelper(NavigationService.navigate, route.name, true);
|
||||
const scanned = await scanQrHelper(route.name, true);
|
||||
setImportText(String(scanned));
|
||||
setIsProvideMnemonicsModalVisible(true);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -318,7 +318,7 @@ const WalletsList: React.FC = () => {
|
|||
};
|
||||
|
||||
const onScanButtonPressed = () => {
|
||||
scanQrHelper(navigate, routeName).then(onBarScanned);
|
||||
scanQrHelper(routeName).then(onBarScanned);
|
||||
};
|
||||
|
||||
const onBarScanned = (value: any) => {
|
||||
|
|
@ -364,7 +364,7 @@ const WalletsList: React.FC = () => {
|
|||
});
|
||||
break;
|
||||
case 2:
|
||||
scanQrHelper(navigate, routeName, true).then(data => onBarScanned(data));
|
||||
scanQrHelper(routeName, true).then(data => onBarScanned(data));
|
||||
break;
|
||||
case 3:
|
||||
if (!isClipboardEmpty) {
|
||||
|
|
|
|||
|
|
@ -461,7 +461,7 @@ const WalletsAddMultisigStep2 = () => {
|
|||
const scanOrOpenFile = () => {
|
||||
setIsProvideMnemonicsModalVisible(false);
|
||||
InteractionManager.runAfterInteractions(async () => {
|
||||
const scanned = await scanQrHelper(navigation.navigate, name, true);
|
||||
const scanned = await scanQrHelper(name, true);
|
||||
onBarScanned({ data: scanned });
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -409,7 +409,7 @@ const WalletTransactions = ({ navigation }) => {
|
|||
choosePhoto();
|
||||
break;
|
||||
case 2:
|
||||
scanQrHelper(navigate, name, true).then(data => onBarCodeRead(data));
|
||||
scanQrHelper(name, true).then(data => onBarCodeRead(data));
|
||||
break;
|
||||
case 3:
|
||||
if (!isClipboardEmpty) {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue