Merge branch 'master' of github.com:Overtorment/BlueWallet

This commit is contained in:
Overtorment 2018-10-31 18:35:55 +00:00
commit 4606634e5a
6 changed files with 13 additions and 2 deletions

BIN
img/qr-code.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
img/qr-code@2x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

BIN
img/qr-code@3x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

8
package-lock.json generated
View file

@ -11929,6 +11929,14 @@
}
}
},
"react-native-custom-qr-codes": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/react-native-custom-qr-codes/-/react-native-custom-qr-codes-1.0.2.tgz",
"integrity": "sha1-t9EipGMtJSsPdulLQIRnNCGs4EE=",
"requires": {
"prop-types": "^15.5.10"
}
},
"react-native-dismiss-keyboard": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/react-native-dismiss-keyboard/-/react-native-dismiss-keyboard-1.0.0.tgz",

View file

@ -62,6 +62,7 @@
"react-localization": "^1.0.10",
"react-native": "https://github.com/expo/react-native/archive/sdk-30.0.0.tar.gz",
"react-native-camera": "^0.12.0",
"react-native-custom-qr-codes": "^1.0.2",
"react-native-elements": "^0.19.0",
"react-native-flexi-radio-button": "^0.2.2",
"react-native-keyboard-aware-scroll-view": "^0.7.4",

View file

@ -1,6 +1,6 @@
import React, { Component } from 'react';
import { Animated, StyleSheet, View, TouchableOpacity, Clipboard, Share } from 'react-native';
import QRCode from 'react-native-qrcode';
import { QRCode } from 'react-native-custom-qr-codes';
import { BlueLoading, SafeBlueArea, BlueButton, BlueNavigationStyle, is } from '../../BlueComponents';
import PropTypes from 'prop-types';
/** @type {AppStorage} */
@ -87,11 +87,13 @@ export default class ReceiveDetails extends Component {
<View style={{ flex: 1, justifyContent: 'space-between', alignItems: 'center' }}>
<View style={{ flex: 1, justifyContent: 'center', alignItems: 'center', paddingHorizontal: 16 }}>
<QRCode
value={this.state.address}
content={this.state.address}
size={(is.ipad() && 300) || 300}
bgColor={BlueApp.settings.foregroundColor}
fgColor={BlueApp.settings.brandingColor}
logo={require('../../img/qr-code.png')}
/>
<TouchableOpacity onPress={this.copyToClipboard}>
<Animated.Text style={styles.address} numberOfLines={0}>
{this.state.addressText}