Merge branch 'master' into wallet-selector

saeidha · Aug 7, 2019 · d2b1885 · d2b1885
2 parents cb197ab + ae519ac
commit d2b1885
Show file tree

Hide file tree

Showing 35 changed files with 244 additions and 64 deletions.
diff --git a/BlueComponents.js b/BlueComponents.js
@@ -11,6 +11,7 @@ import {
   Animated,
   ActivityIndicator,
   View,
+  KeyboardAvoidingView,
   UIManager,
   StyleSheet,
   Dimensions,
@@ -765,16 +766,71 @@ export class BlueUseAllFundsButton extends Component {
   };
 
   render() {
-    return (
-      <InputAccessoryView nativeID={BlueUseAllFundsButton.InputAccessoryViewID}>
-        <View style={{ flex: 1, flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}>
-          <Text style={{ color: BlueApp.settings.alternativeTextColor, fontSize: 16, marginHorizontal: 8 }}>
-            Total: {this.props.wallet.getBalance()} {BitcoinUnit.BTC}
+    const inputView = (
+      <View
+        style={{
+          flex: 1,
+          flexDirection: 'row',
+          maxHeight: 44,
+          justifyContent: 'space-between',
+          alignItems: 'center',
+          backgroundColor: '#eef0f4',
+        }}
+      >
+        <View style={{ flexDirection: 'row', justifyContent: 'flex-start', alignItems: 'flex-start' }}>
+          <Text
+            style={{
+              color: BlueApp.settings.alternativeTextColor,
+              fontSize: 16,
+              marginLeft: 8,
+              marginRight: 0,
+              paddingRight: 0,
+              paddingLeft: 0,
+              paddingTop: 12,
+              paddingBottom: 12,
+            }}
+          >
+            Total:
           </Text>
-          <BlueButtonLink title="Use All" onPress={this.props.onUseAllPressed} />
+          {this.props.wallet.allowSendMax() && this.props.wallet.getBalance() > 0 ? (
+            <BlueButtonLink
+              onPress={this.props.onUseAllPressed}
+              style={{ marginLeft: 8, paddingRight: 0, paddingLeft: 0, paddingTop: 12, paddingBottom: 12 }}
+              title={`${loc.formatBalanceWithoutSuffix(this.props.wallet.getBalance(), BitcoinUnit.BTC, true).toString()} ${
+                BitcoinUnit.BTC
+              }`}
+            />
+          ) : (
+            <Text
+              style={{
+                color: BlueApp.settings.alternativeTextColor,
+                fontSize: 16,
+                marginLeft: 8,
+                marginRight: 0,
+                paddingRight: 0,
+                paddingLeft: 0,
+                paddingTop: 12,
+                paddingBottom: 12,
+              }}
+            >
+              {loc.formatBalanceWithoutSuffix(this.props.wallet.getBalance(), BitcoinUnit.BTC, true).toString()} {BitcoinUnit.BTC}
+            </Text>
+          )}
         </View>
-      </InputAccessoryView>
+        <View style={{ flexDirection: 'row', justifyContent: 'flex-end', alignItems: 'flex-end' }}>
+          <BlueButtonLink
+            style={{ paddingRight: 8, paddingLeft: 0, paddingTop: 12, paddingBottom: 12 }}
+            title="Done"
+            onPress={Keyboard.dismiss}
+          />
+        </View>
+      </View>
     );
+    if (Platform.OS === 'ios') {
+      return <InputAccessoryView nativeID={BlueUseAllFundsButton.InputAccessoryViewID}>{inputView}</InputAccessoryView>;
+    } else {
+      return <KeyboardAvoidingView style={{ height: 44 }}>{inputView}</KeyboardAvoidingView>;
+    }
   }
 }
 
@@ -1923,6 +1979,7 @@ export class BlueBitcoinAmount extends Component {
     } else {
       localCurrency = loc.formatBalanceWithoutSuffix(amount.toString(), BitcoinUnit.LOCAL_CURRENCY, false);
     }
+    if (amount === BitcoinUnit.MAX) localCurrency = ''; // we dont want to display NaN
     return (
       <TouchableWithoutFeedback disabled={this.props.pointerEvents === 'none'} onPress={() => this.textInput.focus()}>
         <View>
@@ -1939,6 +1996,12 @@ export class BlueBitcoinAmount extends Component {
                 }
                 this.props.onChangeText(text);
               }}
+              onBlur={() => {
+                if (this.props.onBlur) this.props.onBlur();
+              }}
+              onFocus={() => {
+                if (this.props.onFocus) this.props.onFocus();
+              }}
               placeholder="0"
               maxLength={10}
               ref={textInput => (this.textInput = textInput)}

diff --git a/class/abstract-wallet.js b/class/abstract-wallet.js
@@ -68,6 +68,10 @@ export class AbstractWallet {
     return true;
   }
 
+  allowSendMax(): boolean {
+    return false;
+  }
+
   allowRBF() {
     return false;
   }

diff --git a/class/hd-segwit-bech32-wallet.js b/class/hd-segwit-bech32-wallet.js
@@ -36,6 +36,10 @@ export class HDSegwitBech32Wallet extends AbstractHDWallet {
     return true;
   }
 
+  allowSendMax(): boolean {
+    return true;
+  }
+
   /**
    * @inheritDoc
    */

diff --git a/class/hd-segwit-p2sh-wallet.js b/class/hd-segwit-p2sh-wallet.js
@@ -5,6 +5,7 @@ import bip39 from 'bip39';
 import BigNumber from 'bignumber.js';
 import b58 from 'bs58check';
 import signer from '../models/signer';
+import { BitcoinUnit } from '../models/bitcoinUnits';
 const bitcoin = require('bitcoinjs-lib');
 const bitcoin5 = require('bitcoinjs5');
 const HDNode = require('bip32');
@@ -49,6 +50,10 @@ export class HDSegwitP2SHWallet extends AbstractHDWallet {
     return true;
   }
 
+  allowSendMax(): boolean {
+    return true;
+  }
+
   async generate() {
     let that = this;
     return new Promise(function(resolve) {
@@ -255,12 +260,29 @@ export class HDSegwitP2SHWallet extends AbstractHDWallet {
     }
   }
 
+  /**
+   *
+   * @param utxos
+   * @param amount Either float (BTC) or string 'MAX' (BitcoinUnit.MAX) to send all
+   * @param fee
+   * @param address
+   * @returns {string}
+   */
   createTx(utxos, amount, fee, address) {
     for (let utxo of utxos) {
       utxo.wif = this._getWifForAddress(utxo.address);
     }
 
     let amountPlusFee = parseFloat(new BigNumber(amount).plus(fee).toString(10));
+
+    if (amount === BitcoinUnit.MAX) {
+      amountPlusFee = new BigNumber(0);
+      for (let utxo of utxos) {
+        amountPlusFee = amountPlusFee.plus(utxo.amount);
+      }
+      amountPlusFee = amountPlusFee.dividedBy(100000000).toString(10);
+    }
+
     return signer.createHDSegwitTransaction(
       utxos,
       address,

diff --git a/loc/cs_CZ.js b/loc/cs_CZ.js
@@ -165,7 +165,7 @@ module.exports = {
       create: 'Create',
       setAmount: 'Přijmout částku...',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Koupit Bitcoin',

diff --git a/loc/da_DK.js b/loc/da_DK.js
@@ -165,7 +165,7 @@ module.exports = {
       create: 'Create',
       setAmount: 'Modtag med beløb',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Køb Bitcoin',

diff --git a/loc/de_DE.js b/loc/de_DE.js
@@ -167,7 +167,7 @@ module.exports = {
       create: 'Create',
       setAmount: 'Zu erhaltender Betrag',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Kaufe Bitcoin',

diff --git a/loc/el.js b/loc/el.js
@@ -168,7 +168,7 @@ module.exports = {
       create: 'Δημιούργησε',
       setAmount: 'Λάβε με ποσό',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Αγόρασε Bitcoin',

diff --git a/loc/en.js b/loc/en.js
@@ -166,7 +166,7 @@ module.exports = {
       create: 'Create',
       setAmount: 'Receive with amount',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Buy Bitcoin',

diff --git a/loc/es.js b/loc/es.js
@@ -167,7 +167,7 @@ module.exports = {
       create: 'Create',
       setAmount: 'Receive with amount',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Buy Bitcoin',

diff --git a/loc/fi_FI.js b/loc/fi_FI.js
@@ -168,7 +168,7 @@ module.exports = {
       create: 'Luo',
       setAmount: 'Vastaanotettava summa',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Osta Bitcoinia',

diff --git a/loc/fr_FR.js b/loc/fr_FR.js
@@ -167,7 +167,7 @@ module.exports = {
       create: 'Create',
       setAmount: 'Revevoir avec montant',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Acheter du Bitcoin',

diff --git a/loc/hr_HR.js b/loc/hr_HR.js
@@ -163,7 +163,7 @@ module.exports = {
       create: 'Stvori',
       setAmount: 'Odredi iznos za primiti',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Kupovina Bitcoina',

diff --git a/loc/hu_HU.js b/loc/hu_HU.js
@@ -165,7 +165,7 @@ module.exports = {
       create: 'Létrehoz',
       setAmount: 'Fogadandó összeg',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Bitcoin vásárlása',

diff --git a/loc/id_ID.js b/loc/id_ID.js
@@ -165,7 +165,7 @@ module.exports = {
       create: 'Buat',
       setAmount: 'Terima sejumlah',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Beli bitcoin',

diff --git a/loc/it.js b/loc/it.js
@@ -168,7 +168,7 @@ module.exports = {
       create: 'Crea',
       setAmount: 'Ricevi con importo',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Compra Bitcoin',

diff --git a/loc/jp_JP.js b/loc/jp_JP.js
@@ -165,7 +165,7 @@ module.exports = {
       create: '作成',
       setAmount: '入金額',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Bitcoin の購入',

diff --git a/loc/nb_NO.js b/loc/nb_NO.js
@@ -166,7 +166,7 @@ module.exports = {
       create: 'Lag',
       setAmount: 'Motta med beløp',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Kjøp Bitcoin',

diff --git a/loc/nl_NL.js b/loc/nl_NL.js
@@ -166,7 +166,7 @@ module.exports = {
       create: 'Create',
       setAmount: 'Ontvang met bedrag',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Koop Bitcoin',

diff --git a/loc/pt_BR.js b/loc/pt_BR.js
@@ -169,7 +169,7 @@ module.exports = {
       create: 'Create',
       setAmount: 'Valor a receber',
     },
-    scan_lnurl: 'Receber lendo QR'
+    scan_lnurl: 'Receber lendo QR',
   },
   buyBitcoin: {
     header: 'Comprar Bitcoin',

diff --git a/loc/pt_PT.js b/loc/pt_PT.js
@@ -172,7 +172,7 @@ module.exports = {
       create: 'Create',
       setAmount: 'Receive with amount',
     },
-    scan_lnurl: 'Receber lendo QR'
+    scan_lnurl: 'Receber lendo QR',
   },
   settings: {
     tabBarLabel: 'Definições',

diff --git a/loc/ru.js b/loc/ru.js
@@ -171,7 +171,7 @@ module.exports = {
       create: 'Создать',
       setAmount: 'Получить сумму',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   settings: {
     tabBarLabel: 'Настройки',

diff --git a/loc/sv_SE.js b/loc/sv_SE.js
@@ -165,7 +165,7 @@ module.exports = {
       create: 'Skapa',
       setAmount: 'Ta emot med belopp',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Köp bitcoin',

diff --git a/loc/th_TH.js b/loc/th_TH.js
@@ -165,7 +165,7 @@ module.exports = {
       create: 'สร้าง',
       setAmount: 'รับด้วยจำนวน',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'ซื้อบิตคอยน์',

diff --git a/loc/tr_TR.js b/loc/tr_TR.js
@@ -166,7 +166,7 @@ module.exports = {
       create: 'Oluştur',
       setAmount: 'Miktar ile al',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Bitcoin Satın al',

diff --git a/loc/ua.js b/loc/ua.js
@@ -166,7 +166,7 @@ module.exports = {
       create: 'Create',
       setAmount: 'Receive with amount',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: 'Buy Bitcoin',

diff --git a/loc/zh_cn.js b/loc/zh_cn.js
@@ -163,7 +163,7 @@ module.exports = {
       create: '创建',
       setAmount: '收款金额',
     },
-    scan_lnurl: 'Scan to receive'
+    scan_lnurl: 'Scan to receive',
   },
   buyBitcoin: {
     header: '购买比特币',

diff --git a/models/bitcoinUnits.js b/models/bitcoinUnits.js
@@ -2,6 +2,7 @@ export const BitcoinUnit = Object.freeze({
   BTC: 'BTC',
   SATS: 'sats',
   LOCAL_CURRENCY: 'local_currency',
+  MAX: 'MAX',
 });
 
 export const Chain = Object.freeze({