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

Merge branch 'master' into pr/2021

Browse source
This commit is contained in:
marcosrdz 2020-10-26 11:28:37 -04:00
commit 23baf648e5
6 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/automerge.yml vendored
View file

@ -27,8 +27,4 @@ jobs:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_LABELS: "!work in progress,!WIP,!DO NOT MERGE"
MERGE_FORKS: false
MERGE_RETRIES: 10
MERGE_RETRY_SLEEP: 1800000
MERGE_DELETE_BRANCH: true
UPDATE_RETRIES: 10
UPDATE_RETRY_SLEEP: 1800000

12
ios/Podfile.lock
View file

@ -251,13 +251,13 @@ PODS:
- React
- react-native-blur (0.8.0):
- React
- react-native-camera (3.39.1):
- react-native-camera (3.40.0):
- React-Core
- react-native-camera/RCT (= 3.39.1)
- react-native-camera/RN (= 3.39.1)
- react-native-camera/RCT (3.39.1):
- react-native-camera/RCT (= 3.40.0)
- react-native-camera/RN (= 3.40.0)
- react-native-camera/RCT (3.40.0):
- React-Core
- react-native-camera/RN (3.39.1):
- react-native-camera/RN (3.40.0):
- React-Core
- react-native-document-picker (3.5.4):
- React
@ -679,7 +679,7 @@ SPEC CHECKSUMS:
React-jsinspector: 8e68ffbfe23880d3ee9bafa8be2777f60b25cbe2
react-native-blue-crypto: 23f1558ad3d38d7a2edb7e2f6ed1bc520ed93e56
react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c
react-native-camera: fc1296181b2d393ea698164869070c96d8625129
react-native-camera: 5c1fbfecf63b802b8ca4a71c60d30a71550fb348
react-native-document-picker: c5752781fbc0c126c627c1549b037c139444a4cf
react-native-fingerprint-scanner: c68136ca57e3704d7bdf5faa554ea535ce15b1d0
react-native-geolocation: cbd9d6bd06bac411eed2671810f454d4908484a8

12
package-lock.json generated
View file

@ -7073,9 +7073,9 @@
"integrity": "sha1-nGZalfiLiwj8Bc/XMfVhhZ1yWCU="
},
"bignumber.js": {
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz",
"integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A=="
"version": "9.0.1",
"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz",
"integrity": "sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA=="
},
"binary-extensions": {
"version": "1.13.1",
@ -7101,9 +7101,9 @@
}
},
"bip32": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/bip32/-/bip32-2.0.5.tgz",
"integrity": "sha512-zVY4VvJV+b2fS0/dcap/5XLlpqtgwyN8oRkuGgAS1uLOeEp0Yo6Tw2yUTozTtlrMJO3G8n4g/KX/XGFHW6Pq3g==",
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/bip32/-/bip32-2.0.6.tgz",
"integrity": "sha512-HpV5OMLLGTjSVblmrtYRfFFKuQB+GArM0+XP8HGWfJ5vxYBqo+DesvJwOdC2WJ3bCkZShGf0QIfoIpeomVzVdA==",
"requires": {
"@types/node": "10.12.18",
"bs58check": "^2.1.1",

4
package.json
View file

@ -83,9 +83,9 @@
"bc-bech32": "file:blue_modules/bc-bech32",
"bc-ur": "file:blue_modules/bc-ur",
"bech32": "1.1.4",
"bignumber.js": "9.0.0",
"bignumber.js": "9.0.1",
"bip21": "2.0.3",
"bip32": "2.0.5",
"bip32": "2.0.6",
"bip39": "2.6.0",
"bitcoinjs-lib": "5.2.0",
"bolt11": "1.2.7",

3
screen/wallets/buyBitcoin.js
View file

@ -116,8 +116,7 @@ BuyBitcoin.navigate = async wallet => {
if (Platform.OS === 'ios') {
InAppBrowser.isAvailable()
.then(_value => {
InAppBrowser.close();
InAppBrowser.open(uri, { dismissButtonStyle: 'done' });
InAppBrowser.open(uri, { dismissButtonStyle: 'done', modalEnabled: true, animated: true });
})
.catch(error => {
console.log(error);

2
screen/wallets/transactions.js
View file

@ -339,7 +339,7 @@ const WalletTransactions = () => {
wallet.current.getBalance() > 0 ? (
<TouchableOpacity
onPress={async () => {
Linking.openURL('https://bluewallet.current.io/marketplace/');
Linking.openURL('https://bluewallet.io/marketplace/');
}}
style={[styles.marketplaceButton1, stylesHook.marketplaceButton1]}
>