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

Merge branch 'master' into filepicker

Browse Source
This commit is contained in:
marcosrodriguezseminole 2020-02-14 10:03:38 -05:00
commit ea1cc1b517
12 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle
View File

@ -119,7 +119,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "4.9.4"
versionName "5.0.0"
multiDexEnabled true
missingDimensionStrategy 'react-native-camera', 'general'
}

2
ios/BlueWallet/Info.plist
View File

@ -48,7 +48,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>4.9.4</string>
<string>5.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>

2
ios/BlueWalletWatch Extension/Info.plist
View File

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>4.9.4</string>
<string>5.0.0</string>
<key>CFBundleVersion</key>
<string>239</string>
<key>CLKComplicationPrincipalClass</key>

2
ios/BlueWalletWatch/Info.plist
View File

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>4.9.4</string>
<string>5.0.0</string>
<key>CFBundleVersion</key>
<string>239</string>
<key>UISupportedInterfaceOrientations</key>

2
ios/TodayExtension/Info.plist
View File

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>4.9.4</string>
<string>5.0.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>NSExtension</key>

15
ios/fastlane/metadata/en-US/release_notes.txt
View File

@ -1,3 +1,18 @@
v4.9.4
======
* REL: ver bump 4.9.4
* FIX: Lint
* FIX: Listen to lnd invoice changes
* FIX: There's two refresh icons on the main view, when you pull-to-refresh
* FIX: Crash on scan in wallets import when closing the view
* FIX: Allow walet change on invoice creation
* FIX: Allow wallet text input to be empty for new wallet naming
* FIX: LN Invoice amount renders 0
* FIX: Handle both chains
* FIX: deeplinking (safello etc)
* DEL: Remove alerts from main list
v4.9.2
======

2
loc/es.js
View File

@ -35,7 +35,7 @@ module.exports = {
title: 'Añadir billetera',
description:
'Puedes escanear la billetera de papel (en WIF - Formato de importación de billeteras) o crear una nueva billetera. Las billeteras SegWit estan compatibles por defecto.',
scan: 'Escaniar',
scan: 'Escanear',
create: 'Crear',
label_new_segwit: 'Nuevo SegWit',
label_new_lightning: 'Nuevo Lightning',

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "BlueWallet",
"version": "4.9.4",
"version": "5.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "BlueWallet",
"version": "4.9.4",
"version": "5.0.0",
"devDependencies": {
"@babel/core": "^7.5.0",
"@babel/runtime": "^7.5.1",
@ -73,7 +73,7 @@
"dayjs": "1.8.14",
"ecurve": "1.0.6",
"electrum-client": "git+https://github.com/BlueWallet/rn-electrum-client.git",
"eslint-config-prettier": "6.0.0",
"eslint-config-prettier": "6.9.0",
"eslint-config-standard": "12.0.0",
"eslint-config-standard-react": "7.0.2",
"eslint-plugin-prettier": "3.1.0",

29
screen/wallets/details.js
View File

@ -271,21 +271,20 @@ export default class WalletDetails extends Component {
return;
}
}
if (this.state.wallet.getBalance() > 0) {
this.presentWalletHasBalanceAlert();
} else {
this.props.navigation.setParams({ isLoading: true });
this.setState({ isLoading: true }, async () => {
BlueApp.deleteWallet(this.state.wallet);
ReactNativeHapticFeedback.trigger('notificationSuccess', { ignoreAndroidSystemSettings: false });
await BlueApp.saveToDisk();
EV(EV.enum.TRANSACTIONS_COUNT_CHANGED);
EV(EV.enum.WALLETS_COUNT_CHANGED);
this.props.navigation.navigate('Wallets');
});
}
},
style: 'destructive',
if (this.state.wallet.getBalance() > 0 && this.state.wallet.allowSend()) {
this.presentWalletHasBalanceAlert();
} else {
this.props.navigation.setParams({ isLoading: true });
this.setState({ isLoading: true }, async () => {
BlueApp.deleteWallet(this.state.wallet);
ReactNativeHapticFeedback.trigger('notificationSuccess', { ignoreAndroidSystemSettings: false });
await BlueApp.saveToDisk();
EV(EV.enum.TRANSACTIONS_COUNT_CHANGED);
EV(EV.enum.WALLETS_COUNT_CHANGED);
this.props.navigation.navigate('Wallets');
});
}
}
},
{ text: loc.wallets.details.no_cancel, onPress: () => {}, style: 'cancel' },
],

18
tests/integration/LightningCustodianWallet.test.js
View File

@ -7,7 +7,7 @@ describe('LightningCustodianWallet', () => {
let l1 = new LightningCustodianWallet();
it.skip('issue credentials', async () => {
jasmine.DEFAULT_TIMEOUT_INTERVAL = 100 * 1000;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 200 * 1000;
assert.ok(l1.refill_addressess.length === 0);
assert.ok(l1._refresh_token_created_ts === 0);
assert.ok(l1._access_token_created_ts === 0);
@ -24,7 +24,7 @@ describe('LightningCustodianWallet', () => {
});
it('can create, auth and getbtc', async () => {
jasmine.DEFAULT_TIMEOUT_INTERVAL = 100 * 1000;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 200 * 1000;
assert.ok(l1.refill_addressess.length === 0);
assert.ok(l1._refresh_token_created_ts === 0);
assert.ok(l1._access_token_created_ts === 0);
@ -51,7 +51,7 @@ describe('LightningCustodianWallet', () => {
});
it('can refresh token', async () => {
jasmine.DEFAULT_TIMEOUT_INTERVAL = 100 * 1000;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 200 * 1000;
let oldRefreshToken = l1.refresh_token;
let oldAccessToken = l1.access_token;
await l1.refreshAcessToken();
@ -62,7 +62,7 @@ describe('LightningCustodianWallet', () => {
});
it('can use existing login/pass', async () => {
jasmine.DEFAULT_TIMEOUT_INTERVAL = 100 * 1000;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 200 * 1000;
if (!process.env.BLITZHUB) {
console.error('process.env.BLITZHUB not set, skipped');
return;
@ -150,7 +150,7 @@ describe('LightningCustodianWallet', () => {
});
it('can pay invoice', async () => {
jasmine.DEFAULT_TIMEOUT_INTERVAL = 100 * 1000;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 200 * 1000;
if (!process.env.BLITZHUB) {
console.error('process.env.BLITZHUB not set, skipped');
return;
@ -224,7 +224,7 @@ describe('LightningCustodianWallet', () => {
});
it('can create invoice and pay other blitzhub invoice', async () => {
jasmine.DEFAULT_TIMEOUT_INTERVAL = 100 * 1000;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 200 * 1000;
if (!process.env.BLITZHUB) {
console.error('process.env.BLITZHUB not set, skipped');
return;
@ -324,7 +324,7 @@ describe('LightningCustodianWallet', () => {
});
it('can pay free amount (tip) invoice', async function() {
jasmine.DEFAULT_TIMEOUT_INTERVAL = 100 * 1000;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 200 * 1000;
if (!process.env.BLITZHUB) {
console.error('process.env.BLITZHUB not set, skipped');
return;
@ -401,7 +401,7 @@ describe('LightningCustodianWallet', () => {
it('cant create zemo amt invoices yet', async () => {
let l1 = new LightningCustodianWallet();
jasmine.DEFAULT_TIMEOUT_INTERVAL = 100 * 1000;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 200 * 1000;
assert.ok(l1.refill_addressess.length === 0);
assert.ok(l1._refresh_token_created_ts === 0);
assert.ok(l1._access_token_created_ts === 0);
@ -435,7 +435,7 @@ describe('LightningCustodianWallet', () => {
});
it('cant pay negative free amount', async () => {
jasmine.DEFAULT_TIMEOUT_INTERVAL = 100 * 1000;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 200 * 1000;
if (!process.env.BLITZHUB) {
console.error('process.env.BLITZHUB not set, skipped');
return;

2
tests/integration/hd-segwit-bech32-wallet.test.js
View File

@ -213,7 +213,7 @@ describe('Bech32 Segwit HD (BIP84)', () => {
console.error('process.env.FAULTY_ZPUB not set, skipped');
return;
}
jasmine.DEFAULT_TIMEOUT_INTERVAL = 90 * 1000;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 200 * 1000;
let hd = new HDSegwitBech32Wallet();
hd._xpub = process.env.FAULTY_ZPUB;