Merge pull request #291 from Bitcoin-com/wallet/dev

Wallet/dev

app-template/bitcoincom/appConfig.json

@@ -24,9 +24,9 @@
   "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
   "pushSenderId": "1036948132229",
   "description": "A Secure Bitcoin Wallet",
-  "version": "5.0.0",
-  "fullVersion": "5.0-rc1",
-  "androidVersion": "500000",
+  "version": "5.0.1",
+  "fullVersion": "5.0-rc2",
+  "androidVersion": "500100",
   "_extraCSS": "",
   "_enabledExtensions": {
     "coinbase": false,

app-template/package-template.json

@@ -119,10 +119,10 @@
     "run:android":            "cordova run android --device",
     "run:android-release":            "cordova run android --device --release",
     "log:android":            "adb logcat | grep chromium",
-    "sign:android":           "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../bitcoin-com-release-key.jks -signedjar platforms/android/build/outputs/apk/android-release-signed.apk  platforms/android/build/outputs/apk/android-release-unsigned.apk bitcoin-com && $ANDROID_HOME/build-tools/27.0.1/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk",
+    "sign:android":           "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../bitcoin-com-release-key.jks -signedjar platforms/android/build/outputs/apk/android-release-signed.apk  platforms/android/build/outputs/apk/android-release-unsigned.apk bitcoin-com && zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk",
     "apply:copay":            "npm i fs-extra && cd app-template && node apply.js copay && npm i && cordova prepare",
     "apply:bitpay":           "npm i fs-extra && cd app-template && node apply.js bitpay && npm i && cordova prepare",
-    "apply:bitcoincom":       "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && cordova prepare",
+    "apply:bitcoincom":       "npm i fs-extra && cd app-template && node apply.js bitcoincom && npm i && cordova prepare && cd ../ && ./fix-asn1.sh",
     "test":                   "karma start test/karma.conf.js --single-run",
     "clean":                  "trash platforms && trash plugins && cordova prepare",
     "unstage-package":        "git reset package.json",
@@ -141,4 +141,4 @@
     "pre-commit": "^1.1.3"
   },
   "pre-commit": "unstage-package"
-}
+}

bower.json

@@ -24,6 +24,6 @@
   },
   "resolutions": {
     "angular": "1.5.3",
-    "ionic": "1b7414faba"
+    "ionic": "eefba1331b"
   }
 }

fix-asn1.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+firstLine=`awk 'NR < 2 {print}' node_modules/asn1.js-rfc5280/index.js`
+
+if [ "$firstLine" = "try {" ]; then
+  echo "var asn1 = require('asn1.js');" > node_modules/asn1.js-rfc5280/index.new.js
+  awk 'NR > 6 {print}' node_modules/asn1.js-rfc5280/index.js >> node_modules/asn1.js-rfc5280/index.new.js
+  rm node_modules/asn1.js-rfc5280/index.js
+  mv node_modules/asn1.js-rfc5280/index.new.js node_modules/asn1.js-rfc5280/index.js
+  echo "node_modules/asn1.js-rfc5280/index.js fixed"
+fi

i18n/po/ca/template-ca.po

@@ -11,7 +11,7 @@ msgstr ""
 "Last-Translator: emilold\n"
 "Language-Team: Catalan\n"
 "Language: ca\n"
-"PO-Revision-Date: 2018-07-27 08:43\n"
+"PO-Revision-Date: 2018-08-21 03:39\n"
 
 #: www/views/modals/paypro.html:34
 msgid "(Trusted)"
@@ -81,6 +81,26 @@ msgstr "Número de compte"
 msgid "Instant transactions with low fees"
 msgstr "Transaccions instantànies amb comissions baixes"
 
+#: www/views/walletSelector.html:49
+msgid "Insufficient funds"
+msgstr "Fons insuficients"
+
+#: www/views/amount.html:42
+msgid "Change Currency"
+msgstr "Canvia de moneda"
+
+#: www/views/amount.html:49
+msgid "Available Funds"
+msgstr "Fons disponibles"
+
+#: www/views/amount.html:59
+msgid "Use All Available Funds"
+msgstr "Utilitza tots els fons disponibles"
+
+#: www/views/amount.html:99
+msgid "Next"
+msgstr "Següent"
+
 #: www/views/preferencesBitpayServices.html:23
 msgid "Accounts"
 msgstr "Comptes"
@@ -206,6 +226,20 @@ msgstr "Gairebé ja estem! Repassem-ho."
 msgid "Alternative Currency"
 msgstr "Moneda alternativa"
 
+#: www/views/tab-settings.html:75
+msgid "Price Display"
+msgstr "Visualització del preu"
+
+#: src/js/controllers/tab-settings.js:19
+#: www/views/preferencesPriceDisplay.html:12
+msgid "Fiat"
+msgstr "Fiat"
+
+#: src/js/controllers/tab-settings.js:19
+#: www/views/preferencesPriceDisplay.html:15
+msgid "Cryptocurrency"
+msgstr "Criptomoneda"
+
 #: src/js/controllers/buyAmazon.js:98
 msgid "Amazon.com is not available at this moment. Please try back later."
 msgstr "Amazon.com no està disponible en aquest moment. Torneu-ho a provar més tard."
@@ -662,6 +696,7 @@ msgstr "Copayer {{$index}}"
 
 #: src/js/controllers/copayers.js:79
 #: src/js/controllers/export.js:193
+#: src/js/controllers/confirm.js:41
 #: www/views/includes/copyToClipboard.html:4
 msgid "Copied to clipboard"
 msgstr "Copiat al porta-retalls"
@@ -1281,6 +1316,7 @@ msgstr "Amb finalitats d'auditoria"
 #: www/views/modals/txp-details.html:74
 #: www/views/topup.html:34
 #: www/views/tx-details.html:52
+#: www/views/review.html:22
 msgid "From"
 msgstr "Des de"
 
@@ -1341,10 +1377,6 @@ msgid "Get news and updates from BitPay"
 msgstr "Rebeu notícies i actualitzacions de BitPay"
 
 #: www/views/onboarding/welcome.html:8
-msgctxt "button"
-msgid "Get started"
-msgstr "Comença"
-
 #: www/views/bitpayCard.html:49
 msgid "Get started"
 msgstr "Comença"
@@ -2168,6 +2200,10 @@ msgstr "Pagament rebutjat"
 msgid "Payment Sent"
 msgstr "Pagament enviat"
 
+#: www/views/includes/slideToAcceptSuccess.html:12
+msgid "Share this transaction"
+msgstr "Comparteix aquesta transacció"
+
 #: www/views/modals/txp-details.html:32
 msgid "Payment accepted, but not yet broadcasted"
 msgstr "Pagament acceptat, però encara no emès"
@@ -2185,7 +2221,7 @@ msgid "Payment details"
 msgstr "Dades de pagament"
 
 #: www/views/modals/paypro.html:6
-msgid "Payment request"
+msgid "Payment Request"
 msgstr "Sol·licitud de pagament"
 
 #: www/views/mercadoLibreCards.html:22
@@ -2358,7 +2394,7 @@ msgstr "Rep"
 
 #: www/views/customAmount.html:44
 msgid "Receive in"
-msgstr "Rep a"
+msgstr "Rebre en"
 
 #: www/views/includes/walletHistory.html:24
 #: www/views/tx-details.html:18
@@ -2621,8 +2657,8 @@ msgid "Paste Address"
 msgstr "Enganxa l'adreça"
 
 #: www/views/tab-send.html:27
-msgid "Wallet to Wallet Transfer"
-msgstr "Transferència de cartera a cartera"
+msgid "Transfer between wallets"
+msgstr "Transferència entre carteres"
 
 #: www/views/tab-send.html:35
 msgid "Scan QR Code"
@@ -2632,10 +2668,6 @@ msgstr "Escaneja el codi QR"
 msgid "Send Bitcoin faster!"
 msgstr "Envia bitcoins més ràpid!"
 
-#: www/views/tab-send.html:46
-msgid "Send Bitcoin faster!"
-msgstr "Envia bitcoins més ràpid!"
-
 #: www/views/tab-send.html:50
 msgid "Save frequently used addresses and send them Bitcoin in just one tap"
 msgstr "Deseu adreces utilitzades freqüentment i envieu-los bitcoins d'un sol toc"
@@ -2657,6 +2689,8 @@ msgid "You can receive bitcoin from any wallet or service."
 msgstr "Podeu rebre bitcoins des de qualsevol cartera o servei."
 
 #: www/views/tab-send.html:72
+#: www/views/shapeshift.html:23
+#: www/views/tab-send.html:33
 msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin."
 msgstr "Per començar, heu de crear una cartera bitcoin i obtenir uns quants bitcoins."
 
@@ -3061,6 +3095,14 @@ msgstr "Aquesta aplicació emmagatzema els vostres bitcoins amb una seguretat de
 msgid "This bitcoin payment request has expired."
 msgstr "Aquesta sol·licitud de pagament bitcoin ha caducat."
 
+#: www/views/review.html:55
+msgid "Payment expires:"
+msgstr "El pagament venç:"
+
+#: www/views/review.html:56
+msgid "Payment request has expired"
+msgstr "La sol·licitud de pagament ha vençut"
+
 #: www/views/join.html:133
 #: www/views/tab-create-personal.html:103
 #: www/views/tab-create-shared.html:132
@@ -3102,10 +3144,6 @@ msgstr "Per a"
 msgid "To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service."
 msgstr "Per començar, compreu bitcoins o compartiu la vostra adreça. Podeu rebre bitcoins de qualsevol cartera o servei."
 
-#: www/views/tab-send.html:33
-msgid "To get started, you'll need to create a bitcoin wallet and get some bitcoin."
-msgstr "Per començar, heu de crear una cartera bitcoin i obtenir uns quants bitcoins."
-
 #: src/js/services/bitpayAccountService.js:73
 msgid "To {{reason}} you must first add your BitPay account - {{email}}"
 msgstr "Per {{reason}} ja heu d'haver afegit el vostre compte BitPay - {{email}}"
@@ -3118,6 +3156,26 @@ msgstr "Recàrrega en curs..."
 msgid "Top up {{amountStr}} to debit card ({{cardLastNumber}})"
 msgstr "Recàrrega de {{amountStr}} a la targeta de dèbit ({{cardLastNumber}})"
 
+#: www/views/shapeshift.html:30
+msgid "Start ShapeShift"
+msgstr "Inicia ShapeShift"
+
+#: www/views/shapeshift.html:30
+msgid "Exchange your BTC to BCH in minutes."
+msgstr "Canvieu de BTC a BCH en minuts."
+
+#: www/views/shapeshift.html:30
+msgid "To start the process you need to add funds to your wallet."
+msgstr "Per iniciar el procés heu d'afegir fons a la cartera."
+
+#: www/views/shapeshift.html:30
+msgid "The process is fast and you will receive the exchanged amount in your wallet."
+msgstr "El procés és ràpid i rebreu l'import canviat a la vostra cartera."
+
+#: www/views/shapeshift.html:34
+msgid "This service is provided by the third-party ShapeShift, who will charge a small fee for the service. The fee will be shown before you start the transaction."
+msgstr "Aquest servei el presta un tercer, ShapeShift, que cobrarà una petita comissió pel servei. Veureu la comissió abans d'iniciar la transacció."
+
 #: www/views/buyAmazon.html:61
 #: www/views/buyMercadoLibre.html:60
 #: www/views/modals/wallet-balance.html:23
@@ -3758,3 +3816,47 @@ msgstr "Bitcoin Cash gratis"
 msgid "Your Bitcoin Wallets are ready!"
 msgstr "Les vostres carteres bitcoin ja estan a punt!"
 
+#: src/js/controllers/amount.js:49
+msgid "Address does not contain currency information, please make sure you are sending the correct currency."
+msgstr "L'adreça no conté informació sobre la moneda. Comproveu que envieu la moneda correcta."
+
+#: www/views/review.html:4
+msgid "Review Transaction"
+msgstr "Reviseu la transacció"
+
+#: src/js/controllers/review.controller.js:36
+msgid "You are sending"
+msgstr "Esteu enviant"
+
+#: src/js/controllers/review.controller.js:66
+msgid "You are shifting"
+msgstr "Esteu canviant"
+
+#: www/views/review.html:36
+msgid "To:"
+msgstr "Per a:"
+
+#: www/views/review.html:53
+msgid "Add personal note"
+msgstr "Afegiu nota personal"
+
+#: www/views/review.html:87
+msgid "Suggested by merchant:"
+msgstr "Suggerida pel comerciant:"
+
+#: src/js/controllers/review.controller.js:37
+msgid "Enter text here"
+msgstr "Introduïu el text aquí"
+
+#: www/views/review.html:57
+msgid "Personal note:"
+msgstr "Nota personal:"
+
+#: www/views/review.html:69
+msgid "Less than 1 cent"
+msgstr "Menys d'1 cèntim"
+
+#: src/js/services/incomingData.js:129
+msgid "This invoice is no longer accepting payments"
+msgstr "Aquesta factura ja no accepta pagaments"
+