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

Merge pull request #2355 from BlueWallet/scanread

Browse Source 
FIX: Scan progress readability
This commit is contained in:
GLaDOS 2020-12-19 18:54:17 +00:00 committed by GitHub
commit 1059793e65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
loc/en.json
View File

@ -402,6 +402,7 @@
"list_tryagain": "Try again",
"looks_like_bip38": "This looks like a password-protected private key (BIP38)",
"reorder_title": "Reorder Wallets",
"please_continue_scanning": "Please continue scanning",
"select_no_bitcoin": "There are currently no Bitcoin wallets available.",
"select_no_bitcoin_exp": "A Bitcoin wallet is required to refill Lightning wallets. Please create or import one.",
"select_wallet": "Select Wallet",

7
screen/send/ScanQRCode.js
View File

@ -70,7 +70,7 @@ const styles = StyleSheet.create({
position: 'absolute',
},
backdoorInputWrapper: { position: 'absolute', left: '5%', top: '0%', width: '90%', height: '70%', backgroundColor: 'white' },
progressWrapper: { position: 'absolute', right: '50%', top: '50%', backgroundColor: 'rgba(255, 255, 255, 0.1)' },
progressWrapper: { position: 'absolute', alignSelf: 'center', alignItems: 'center', top: '50%', padding: 8, borderRadius: 8 },
backdoorInput: {
height: '50%',
marginTop: 5,
@ -105,6 +105,7 @@ const ScanQRCode = () => {
openSettingsContainer: {
backgroundColor: colors.brandingColor,
},
progressWrapper: { backgroundColor: colors.brandingColor, borderColor: colors.foregroundColor, borderWidth: 4 },
});
const HashIt = function (s) {
return createHash('sha256').update(s).digest().toString('hex');
@ -270,13 +271,13 @@ const ScanQRCode = () => {
</TouchableOpacity>
)}
{urTotal > 0 && (
<View style={styles.progressWrapper} testID="UrProgressBar">
<View style={[styles.progressWrapper, stylesHook.progressWrapper]} testID="UrProgressBar">
<BlueText>{loc.wallets.please_continue_scanning}</BlueText>
<BlueText>
{urHave} / {urTotal}
</BlueText>
</View>
)}
{backdoorVisible && (
<View style={styles.backdoorInputWrapper}>
<BlueText>Provide QR code contents manually:</BlueText>