mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2024-11-19 18:00:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3840 from BlueWallet/timeout

Browse Source 
FIX: Add timeouts for modal navigation
This commit is contained in:
GLaDOS 2021-09-17 09:17:42 +01:00 committed by GitHub
commit d4cc2ea18f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App.js
View File

@ -333,7 +333,7 @@ const App = () => {
onPress={async () => { onPress={async () => {
setIsClipboardContentModalVisible(false); setIsClipboardContentModalVisible(false);
const clipboard = await BlueClipboard.getClipboardContent(); const clipboard = await BlueClipboard.getClipboardContent();
setTimeout(() => handleOpenURL({ url: clipboard }), 100); setTimeout(() => handleOpenURL({ url: clipboard }), 650);
}} }}
/> />
</View> </View>

25
ios/BlueWallet.xcodeproj/xcshareddata/xcschemes/BlueWalletWatch (Notification).xcscheme
View File

@ -65,10 +65,8 @@
allowLocationSimulation = "YES" allowLocationSimulation = "YES"
launchAutomaticallySubstyle = "8" launchAutomaticallySubstyle = "8"
notificationPayloadFile = "BlueWalletWatch Extension/PushNotificationPayload.apns"> notificationPayloadFile = "BlueWalletWatch Extension/PushNotificationPayload.apns">
<RemoteRunnable <BuildableProductRunnable
runnableDebuggingMode = "2" runnableDebuggingMode = "0">
BundleIdentifier = "com.apple.Carousel"
RemotePath = "/BlueWallet">
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "B40D4E2F225841EC00428FCC" BlueprintIdentifier = "B40D4E2F225841EC00428FCC"
@ -76,7 +74,7 @@
BlueprintName = "BlueWalletWatch" BlueprintName = "BlueWalletWatch"
ReferencedContainer = "container:BlueWallet.xcodeproj"> ReferencedContainer = "container:BlueWallet.xcodeproj">
</BuildableReference> </BuildableReference>
</RemoteRunnable> </BuildableProductRunnable>
</LaunchAction> </LaunchAction>
<ProfileAction <ProfileAction
buildConfiguration = "Release" buildConfiguration = "Release"
@ -86,10 +84,8 @@
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
launchAutomaticallySubstyle = "8" launchAutomaticallySubstyle = "8"
notificationPayloadFile = "BlueWalletWatch Extension/PushNotificationPayload.apns"> notificationPayloadFile = "BlueWalletWatch Extension/PushNotificationPayload.apns">
<RemoteRunnable <BuildableProductRunnable
runnableDebuggingMode = "2" runnableDebuggingMode = "0">
BundleIdentifier = "com.apple.Carousel"
RemotePath = "/BlueWallet">
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "B40D4E2F225841EC00428FCC" BlueprintIdentifier = "B40D4E2F225841EC00428FCC"
@ -97,16 +93,7 @@
BlueprintName = "BlueWalletWatch" BlueprintName = "BlueWalletWatch"
ReferencedContainer = "container:BlueWallet.xcodeproj"> ReferencedContainer = "container:BlueWallet.xcodeproj">
</BuildableReference> </BuildableReference>
</RemoteRunnable> </BuildableProductRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B40D4E2F225841EC00428FCC"
BuildableName = "BlueWalletWatch.app"
BlueprintName = "BlueWalletWatch"
ReferencedContainer = "container:BlueWallet.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

25
ios/BlueWallet.xcodeproj/xcshareddata/xcschemes/BlueWalletWatch.xcscheme
View File

@ -64,10 +64,8 @@
debugServiceExtension = "internal" debugServiceExtension = "internal"
allowLocationSimulation = "YES" allowLocationSimulation = "YES"
notificationPayloadFile = "BlueWalletWatch Extension/PushNotificationPayload.apns"> notificationPayloadFile = "BlueWalletWatch Extension/PushNotificationPayload.apns">
<RemoteRunnable <BuildableProductRunnable
runnableDebuggingMode = "2" runnableDebuggingMode = "0">
BundleIdentifier = "com.apple.Carousel"
RemotePath = "/BlueWallet">
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "B40D4E2F225841EC00428FCC" BlueprintIdentifier = "B40D4E2F225841EC00428FCC"
@ -75,7 +73,7 @@
BlueprintName = "BlueWalletWatch" BlueprintName = "BlueWalletWatch"
ReferencedContainer = "container:BlueWallet.xcodeproj"> ReferencedContainer = "container:BlueWallet.xcodeproj">
</BuildableReference> </BuildableReference>
</RemoteRunnable> </BuildableProductRunnable>
</LaunchAction> </LaunchAction>
<ProfileAction <ProfileAction
buildConfiguration = "Release" buildConfiguration = "Release"
@ -83,10 +81,8 @@
savedToolIdentifier = "" savedToolIdentifier = ""
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<RemoteRunnable <BuildableProductRunnable
runnableDebuggingMode = "2" runnableDebuggingMode = "0">
BundleIdentifier = "com.apple.Carousel"
RemotePath = "/BlueWallet">
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "B40D4E2F225841EC00428FCC" BlueprintIdentifier = "B40D4E2F225841EC00428FCC"
@ -94,16 +90,7 @@
BlueprintName = "BlueWalletWatch" BlueprintName = "BlueWalletWatch"
ReferencedContainer = "container:BlueWallet.xcodeproj"> ReferencedContainer = "container:BlueWallet.xcodeproj">
</BuildableReference> </BuildableReference>
</RemoteRunnable> </BuildableProductRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B40D4E2F225841EC00428FCC"
BuildableName = "BlueWalletWatch.app"
BlueprintName = "BlueWalletWatch"
ReferencedContainer = "container:BlueWallet.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

18
screen/wallets/addMultisigStep2.js
View File

@ -412,13 +412,17 @@ const WalletsAddMultisigStep2 = () => {
fs.showActionSheet({ anchor: findNodeHandle(openScannerButton.current) }).then(onBarScanned); fs.showActionSheet({ anchor: findNodeHandle(openScannerButton.current) }).then(onBarScanned);
} else { } else {
setIsProvideMnemonicsModalVisible(false); setIsProvideMnemonicsModalVisible(false);
navigation.navigate('ScanQRCodeRoot', { setTimeout(
screen: 'ScanQRCode', () =>
params: { navigation.navigate('ScanQRCodeRoot', {
onBarScanned: onBarScanned, screen: 'ScanQRCode',
showFileImportButton: true, params: {
}, onBarScanned: onBarScanned,
}); showFileImportButton: true,
},
}),
650,
);
} }
}; };

30
screen/wallets/viewEditMultisigCosigners.js
View File

@ -463,19 +463,23 @@ const ViewEditMultisigCosigners = () => {
}); });
} else { } else {
setIsProvideMnemonicsModalVisible(false); setIsProvideMnemonicsModalVisible(false);
navigate('ScanQRCodeRoot', { setTimeout(
screen: 'ScanQRCode', () =>
params: { navigate('ScanQRCodeRoot', {
launchedBy: route.name, screen: 'ScanQRCode',
onBarScanned: result => { params: {
// Triggers FlatList re-render launchedBy: route.name,
setImportText(result); onBarScanned: result => {
// // Triggers FlatList re-render
_handleUseMnemonicPhrase(result); setImportText(result);
}, //
showFileImportButton: true, _handleUseMnemonicPhrase(result);
}, },
}); showFileImportButton: true,
},
}),
650,
);
} }
}; };