Merge pull request #168 from blocktrail/develop

fix buy btc page and banned ip page.

Author: jiangjinyuan

src/js/modules/setup/controllers/banned-ip/banned-ip.ctrl.js

@@ -7,7 +7,12 @@
 
     function BannedIpCtrl($scope, CONFIG, $stateParams) {
         $scope.CONFIG = CONFIG;
-        $scope.bannedIp = $stateParams.bannedIp;
+        var pattern = /^((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){6}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^::([\da-fA-F]{1,4}:){0,4}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:):([\da-fA-F]{1,4}:){0,3}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){2}:([\da-fA-F]{1,4}:){0,2}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){3}:([\da-fA-F]{1,4}:){0,1}((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){4}:((25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(25[0-5]|2[0-4]\d|[01]?\d\d?)$|^([\da-fA-F]{1,4}:){7}[\da-fA-F]{1,4}$|^:((:[\da-fA-F]{1,4}){1,6}|:)$|^[\da-fA-F]{1,4}:((:[\da-fA-F]{1,4}){1,5}|:)$|^([\da-fA-F]{1,4}:){2}((:[\da-fA-F]{1,4}){1,4}|:)$|^([\da-fA-F]{1,4}:){3}((:[\da-fA-F]{1,4}){1,3}|:)$|^([\da-fA-F]{1,4}:){4}((:[\da-fA-F]{1,4}){1,2}|:)$|^([\da-fA-F]{1,4}:){5}:([\da-fA-F]{1,4})?$|^([\da-fA-F]{1,4}:){6}:$/;
+        if (pattern.test($stateParams.bannedIp)) {
+            $scope.bannedIp = $stateParams.bannedIp;
+        } else {
+            $scope.bannedIp = '';
+        }
     }
 
 })();

src/js/modules/wallet/controllers/buy-btc-broker/buy-btc-broker.ctrl.js

@@ -9,8 +9,9 @@
                               $stateParams, $q, $timeout, $interval, $translate, $filter, trackingService, NotificationsService) {
         var walletData = activeWallet.getReadOnlyWalletData();
 
+        $scope.network = CONFIG.NETWORKS[walletData.networkType].TICKER;
         $scope.networkLong = CONFIG.NETWORKS[walletData.networkType.replace("t", "")].NETWORK_LONG;
-        $rootScope.pageTitle = $translate.instant("BUYBTC_NETWORK", { network: $scope.networkLong });
+        $rootScope.pageTitle = $translate.instant("BUYBTC_NETWORK", { network: $scope.network });
 
         $scope.broker = $stateParams.broker;
         $scope.brokerNotExistent = false;
@@ -19,6 +20,7 @@
         $scope.fetchingMainPrice = true;
         $scope.priceBTC = null;
         $scope.fetchingInputPrice = false;
+        $scope.amount = null;
         $scope.fiatFirst = false;
         $scope.buyInput = {
             currencyType: null,
@@ -126,7 +128,16 @@
                 return null;
             }
 
-            return fetchBrokerService().buyPrices(1, null, $scope.buyInput.fiatCurrency, false, true).then(function(result) {
+            switch ($scope.network) {
+                case "BTC":
+                    $scope.amount = 0.1;
+                    break;
+                case "BCH":
+                    $scope.amount = 1;
+                    break;
+            }
+
+            return fetchBrokerService().buyPrices($scope.amount, null, $scope.buyInput.fiatCurrency, false, true).then(function(result) {
                 $scope.priceBTC = result.total;
                 $scope.fetchingMainPrice = false;
             }).catch(function (e) {

src/js/modules/wallet/controllers/buy-btc-broker/buy-btc-broker.tpl.html

@@ -30,7 +30,7 @@ <h2 class="broker-title">
                                         <loading-spinner></loading-spinner>
                                     </div>
                                     <div ng-if="!fetchingMainPrice" class="currentprice-value">
-                                        <b>{{ buyInput.fiatCurrency | toCurrencySymbol }}{{ priceBTC | number:2 }}</b>
+                                        <b>{{ buyInput.fiatCurrency | toCurrencySymbol }}{{ priceBTC | number:2 }}  /  {{ amount }} {{ network }}</b>
                                     </div>
                                 </div>
                             </div>

src/js/modules/wallet/controllers/buy-btc-choose/buy-btc-choose.ctrl.js

@@ -27,7 +27,7 @@
             });
         });
 
-        $rootScope.pageTitle = $translate.instant("BUYBTC_NETWORK", { network: $scope.networkLong });
+        $rootScope.pageTitle = $translate.instant("BUYBTC_NETWORK", { network: $scope.network });
 
         $scope.goBuyBTCState = function(broker) {
             $state.go("app.wallet.buybtc.buy", {broker: broker});

src/sass/theme/reset.scss

@@ -1590,7 +1590,7 @@ $display-token-size: 50px;
             }
 
             .currentprice-value {
-                font-size: 30px;
+                font-size: 20px;
             }
 
             .currentprice-label {