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

Merge pull request from BlueWallet/resetui

Browse source 
FIX: If timeout is reached, reset wallet status label
This commit is contained in:
GLaDOS 2024-09-16 06:32:21 +00:00 • committed by GitHub
commit 9feb5b4c1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 49 additions and 26 deletions

69
components/Context/StorageProvider.tsx
View file

@ -128,37 +128,62 @@ export const StorageProvider = ({ children }: { children: React.ReactNode }) =>
const refreshAllWalletTransactions = useCallback(
async (lastSnappedTo?: number, showUpdateStatusIndicator: boolean = true) => {
InteractionManager.runAfterInteractions(async () => {
let noErr = true;
const TIMEOUT_DURATION = 30000;
const timeoutPromise = new Promise<never>((_resolve, reject) =>
setTimeout(() => {
reject(new Error('refreshAllWalletTransactions: Timeout reached'));
}, TIMEOUT_DURATION),
);
const mainLogicPromise = new Promise<void>((resolve, reject) => {
try {
await BlueElectrum.waitTillConnected();
if (showUpdateStatusIndicator) {
setWalletTransactionUpdateStatus(WalletTransactionsStatus.ALL);
}
const paymentCodesStart = Date.now();
await BlueApp.fetchSenderPaymentCodes(lastSnappedTo);
const paymentCodesEnd = Date.now();
console.log('fetch payment codes took', (paymentCodesEnd - paymentCodesStart) / 1000, 'sec');
const balanceStart = +new Date();
await fetchWalletBalances(lastSnappedTo);
const balanceEnd = +new Date();
console.log('fetch balance took', (balanceEnd - balanceStart) / 1000, 'sec');
const start = +new Date();
await fetchWalletTransactions(lastSnappedTo);
const end = +new Date();
console.log('fetch tx took', (end - start) / 1000, 'sec');
InteractionManager.runAfterInteractions(async () => {
let noErr = true;
try {
await BlueElectrum.waitTillConnected();
if (showUpdateStatusIndicator) {
setWalletTransactionUpdateStatus(WalletTransactionsStatus.ALL);
}
const paymentCodesStart = Date.now();
await BlueApp.fetchSenderPaymentCodes(lastSnappedTo);
const paymentCodesEnd = Date.now();
console.log('fetch payment codes took', (paymentCodesEnd - paymentCodesStart) / 1000, 'sec');
const balanceStart = +new Date();
await fetchWalletBalances(lastSnappedTo);
const balanceEnd = +new Date();
console.log('fetch balance took', (balanceEnd - balanceStart) / 1000, 'sec');
const start = +new Date();
await fetchWalletTransactions(lastSnappedTo);
const end = +new Date();
console.log('fetch tx took', (end - start) / 1000, 'sec');
} catch (err) {
noErr = false;
console.warn(err);
reject(err);
} finally {
setWalletTransactionUpdateStatus(WalletTransactionsStatus.NONE);
}
if (noErr) await saveToDisk(); // caching
resolve();
});
} catch (err) {
noErr = false;
console.warn(err);
reject(err);
} finally {
setWalletTransactionUpdateStatus(WalletTransactionsStatus.NONE);
}
if (noErr) await saveToDisk(); // caching
});
try {
await Promise.race([mainLogicPromise, timeoutPromise]);
} catch (err) {
console.error('Error in refreshAllWalletTransactions:', err);
} finally {
setWalletTransactionUpdateStatus(WalletTransactionsStatus.NONE);
}
},
[fetchWalletBalances, fetchWalletTransactions, saveToDisk],
);
const fetchAndSaveWalletTransactions = useCallback(
async (walletID: string) => {
InteractionManager.runAfterInteractions(async () => {

5
components/WatchOnlyWarning.tsx
View file

@ -5,14 +5,13 @@ import loc from '../loc';
interface Props {
handleDismiss: () => void;
disabled?: boolean;
}
const WatchOnlyWarning: React.FC<Props> = ({ handleDismiss, disabled }) => {
const WatchOnlyWarning: React.FC<Props> = ({ handleDismiss }) => {
return (
<View style={styles.container}>
<View style={styles.content}>
<TouchableOpacity style={styles.dismissButton} onPress={handleDismiss} disabled={disabled}>
<TouchableOpacity style={styles.dismissButton} onPress={handleDismiss}>
<Icon name="close" color="white" size={20} />
</TouchableOpacity>
<Icon name="warning" color="#FFFF" />

1
screen/wallets/WalletTransactions.tsx
View file

@ -420,7 +420,6 @@ const WalletTransactions: React.FC<WalletTransactionsProps> = ({ route }) => {
<View style={[styles.list, stylesHook.list]}>
{wallet?.type === WatchOnlyWallet.type && wallet.isWatchOnlyWarningVisible && (
<WatchOnlyWarning
disabled={isLoading}
handleDismiss={() => {
wallet.isWatchOnlyWarningVisible = false;
LayoutAnimation.configureNext(LayoutAnimation.Presets.linear);