Merge branch 'wallet/sprint/20' into wallet/task/514

Gruntfile.js

@@ -163,7 +163,7 @@ module.exports = function(grunt) {
       },
       bitanalytics: {
         src: [
-          'bitanalytics/bitanalytics-0.1.0.js'
+          'bitanalytics/bitanalytics.js'
         ],
         dest: 'www/lib/bitanalytics.js'
       },

app-template/config-template.xml

@@ -72,7 +72,7 @@
     <plugin name="cordova-plugin-queries-schemes" spec="~0.1.5" />
     <plugin name="cordova-plugin-firebase" spec="https://github.com/arnesson/cordova-plugin-firebase.git" />
     <plugin name="cordova-plugin-wkwebview-inputfocusfix" spec="https://github.com/onderceylan/cordova-plugin-wkwebview-inputfocusfix.git" />
-    <plugin name="cordova-plugin-media" spec="~5.0.2">
+    <plugin name="cordova-plugin-media-fork" spec="~5.0.3">
         <variable name="KEEP_AVAUDIOSESSION_ALWAYS_ACTIVE" value="NO" />
     </plugin>
     <!-- Supported Platforms -->

bitanalytics/bitanalytics.js

@@ -6276,7 +6276,7 @@ var ClickAction = /** @class */ (function (_super) {
 }(action_1.default));
 exports.default = ClickAction;
 
-},{"../action":4,"../log-event":15,"../log-event-handlers":14}],6:[function(require,module,exports){
+},{"../action":4,"../log-event":16,"../log-event-handlers":15}],6:[function(require,module,exports){
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -6315,7 +6315,7 @@ var BitAnalytics = /** @class */ (function () {
 exports.default = BitAnalytics;
 BitAnalytics.main();
 
-},{"./action-factory":2,"./action-handlers":3,"./channels/adjust-channel":9,"./channels/mixpanel-channel":12,"./log-event":15,"./log-event-handlers":14}],7:[function(require,module,exports){
+},{"./action-factory":2,"./action-handlers":3,"./channels/adjust-channel":9,"./channels/mixpanel-channel":12,"./log-event":16,"./log-event-handlers":15}],7:[function(require,module,exports){
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -6560,11 +6560,10 @@ var FirebaseChannel = /** @class */ (function (_super) {
         var keys = Object.keys(params);
         var keysLength = keys.length;
         var sanitized = {};
-        for (var i = 0; i < keysLength; i++) {
+        keys.map(function (key) {
-            var key = keys[i];
             var cleanKey = key.replace('-', '_').replace(/[\W]+/g, '');
             sanitized[cleanKey] = params[key];
-        }
+        });
         return sanitized;
     };
     return FirebaseChannel;
@@ -6588,13 +6587,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var channel_1 = __importDefault(require("../channel"));
+var ga_1 = __importDefault(require("../external-libs/ga"));
 var GoogleAnalyticsChannel = /** @class */ (function (_super) {
     __extends(GoogleAnalyticsChannel, _super);
     function GoogleAnalyticsChannel(name, config) {
         var _this = _super.call(this, name) || this;
-        _this.dataLayer = null;
         _this.gaInstance = null;
-        _this.trackingId = '';
         _this.eventLabels = ['id'];
         if (!config.trackingId) {
             throw new Error('[BitAnalytics] Google Analytics config is missing tracking ID.');
@@ -6602,8 +6600,12 @@ var GoogleAnalyticsChannel = /** @class */ (function (_super) {
         if (config.eventLabels) {
             _this.eventLabels = config.eventLabels;
         }
-        _this.trackingId = config.trackingId;
+        _this.gaInstance = new ga_1.default({
-        _this.setUpGa();
+            trackID: config.trackingId,
+            appVersion: config.appVersion,
+            appName: config.appName || 'App'
+        });
+        _this.isReady = true;
         return _this;
     }
     /**
@@ -6612,49 +6614,26 @@ var GoogleAnalyticsChannel = /** @class */ (function (_super) {
      *
      */
     GoogleAnalyticsChannel.prototype.postEvent = function (name, params) {
-        // Default Google Analytics Events
-        // https://developers.google.com/analytics/devguides/collection/gtagjs/events
-        // Useful to convert to these, or start with these?
         if (this.isReady) {
-            params.event_category = name;
+            var category = name;
+            var action = name;
+            var label = name;
+            var value = params['value'] || '';
             for (var _i = 0, _a = this.eventLabels; _i < _a.length; _i++) {
                 var eventLabel = _a[_i];
                 if (params[eventLabel]) {
-                    params.event_label = params[eventLabel];
+                    label = params[eventLabel];
                     break;
                 }
             }
-            this.gtag('event', name, params);
+            this.gaInstance.event(category, action, label, value);
         }
     };
-    /**
-     *
-     * Private methods
-     *
-     */
-    /**
-     * Mimics function in the tracking snippet
-     */
-    GoogleAnalyticsChannel.prototype.gtag = function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        console.log(arguments);
-        window.dataLayer.push(arguments);
-    };
-    GoogleAnalyticsChannel.prototype.setUpGa = function () {
-        // From what GA recommends to insert into page
-        window.dataLayer = window.dataLayer || [];
-        this.gtag('js', new Date());
-        this.gtag('config', this.trackingId);
-        this.isReady = true;
-    };
     return GoogleAnalyticsChannel;
 }(channel_1.default));
 exports.default = GoogleAnalyticsChannel;
 
-},{"../channel":8}],12:[function(require,module,exports){
+},{"../channel":8,"../external-libs/ga":14}],12:[function(require,module,exports){
 "use strict";
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
@@ -6746,6 +6725,207 @@ exports.default = MixpanelChannel;
 
 },{}],14:[function(require,module,exports){
 "use strict";
+/*
+ * name: nwjs-analytics -Node-Webkit Google Analytics integration
+ * version: 1.0.2
+ * github: https://github.com/Daaru00/nwjs-analytics
+ */
+function GA(opt) {
+    this.apiVersion = opt.apiVersion || '1';
+    this.trackID = opt.trackID || 'UA-XXXXXXXX-X';
+    this.clientID = opt.clientID || null;
+    this.userID = opt.userID || null;
+    this.appName = opt.appName || 'App';
+    this.appVersion = opt.appVersion || '1.0.0';
+    this.debug = opt.debug || false;
+    this.performanceTracking = opt.performanceTracking || true;
+    this.errorTracking = opt.errorTracking || true;
+    this.userLanguage = opt.userLanguage || "en";
+    this.currency = opt.currency || "EUR";
+    this.lastScreenName = opt.lastScreenName || '';
+}
+GA.prototype.sendRequest = function (data, callback) {
+    var ga = this;
+    if (!this.clientID || this.clientID == null)
+        this.clientID = this.generateClientID();
+    if (!this.userID || this.userID == null)
+        this.userID = this.generateClientID();
+    var postData = "v=" + this.apiVersion
+        + "&an=" + this.appName
+        + "&av=" + this.appVersion
+        + "&tid=" + this.trackID
+        + "&cid=" + this.clientID
+        + "&sr=" + this.getScreenResolution()
+        + "&vp=" + this.getViewportSize();
+    Object.keys(data).forEach(function (key) {
+        var val = data[key];
+        if (typeof val != "undefined")
+            postData += "&" + key + "=" + val;
+    });
+    var http = new XMLHttpRequest();
+    var url = "https://www.google-analytics.com";
+    if (!this.debug)
+        url += "/collect";
+    else
+        url += "/debug/collect";
+    http.open("GET", url + "?" + postData, true);
+    http.onreadystatechange = function () {
+        if (ga.debug)
+            console.log(http.response);
+        if (http.readyState == 4 && http.status == 200) {
+            if (callback)
+                callback(true);
+        }
+        else {
+            if (callback)
+                callback(false);
+        }
+    };
+    http.send();
+};
+GA.prototype.generateClientID = function () {
+    var id = "";
+    var possibilities = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+    for (var i = 0; i < 5; i++)
+        id += possibilities.charAt(Math.floor(Math.random() * possibilities.length));
+    return id;
+};
+GA.prototype.getScreenResolution = function () {
+    return screen.width + "x" + screen.height;
+};
+GA.prototype.getColorDept = function () {
+    return screen.colorDepth + "-bits";
+};
+GA.prototype.getUserAgent = function () {
+    return navigator.userAgent;
+};
+GA.prototype.getViewportSize = function () {
+    return window.screen.availWidth + "x" + window.screen.availHeight;
+};
+/*
+ * Measurement Protocol
+ * [https://developers.google.com/analytics/devguides/collection/protocol/v1/devguide]
+ */
+GA.prototype.screenView = function (screename) {
+    var data = {
+        't': 'screenview',
+        'cd': screename
+    };
+    this.sendRequest(data);
+    this.lastScreenName = screename;
+};
+GA.prototype.event = function (category, action, label, value) {
+    var data = {
+        't': 'event',
+        'ec': category,
+        'ea': action,
+    };
+    if (label) {
+        data['el'] = label;
+    }
+    if (value) {
+        data['ev'] = value;
+    }
+    if (this.lastScreenName) {
+        data['cd'] = this.lastScreenName;
+    }
+    this.sendRequest(data);
+};
+GA.prototype.exception = function (msg, fatal) {
+    var data = {
+        't': 'exception',
+        'exd': msg,
+        'exf': fatal || 0
+    };
+    this.sendRequest(data);
+};
+GA.prototype.timing = function (category, variable, time, label) {
+    var data = {
+        't': 'timing',
+        'utc': category,
+        'utv': variable,
+        'utt': time,
+        'utl': label,
+    };
+    this.sendRequest(data);
+},
+    GA.prototype.ecommerce = {
+        transactionID: false,
+        generateTransactionID: function () {
+            var id = "";
+            var possibilities = "0123456789";
+            for (var i = 0; i < 5; i++)
+                id += possibilities.charAt(Math.floor(Math.random() * possibilities.length));
+            return id;
+        },
+        transaction: function (total, items) {
+            var t_id = "";
+            if (!this.ecommerce.transactionID)
+                t_id = this.ecommerce.generateTransactionID();
+            else
+                t_id = this.ecommerce.transactionID;
+            var data = {
+                't': 'transaction',
+                'ti': t_id,
+                'tr': total,
+                'cu': this.currency,
+            };
+            this.sendRequest(data);
+            items.forEach(function (item) {
+                var data = {
+                    't': 'item',
+                    'ti': t_id,
+                    'in': item.name,
+                    'ip': item.price,
+                    'iq': item.qty,
+                    'ic': item.id,
+                    'cu': this.currency
+                };
+                this.sendRequest(data);
+            });
+        }
+    },
+    GA.prototype.custom = function (data) {
+        this.sendRequest(data);
+    };
+module.exports = GA;
+/*
+ * Performance Tracking
+ */
+/*window.addEventListener("load", function() {
+
+  if(ga.performanceTracking) {
+    setTimeout(function() {
+      var timing = window.performance.timing;
+      var userTime = timing.loadEventEnd - timing.navigationStart;
+      ga.timing("performance", "pageload", userTime);
+      }, 0);
+  }
+
+}, false);*/
+/*
+ * Error Reporting
+ */
+/*window.onerror = function (msg, url, lineNo, columnNo, error) {
+    var message = [
+        'Message: ' + msg,
+        'Line: ' + lineNo,
+        'Column: ' + columnNo,
+        'Error object: ' + JSON.stringify(error)
+    ].join(' - ');
+
+    if(ga.errorTracking)
+    {
+        setTimeout(function() {
+            ga.exception(message.toString());
+        }, 0);
+    }
+
+    return false;
+};*/
+
+},{}],15:[function(require,module,exports){
+"use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6865,7 +7045,7 @@ var LogEventHandlers = /** @class */ (function () {
 }());
 exports.default = LogEventHandlers;
 
-},{"./channel-factory":7}],15:[function(require,module,exports){
+},{"./channel-factory":7}],16:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var LogEvent = /** @class */ (function () {

i18n/po/template.pot

@@ -201,6 +201,16 @@ msgstr ""
 msgid "Price Display"
 msgstr ""
 
+#: src/js/controllers/tab-settings.js:19
+#: www/views/preferencesPriceDisplay.html:12
+msgid "Fiat"
+msgstr ""
+
+#: src/js/controllers/tab-settings.js:19
+#: www/views/preferencesPriceDisplay.html:15
+msgid "Cryptocurrency"
+msgstr ""
+
 #: src/js/controllers/buyAmazon.js:98
 msgid "Amazon.com is not available at this moment. Please try back later."
 msgstr ""
@@ -432,6 +442,7 @@ msgid "Buy & Sell Bitcoin"
 msgstr ""
 
 #: www/views/tab-send.html:35
+#: src/js/services/buyAndSellService.js:26
 msgid "Buy Bitcoin"
 msgstr ""
 
@@ -656,6 +667,7 @@ msgstr ""
 
 #: 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 ""
@@ -2162,6 +2174,10 @@ msgstr ""
 msgid "Payment Sent"
 msgstr ""
 
+#: www/views/includes/slideToAcceptSuccess.html:12
+msgid "Share this transaction"
+msgstr ""
+
 #: www/views/modals/txp-details.html:32
 msgid "Payment accepted, but not yet broadcasted"
 msgstr ""
@@ -3725,6 +3741,54 @@ msgstr ""
 msgid "{{wallet.m}}-of-{{wallet.n}}"
 msgstr ""
 
+#: src/js/services/shapeshiftService.js:8
+msgid "Shapeshift"
+msgstr ""
+
+#: www/views/includes/community.html:3
+msgid "Community"
+msgstr ""
+
+#: src/js/services/communityService.js:40
+msgid "Bitcoin Cash Reddit"
+msgstr ""
+
+#: src/js/services/communityService.js:47
+msgid "Bitcoin.com Twitter"
+msgstr ""
+
+#: www/views/includes/nextSteps.html:3
+msgid "Explore Bitcoin.com"
+msgstr ""
+
+#: src/js/services/bitcoincomService.js:21
+msgid "Bitcoin Cash Games"
+msgstr ""
+
+#: src/js/services/bitcoincomService.js:28
+msgid "News"
+msgstr ""
+
+#: src/js/services/bitcoincomService.js:35
+msgid "Mining Pool"
+msgstr ""
+
+#: src/js/services/bitcoincomService.js:42
+msgid "Tools"
+msgstr ""
+
+#: src/js/services/bitcoincomService.js:49
+msgid "Bitcoin Price Charts"
+msgstr ""
+
+#: src/js/services/bitcoincomService.js:56
+msgid "Free Bitcoin Cash"
+msgstr ""
+
+#: www/views/tab-home.html:30
+msgid "Your Bitcoin Wallets are ready!"
+msgstr ""
+
 #: src/js/controllers/amount.js:49
 msgid "Address doesn\'t contain currency information, please make sure you are sending the correct currency."
 msgstr ""

src/js/controllers/addressbookAdd.js

@@ -21,6 +21,9 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu
     $timeout(function() {
       var form = addressbookForm;
       if (data && form) {
+        if (data.result) {
+          data = data.result;
+        }
         data = data.replace(/^bitcoin(cash)?:/, '');
         form.address.$setViewValue(data);
         form.address.$isValid = true;
@@ -36,9 +39,9 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu
       addressbook.address = translated.legacy;
     }
 
-    var channel = "firebase";
+    var channel = "ga";
-    if (platformInfo.isNW) {
+    if (platformInfo.isCordova) {
-      channel = "ga";
+      channel = "firebase";
     }
     var log = new window.BitAnalytics.LogEvent("contact_created", [{
       "coin": $scope.addressbookEntry.coin

src/js/controllers/confirm.js

@@ -1,11 +1,12 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, $ionicLoading, addressbookService, gettextCatalog, walletService, platformInfo, lodash, configService, $stateParams, $window, $state, $log, profileService, bitcore, bitcoreCash, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, feeService, bitcoinCashJsService, bwcError, txConfirmNotification, externalLinkService, firebaseEventsService, soundService) {
+angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, $ionicLoading, ionicToast, addressbookService, gettextCatalog, walletService, platformInfo, lodash, configService, $stateParams, $window, $state, $log, profileService, bitcore, bitcoreCash, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, feeService, bitcoinCashJsService, bwcError, txConfirmNotification, externalLinkService, firebaseEventsService, soundService, clipboardService) {
 
   var countDown = null;
   var FEE_TOO_HIGH_LIMIT_PER = 15;
 
   var tx = {};
+  var lastTxId = "";
 
   // Config Related values
   var config = configService.getSync();
@@ -25,6 +26,17 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     }, 10);
   }
 
+  $scope.shareTransaction = function() {
+    var explorerTxUrl = 'https://explorer.bitcoin.com/'+tx.coin+'/tx/'+lastTxId;
+    if (platformInfo.isCordova) {
+      var text = 'Take a look at this Bitcoin transaction here: '+explorerTxUrl;
+      window.plugins.socialsharing.share(text, null, null, null);
+    } else {
+      ionicToast.show(gettextCatalog.getString('Copied to clipboard'), 'bottom', false, 3000);
+      clipboardService.copyToClipboard(explorerTxUrl);
+    }
+  };
+
   $scope.showWalletSelector = function() {
     $scope.walletSelector = true;
     refresh();
@@ -652,6 +664,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
             txConfirmNotification.subscribe(wallet, {
               txid: txp.txid
             });
+            lastTxId = txp.txid;
           }
         }, onSendStatusChange);
       };
@@ -683,9 +696,9 @@ angular.module('copayApp.controllers').controller('confirmController', function(
         soundService.play('misc/payment_sent.mp3');
       }
       
-      var channel = "firebase";
+      var channel = "ga";
-      if (platformInfo.isNW) {
+      if (platformInfo.isCordova) {
-        channel = "ga";
+        channel = "firebase";
       }
       var log = new window.BitAnalytics.LogEvent("transfer_success", [{
         "coin": $scope.wallet.coin,

src/js/controllers/customAmount.js

@@ -65,6 +65,14 @@ angular.module('copayApp.controllers').controller('customAmountController', func
       var currency = parsedAmount.currency;
       $scope.amountUnitStr = parsedAmount.amountUnitStr;
 
+      configService.whenAvailable(function (config) {
+        $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay;
+
+        $timeout(function () {
+          $scope.$apply();
+        });
+      });
+
       if (currency != 'BTC' && currency != 'BCH') {
         // Convert to BTC or BCH
         var config = configService.getSync().wallet.settings;

src/js/controllers/preferencesNotifications.js

@@ -76,9 +76,9 @@ angular.module('copayApp.controllers').controller('preferencesNotificationsContr
 
     emailService.updateEmail(opts);
 
-    var channel = "firebase";
+    var channel = "ga";
-    if (platformInfo.isNW) {
+    if (platformInfo.isCordova) {
-      channel = "ga";
+      channel = "firebase";
     }
     var log = new window.BitAnalytics.LogEvent("settings_email_notification_toggle", [{
       "toggle": $scope.emailNotifications.value

src/js/controllers/tab-home.js

@@ -224,6 +224,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
               cb();
             }
           }
+          $scope.walletsWithFunds = profileService.getWallets({hasFunds: true});
         });
       });
     };

src/js/controllers/tab-receive.js

@@ -144,9 +144,9 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
       }
       $scope.paymentReceivedCoin = $scope.wallet.coin;
 
-      var channel = "firebase";
+      var channel = "ga";
-      if (platformInfo.isNW) {
+      if (platformInfo.isCordova) {
-        channel = "ga";
+        channel = "firebase";
       }
       var log = new window.BitAnalytics.LogEvent("transfer_success", [{
         "coin": $scope.wallet.coin,
@@ -232,10 +232,14 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
 
     if (!$scope.wallets[0]) return;
 
-    // select first wallet if no wallet selected previously
+    var selectedWallet = null;
-    var selectedWallet = checkSelectedWallet($scope.wallet, $scope.wallets);
+    if (data.stateParams.walletId) { // from walletDetails
+      selectedWallet = checkSelectedWallet(profileService.getWallet(data.stateParams.walletId), $scope.wallets);
+    } else {
+      // select first wallet if no wallet selected previously
+      selectedWallet = checkSelectedWallet($scope.wallet, $scope.wallets);
+    }
     $scope.onWalletSelect(selectedWallet);
-
     $scope.showShareButton = platformInfo.isCordova ? (platformInfo.isIOS ? 'iOS' : 'Android') : null;
 
     listeners = [

src/js/controllers/tab-settings.js

@@ -16,7 +16,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
         isoCode: config.wallet.settings.alternativeIsoCode
       };
 
-      $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay;
+      $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay === 'crypto' ? gettextCatalog.getString('Cryptocurrency') : gettextCatalog.getString('Fiat');
 
       // TODO move this to a generic service
       bitpayAccountService.getAccounts(function(err, data) {

src/js/controllers/walletDetails.js

@@ -12,9 +12,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
   $scope.isAndroid = platformInfo.isAndroid;
   $scope.isIOS = platformInfo.isIOS;
 
-  var channel = "firebase";
+  var channel = "ga";
-  if (platformInfo.isNW) {
+  if (platformInfo.isCordova) {
-    channel = "ga";
+    channel = "firebase";
   }
   var log = new window.BitAnalytics.LogEvent("wallet_details_open", [], [channel]);
   window.BitAnalytics.LogEventHandlers.postEvent(log);
@@ -342,9 +342,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
       top = TOP_BALANCE_BUTTON;
     }
 
-    var amountTop = ((amountScale - 0.7) / 0.7) * top;
+    var amountTop = ((amountScale - 0.80) / 0.80) * top;
-    if (amountTop < -10) {
+    if (amountTop < -2) {
-      amountTop = -10;
+      amountTop = -2;
     }
     if (amountTop > top) {
       amountTop = top;
@@ -353,6 +353,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
     var t = amountTop;
 
     $scope.altAmountOpacity = (amountHeight - 100) / 80;
+    $scope.buttonsOpacity = (amountHeight - 140) / 70;
     $window.requestAnimationFrame(function() {
       $scope.amountHeight = amountHeight + 'px';
       $scope.contentMargin = contentMargin + 'px';
@@ -469,4 +470,30 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
   function rgbToHex(r, g, b) {
     return "#" + componentToHex(r) + componentToHex(g) + componentToHex(b);
   }
+  $scope.goToSend = function() {
+    $state.go('tabs.home', {
+      walletId: $scope.wallet.id
+    }).then(function () {
+      $ionicHistory.clearHistory();
+      $state.go('tabs.send');
+    });
+  };
+  $scope.goToReceive = function() {
+    $state.go('tabs.home', {
+      walletId: $scope.wallet.id
+    }).then(function () {
+      $ionicHistory.clearHistory();
+      $state.go('tabs.receive', {
+        walletId: $scope.wallet.id
+      });
+    });
+  };
+  $scope.goToBuy = function() {
+    $state.go('tabs.home', {
+      walletId: $scope.wallet.id
+    }).then(function () {
+      $ionicHistory.clearHistory();
+      $state.go('tabs.buyandsell');
+    });
+  };
 });

src/js/directives/slideToAcceptSuccess.js

@@ -9,12 +9,12 @@ angular.module('copayApp.directives')
       scope: {
         isShown: '=slideSuccessShow',
         onConfirm: '&slideSuccessOnConfirm',
-        hideOnConfirm: '=slideSuccessHideOnConfirm'
+        hideOnConfirm: '=slideSuccessHideOnConfirm',
+        onShare: '=slideSuccessOnShare',
       },
       link: function(scope, element, attrs) {
-
+        scope.isCordova = platformInfo.isCordova;
-        scope.isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
+        scope.hasShareFunction = typeof scope.onShare === 'function';
-
         var elm = element[0];
         elm.style.display = 'none';
         scope.$watch('isShown', function() {
@@ -32,6 +32,9 @@ angular.module('copayApp.directives')
             elm.style.display = 'none';
           }
         };
+        scope.onShareButtonClick = function() {
+          scope.onShare();
+        }
       }
     };
   });

src/js/routes.js

@@ -236,7 +236,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('tabs.receive', {
-        url: '/receive',
+        url: '/receive/:walletId',
         views: {
           'tab-receive': {
             controller: 'tabReceiveController',
@@ -1231,9 +1231,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       });
 
-      var channel = "firebase";
+      var channel = "ga";
-      if (platformInfo.isNW) {
+      if (platformInfo.isCordova) {
-        channel = "ga";
+        channel = "firebase";
       }
       
       // Send a log to test

src/js/services/bitcoincomService.js

@@ -1,5 +1,5 @@
 'use strict';
-angular.module('copayApp.services').factory('bitcoincomService', function(platformInfo, nextStepsService) {
+angular.module('copayApp.services').factory('bitcoincomService', function(gettextCatalog, nextStepsService, platformInfo) {
   var root = {};
   var credentials = {};
 
@@ -19,42 +19,42 @@ angular.module('copayApp.services').factory('bitcoincomService', function(platfo
 
   var cashGamesItem = {
     name: 'games',
-    title: 'Bitcoin Cash Games',
+    title: gettextCatalog.getString('Bitcoin Cash Games'),
     icon: 'icon-games',
     href: 'https://cashgames.bitcoin.com'
   };
 
   var newsItem = {
     name: 'news',
-    title: 'News',
+    title: gettextCatalog.getString('News'),
     icon: 'icon-news',
     href: 'https://news.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=News'
   };
 
   var poolItem = {
     name: 'pool',
-    title: 'Mining Pool',
+    title: gettextCatalog.getString('Mining Pool'),
     icon: 'icon-mining',
     href: 'https://pool.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=Pool'
   };
 
   var toolsItem = {
     name: 'tools',
-    title: 'Tools',
+    title: gettextCatalog.getString('Tools'),
     icon: 'icon-tools',
     href: 'https://tools.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=Tools'
   };
 
   var priceChartItem = {
     name: 'pricechart',
-    title: 'Bitcoin Price Charts',
+    title: gettextCatalog.getString('Bitcoin Price Charts'),
     icon: 'icon-chart',
     sref: 'tabs.pricechart',
   };
 
   var faucetItem = {
     name: 'faucet',
-    title: 'Free Bitcoin Cash',
+    title: gettextCatalog.getString('Free Bitcoin Cash'),
     icon: 'icon-faucet',
     href: 'https://free.bitcoin.com/?utm_source=WalletApp&utm_medium=' + os + '&utm_campaign=Faucet'
   };

src/js/services/buyAndSellService.js

@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.services').factory('buyAndSellService', function($log, servicesService, lodash, $ionicScrollDelegate, $timeout) {
+angular.module('copayApp.services').factory('buyAndSellService', function(gettextCatalog, $log, servicesService, lodash, $ionicScrollDelegate, $timeout) {
   var root = {};
   var services = [];
   var linkedServices = [];
@@ -23,7 +23,7 @@ angular.module('copayApp.services').factory('buyAndSellService', function($log,
 
     if (linkedServices.length == 0) {
       servicesService.register({
-        title: 'Buy Bitcoin',
+        title: gettextCatalog.getString('Buy Bitcoin'),
         name: 'buyandsell',
         icon: 'icon-buy-bitcoin2',
         sref: 'tabs.buyandsell',

src/js/services/clipboardService.js

@@ -11,10 +11,15 @@ angular.module('copayApp.services').factory('clipboardService', function ($http,
       cordova.plugins.clipboard.copy(data);
     } else if (platformInfo.isNW) {
       nodeWebkitService.writeToClipboard(data);
+    } else if (navigator && navigator.clipboard) {
+      $log.debug("Use navigator clipboard.")
+      navigator.clipboard.writeText(data).catch(err => {
+        $log.debug("Clipboard writing is not supported in your browser..");
+      });
     } else if (clipboard.supported) {
       clipboard.copyText(data);
     } else {
-      // No supported
+      // Not supported
       return;
     }
   };

src/js/services/communityService.js

@@ -1,5 +1,5 @@
 'use strict'
-angular.module('copayApp.services').factory('communityService', function(configService, $log, lodash) {
+angular.module('copayApp.services').factory('communityService', function(configService, gettextCatalog, $log, lodash) {
   var root = {};
   var services = [];
 
@@ -37,14 +37,14 @@ angular.module('copayApp.services').factory('communityService', function(configS
 
   var bchRedditItem = {
     name: 'bchreddit',
-    title: 'Bitcoin Cash Reddit',
+    title: gettextCatalog.getString('Bitcoin Cash Reddit'),
     icon: 'icon-reddit-white',
     href: 'http://reddit.com/r/btc'
   };
 
   var bitcoincomTwitterItem = {
     name: 'bitcoincomTwitter',
-    title: 'Bitcoin.com Twitter',
+    title: gettextCatalog.getString('Bitcoin.com Twitter'),
     icon: 'icon-twitter-white',
     href: 'https://twitter.com/BTCTN'
   };

src/js/services/profileService.js

@@ -427,9 +427,9 @@ angular.module('copayApp.services')
           }, function(err, secret) {
             if (err) return bwcError.cb(err, gettextCatalog.getString('Error creating wallet'), cb);
 
-            var channel = "firebase";
+            var channel = "ga";
-            if (platformInfo.isNW) {
+            if (platformInfo.isCordova) {
-              channel = "ga";
+              channel = "firebase";
             }
             var log = new window.BitAnalytics.LogEvent("wallet_created", [{
               "coin": opts.coin

src/js/services/shapeshiftService.js

@@ -1,4 +1,5 @@
 'use strict';
+
 angular.module('copayApp.services').factory('shapeshiftService', function ($http, $interval, $log, lodash, moment, ongoingProcess, shapeshiftApiService, storageService, configService, incomingData, platformInfo, servicesService) {
   var root = {};
   root.ShiftState = 'Shift';
@@ -135,17 +136,4 @@ angular.module('copayApp.services').factory('shapeshiftService', function ($http
       }
     });
   };
-
-  var servicesItem = {
-    name: 'shapeshift',
-    title: 'Shapeshift',
-    icon: 'icon-shapeshift',
-    sref: 'tabs.shapeshift',
-  };
-
-  var register = function () {
-    servicesService.register(servicesItem);
-  };
-  register();
-  return root;
 });

src/js/services/txFormatService.js

@@ -201,7 +201,7 @@ angular.module('copayApp.services').factory('txFormatService', function($filter,
     var alternativeIsoCode = config.alternativeIsoCode;
 
     // If fiat currency
-    if (currency != 'BCH' && currency != 'BTC' && currency != 'sat') {
+    if (currency && currency.toUpperCase() != 'BCH' && currency.toUpperCase() != 'BTC' && currency != 'sat') {
       amountUnitStr = $filter('formatFiatAmount')(amount) + ' ' + currency;
       amountSat = rateService.fromFiat(amount, currency, coin).toFixed(0);
     } else if (currency == 'sat') {

src/sass/buttons.scss

@@ -72,5 +72,17 @@
     &.activated {
       color: #FFF;
     }
+    &-outline {
+      @include button-style(transparent, #FFFFFF, #FAFAFA, #FFF, #FFFFFF);
+      @include button-outline(#FFFFFF);
+      background: none;
+      box-shadow: none;
+    }
+  }
+  &-grey-outline {
+    @include button-style(transparent, #727272, #FAFAFA, #727272, #727272);
+    @include button-outline(#727272);
+    background: none;
+    box-shadow: none;
   }
 }

src/sass/qr.scss

@@ -5,8 +5,8 @@ qrcode {
       content: "";
       background-size: 100% 100%;
       display: block;
-      left: 88px;
+      left: calc(50% - 22px);
-      margin-top: 88px;
+      margin-top: calc(50% - 22px);
       width: 44px;
       height: 44px;
       position:absolute;

src/sass/shame.scss

@@ -233,6 +233,10 @@ input[type=number] {
   font-size: 24px;
 }
 
+.size-25 {
+  font-size: 25px;
+}
+
 .size-28 {
   font-size: 28px;
 }

src/sass/views/custom-amount.scss

@@ -26,16 +26,10 @@
     height: 100%;
     .qr-code {
       text-align: center;
-      margin-top: 24vh;
+      margin-top: 6px;
-      margin-bottom: 7vh;
+      qrcode canvas {
-      @media(max-height: 800px) {
+        height: 30vh;
-        margin-top: 18vh;
+        max-height: 220px;
-      }
-      @media(max-height: 700px) {
-        margin-top: 14vh;
-      }
-      @media(max-height: 600px) {
-        margin-top: 8vh;
       }
     }
     .info {
@@ -91,5 +85,34 @@
     .address-types {
       text-align: center;
     }
+
+    .amount {
+      margin-top: 20vh;
+      margin-bottom: 4vh;
+      @media(max-height: 800px) {
+        margin-top: 12vh;
+        margin-bottom: 6vh;
+      }
+      @media(max-height: 700px) {
+        margin-top: 10vh;
+        margin-bottom: 4vh;
+      }
+      @media(max-height: 600px) {
+        margin-top: 6vh;
+        margin-bottom: 2vh;
+
+      }
+      width: 100%;
+      text-align: center;
+      //padding-top: 30px;
+      display: block;
+      align-items: center;
+      justify-content: center;
+
+      &-alternative {
+        line-height: 36px;
+      }
+    }
+
   }
 }

src/sass/views/includes/slideToAcceptSuccess.scss

@@ -12,12 +12,6 @@ slide-to-accept-success {
 
   .slide-success {
     $duration: 400ms;
-    &__windows-background {
-      background: $v-success-bg-color;
-      height: 100%;
-      width: 100%;
-      position: fixed;
-    }
     &__background {
       $start-radius: 5;
       $scale-factor: 20;
@@ -40,9 +34,11 @@ slide-to-accept-success {
     &__content {
       position: relative;
       z-index: 1;
-      margin-top: -20vh;
+      margin-top: -10vh;
 
       > img {
+        width: 45vw;
+        max-width: 166px;
         margin-bottom: 1.8rem;
         -webkit-transform: translateY(5rem);
         transform: translateY(5rem);
@@ -59,7 +55,7 @@ slide-to-accept-success {
 
       &__header {
         color: #FFFFFF;
-        font-size: 26px;
+        font-size: 29px;
         -webkit-transform: translateY(5rem);
         transform: translateY(5rem);
         opacity: 0;
@@ -72,6 +68,26 @@ slide-to-accept-success {
           opacity: 1;
         }
       }
+      &__share {
+        transition: transform $duration ease, opacity $duration ease;
+        transition-delay: 600ms;
+        opacity: 0;
+        margin-top: 15vh;
+        span {
+          color: #FFF;
+          font-size: 22px;
+          height: 28px;
+        }
+        img {
+          height: 28px;
+          width: auto;
+          vertical-align: bottom;
+          margin-right: 4px;
+        }
+        &.reveal {
+          opacity: 0.79;
+        }
+      }
     }
 
     &__footer {
@@ -98,11 +114,11 @@ slide-to-accept-success {
       &__btn {
         display: block;
         color: #FFFFFF;
-        font-size: 18px;
+        font-size: 22px;
         font-weight: 600;
         letter-spacing: 2.86px;
-        padding: 1rem 0 1.1rem;
+        padding: 2rem 0 2.1rem;
-        border-top: 1px solid rgba(255, 255, 255, .45);
+        border-top: 1px solid rgba(255, 255, 255, 0.25);
         cursor: pointer;
       }
     }

src/sass/views/tab-home.scss

@@ -69,6 +69,25 @@
       }
     }
   }
+  .buttons {
+    margin: 6px auto -12px;
+    max-width: 600px;
+    >.col {
+      padding: 5px 10px;
+      margin-bottom: 0;
+    }
+    .button {
+      border: 2px solid;
+      border-radius: 47px;
+      padding: 0 15px 0 15px;
+      text-align: center;
+      width: 100%;
+      font-size: 19px;
+      font-weight: bolder;
+      min-height: auto;
+      line-height: 36px;
+    }
+  }
   .wallet-coin-logo {
     vertical-align: middle;
     margin-right: 5px;

src/sass/views/walletDetails.scss

@@ -135,11 +135,12 @@
 
     &.status-bar {
       margin-top: 20px;
+      margin-top: env(safe-area-inset-top);
     }
   }
   .bar-header {
     border: 0;
-    background: none;
+    background: rgb(238, 182, 64);
     .title, .button {
       color: #fff;
     }
@@ -153,7 +154,7 @@
   ion-content {
 
     &.collapsible {
-      margin-top: 210px;
+      margin-top: 230px;
     }
 
     padding-top: 0;
@@ -190,12 +191,34 @@
         transform: translateY(100px);
       }
     }
+
+    .send-receive-buttons {
+      max-width: 600px;
+      position: absolute;
+      bottom: 20px;
+
+      >.col {
+        padding: 5px 10px;
+        margin-bottom: 0;
+      }
+      .button {
+        border: 2px solid;
+        border-radius: 47px;
+        padding: 0 15px 0 15px;
+        text-align: center;
+        width: 100%;
+        font-size: 19px;
+        font-weight: bolder;
+        min-height: auto;
+        line-height: 36px;
+      }
+    }
   }
   .amount {
     width: 100%;
     text-align: center;
     color: #fff;
-    height: 210px;
+    height: 230px;
     padding-top: 40px;
     display: block;
     align-items: center;

www/img/icon-sent-successful.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 166 166">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+      }
+    </style>
+  </defs>
+  <path id="_ionicons_svg_md-checkmark-circle-outline" class="cls-1" d="M96.969,115.231,85.35,126.85,122.7,164.2l83-83L194.081,69.581,122.7,140.544,96.969,115.231ZM197.4,131a66.116,66.116,0,1,1-48.138-63.91l12.863-12.865A77.206,77.206,0,0,0,131,48a83,83,0,1,0,83,83Z" transform="translate(-48 -48)"/>
+</svg>

www/img/icon-share-white.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="400px" height="400px" viewBox="56 56 400 400" enable-background="new 56 56 400 400" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#FFFFFF" d="M350.833,297.017c-17.517,0-32.967,8.346-43.062,21.124l-93.629-47.881
+			c1.226-4.571,2.106-9.296,2.106-14.267c0-5.412-1.046-10.507-2.506-15.465l93.216-47.661
+			c10.039,13.358,25.889,22.089,43.888,22.089c30.489,0,55.153-24.664,55.153-55.125c0-30.435-24.664-55.112-55.152-55.112
+			c-30.42,0-55.111,24.677-55.111,55.111c0,4.985,0.882,9.723,2.12,14.308l-93.615,47.882
+			c-10.108-12.793-25.587-21.166-43.131-21.166c-30.462,0-55.111,24.691-55.111,55.139c0,30.447,24.65,55.125,55.111,55.125
+			c18.026,0,33.863-8.758,43.943-22.129l93.174,47.66c-1.46,4.943-2.52,10.081-2.52,15.507c0,30.447,24.691,55.125,55.111,55.125
+			c30.489,0,55.152-24.678,55.152-55.125C405.985,321.681,381.322,297.017,350.833,297.017z"/>
+	</g>
+</g>
+</svg>

www/views/confirm.html

@@ -120,6 +120,7 @@
   <slide-to-accept-success
     slide-success-show="sendStatus === 'success'"
     slide-success-on-confirm="onSuccessConfirm()"
+    slide-success-on-share="shareTransaction"
     slide-success-hide-on-confirm="true">
     <span ng-show="wallet.m == 1 && (wallet.canSign() || wallet.isPrivKeyExternal())" translate>Payment Sent</span>
     <span ng-show="wallet.m > 1 && (wallet.canSign() || wallet.isPrivKeyExternal())" translate>Proposal Created</span>

www/views/customAmount.html

@@ -30,8 +30,22 @@
           <br/>Return To Address<br/>
         </p>
       </div>
+      <div ng-show="!showingPaymentReceived" class="amount">
+        <div ng-show="selectedPriceDisplay=='fiat'">
+          <span class="size-36">{{amountUnitStr}}</span>
+          <div class="size-14 amount-alternative">
+            {{altAmountStr | uppercase}}
+          </div>
+        </div>
+        <div ng-show="selectedPriceDisplay=='crypto'">
+          <span class="size-36">{{altAmountStr | uppercase}}</span>
+          <div class="size-14 amount-alternative">
+            {{amountUnitStr}}
+          </div>
+        </div>
+      </div>
       <div ng-show="!showingPaymentReceived" class="qr-code" copy-to-clipboard="copyToClipboard()">
-        <qrcode size="220" data="{{ protocolHandler }}:{{address + '?amount=' + amountBtc}}" color="#334"></qrcode>
+        <qrcode class="qr-overlay qr-overlay--{{ wallet.coin }}" size="220" data="{{ protocolHandler }}:{{address + '?amount=' + amountBtc}}" color="#334"></qrcode>
       </div>
       <div ng-show="!showingPaymentReceived" ng-show="address && coin == 'bch'" class="address-types">
         <div>
@@ -57,12 +71,6 @@
             {{address}}
           </span>
         </div>
-        <div class="item single-line">
-          <span class="label" translate>Amount</span>
-          <span class="item-note">
-            {{amountUnitStr}} - {{altAmountStr}}
-          </span>
-        </div>
         <div class="item single-line">
           <div class="wallet">
             <i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>

www/views/includes/slideToAcceptSuccess.html

@@ -1,13 +1,16 @@
 <div
   class="slide-success__background"
-  ng-class="{'fill-screen': fillScreen, 'slide-success__windows-background': isWindowsPhoneApp}">
+  ng-class="{'fill-screen': fillScreen}">
 </div>
 
 <div ng-disabled="wallet" class="slide-success__content">
-  <img src="img/onboarding-success.svg" ng-class="{reveal: fillScreen}">
+  <img src="img/icon-sent-successful.svg" ng-class="{reveal: fillScreen}">
   <div class="slide-success__content__header" ng-class="{reveal: fillScreen}">
     <ng-transclude>Payment Sent</ng-transclude>
   </div>
+  <div class="slide-success__content__share" ng-if="hasShareFunction" ng-class="{reveal: fillScreen}" ng-click="onShareButtonClick()">
+    <span><img src="img/icon-share-white.svg"></span><span translate>Share this transaction</span>
+  </div>
 </div>
 
 <div class="slide-success__footer" ng-class="{reveal: fillScreen}">

www/views/preferencesPriceDisplay.html

@@ -1,18 +1,18 @@
 <ion-view id="settings-pricedisplay" class="settings" show-tabs>
   <ion-nav-bar class="bar-royal">
     <ion-nav-title>
-      {{'Price display'|translate}}
+      {{'Price Display'|translate}}
     </ion-nav-title>
     <ion-nav-back-button>
     </ion-nav-back-button>
   </ion-nav-bar>
   <ion-content>
     <div class="price-display">
-      <ion-radio class="capitalize" ng-value="'fiat'" ng-model="selectedPriceDisplay" ng-click="save(selectedPriceDisplay)">
+      <ion-radio ng-value="'fiat'" ng-model="selectedPriceDisplay" ng-click="save(selectedPriceDisplay)">
-        fiat
+        <span translate>Fiat</span>
       </ion-radio>
-      <ion-radio class="capitalize" ng-value="'crypto'" ng-model="selectedPriceDisplay" ng-click="save(selectedPriceDisplay)">
+      <ion-radio ng-value="'crypto'" ng-model="selectedPriceDisplay" ng-click="save(selectedPriceDisplay)">
-        cryptocurrency
+        <span translate>Cryptocurrency</span>
       </ion-radio>
     </div>
   </ion-content>

www/views/tab-home.html

@@ -22,6 +22,24 @@
       </div>
     </div>
 
+    <div class="buttons row">
+      <div class="col">
+        <div class="button button-outline button-grey-outline" ui-sref="tabs.receive">
+          <span translate>Receive</span>
+        </div>
+      </div>
+      <div class="col">
+        <div class="button button-outline button-grey-outline" ng-class="{'ng-hide': walletsWithFunds.length}"
+             ui-sref="tabs.buyandsell">
+          <span translate>Buy Bitcoin</span>
+        </div>
+        <div class="button  button-outline button-grey-outline" ng-class="{'ng-hide': !walletsWithFunds.length}"
+             ui-sref="tabs.send">
+          <span translate>Send</span>
+        </div>
+      </div>
+    </div>
+
     <div class="list card homeTip" ng-if="homeTip">
       <div class="item item-icon-right item-heading">
         <div class="title" translate>

www/views/tab-send.html

@@ -15,7 +15,7 @@
         <div class="buttons">
           <div class="row">
             <div class="col-40">
-              <button class="button button-standard button-primary button-outline button-clipboard-paste" ng-click="pasteClipboard()" ng-class="{'contains-address': clipboardHasAddress, 'contains-content': clipboardHasContent}">
+              <button class="button button-standard button-primary button-outline button-clipboard-paste" ng-click="pasteClipboard()" ng-class="{'contains-address': clipboardHasAddress}">
                 <span class="icon"></span><br/>
                 <span class="non-address" translate>Paste Clipboard</span>
                 <span class="address" translate>Paste Address</span>

www/views/walletDetails.html

@@ -34,7 +34,7 @@
         on-hold="hideToggle()"
         ng-style="{'transform': amountScale}"
         ng-class="{amount__balance: amountIsCollapsible}">
-        <strong class="size-36">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</strong>
+        <strong class="size-25">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</strong>
         <div
           class="size-14 amount-alternative"
           ng-if="status.totalBalanceAlternative && wallet.network == 'livenet'"
@@ -48,7 +48,7 @@
         on-hold="hideToggle()"
         ng-style="{'transform': amountScale}"
         ng-class="{amount__balance: amountIsCollapsible}">
-        <strong class="size-36">{{status.totalBalanceStr}}</strong>
+        <strong class="size-25">{{status.totalBalanceStr}}</strong>
         <div
           class="size-14 amount-alternative"
           ng-if="status.totalBalanceAlternative && wallet.network == 'livenet'"
@@ -91,6 +91,22 @@
         </button>
       </div>
 
+      <div class="send-receive-buttons row" ng-if="(status.availableBalanceSat || status.availableBalanceSat === 0) && (buttonsOpacity > 0 || isAndroid)" ng-style="{opacity: buttonsOpacity}">
+        <div class="col">
+          <div class="button button-outline button-white-outline" ng-click="goToReceive()">
+            <span translate>Receive</span>
+          </div>
+        </div>
+        <div class="col">
+          <div class="button button-outline button-white-outline" ng-if="!status.availableBalanceSat" ng-click="goToBuy()">
+            <span translate>Buy Bitcoin</span>
+          </div>
+          <div class="button  button-outline button-white-outline" ng-if="status.availableBalanceSat>0" ng-click="goToSend()">
+            <span translate>Send</span>
+          </div>
+        </div>
+      </div>
+
     </div>
     <div class="wallet-details-wallet-info" ng-style="{opacity: altAmountOpacity}">
       <span ng-include="'views/includes/walletInfo.html'"></span>
@@ -127,7 +143,7 @@
         on-hold="hideToggle()"
         ng-style="{'transform': amountScale}"
         ng-class="{amount__balance: amountIsCollapsible}">
-        <strong class="size-36">{{status.totalBalanceStr}}</strong>
+        <strong class="size-25">{{status.totalBalanceStr}}</strong>
         <div
           class="size-14 amount-alternative"
           ng-if="status.totalBalanceAlternative && wallet.network == 'livenet'"
@@ -142,9 +158,9 @@
         on-hold="hideToggle()"
         ng-style="{'transform': amountScale}"
         ng-class="{amount__balance: amountIsCollapsible}">
-        <strong class="size-36">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</strong>
+        <strong class="size-25">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</strong>
         <div
-          class="size-14 amount-alternative"
+          class="size-16 amount-alternative"
           ng-if="status.totalBalanceAlternative && wallet.network == 'livenet'"
           ng-style="{opacity: altAmountOpacity}">
           {{status.totalBalanceStr}}
@@ -156,7 +172,7 @@
       ng-show="!updateStatusError && wallet.balanceHidden  && !wallet.scanning"
       on-hold="hideToggle()">
         <strong class="size-24" translate>[Balance Hidden]</strong>
-        <div ng-style="{opacity: altAmountOpacity}" class="size-14 amount-alternative" translate>
+        <div ng-style="{opacity: altAmountOpacity}" class="size-16 amount-alternative" translate>
           Tap and hold to show
         </div>
       </div>
@@ -166,7 +182,7 @@
       class="amount__balance"
       ng-show="!updateStatusError && wallet.scanning">
         <strong class="size-24" translate>[Scanning Funds]</strong>
-        <div ng-style="{opacity: altAmountOpacity}" class="size-14 amount-alternative" translate>
+        <div ng-style="{opacity: altAmountOpacity}" class="size-16 amount-alternative" translate>
           Please wait
         </div>
       </div>
@@ -198,6 +214,22 @@
         </button>
       </div>
 
+      <div class="send-receive-buttons row" ng-if="(status.availableBalanceSat || status.availableBalanceSat === 0) && (buttonsOpacity > 0 || isAndroid)" ng-style="{opacity: buttonsOpacity}">
+        <div class="col">
+          <div class="button button-outline button-white-outline" ng-click="goToReceive()">
+            <span translate>Receive</span>
+          </div>
+        </div>
+        <div class="col">
+          <div class="button button-outline button-white-outline" ng-if="!status.availableBalanceSat" ng-click="goToBuy()">
+            <span translate>Buy Bitcoin</span>
+          </div>
+          <div class="button  button-outline button-white-outline" ng-if="status.availableBalanceSat>0" ng-click="goToSend()">
+            <span translate>Send</span>
+          </div>
+        </div>
+      </div>
+
     </div>
     <div class="wallet-details-wallet-info" ng-style="{opacity: altAmountOpacity}">
       <span ng-include="'views/includes/walletInfo.html'"></span>