From d0674518c7ba7d86ec29da27ec719409fa904d70 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Fri, 10 Jun 2016 11:19:36 -0300
Subject: [PATCH] Fix unit selection

---
 public/views/preferencesUnit.html     |  20 ++---
 src/js/controllers/preferencesUnit.js | 105 +++++++++++---------------
 2 files changed, 50 insertions(+), 75 deletions(-)

diff --git a/public/views/preferencesUnit.html b/public/views/preferencesUnit.html
index eccd26b4c..45b775786 100644
--- a/public/views/preferencesUnit.html
+++ b/public/views/preferencesUnit.html
@@ -1,19 +1,11 @@
-<div 
-  class="topbar-container" 
-  ng-include="'views/includes/topbar.html'"
+<div class="topbar-container" ng-include="'views/includes/topbar.html'"
   ng-init="titleSection='Unit'; goBackToState = 'preferencesGlobal'; noColor = true">
 </div>
 
-
-
-
-<div class="content preferences" ng-controller="preferencesUnitController as prefUnit">
+<div class="content preferences" ng-controller="preferencesUnitController">
   <h4></h4>
-  <ul class="no-bullet m0 ">
-  <li ng-repeat="unit in prefUnit.unitOpts" ng-click="prefUnit.save(unit)" class="line-b p20 size-14">
-    <span>{{unit.shortName}}</span>
-    <i class="fi-check size-16 right" ng-show="prefUnit.unitName == unit.shortName"></i>
-  </li>
-  </ul>
+
+  <ion-radio class="line-b size-12" ng-repeat="unit in unitList" ng-value="unit.code" ng-model="currentUnit"
+    ng-click="save(unit)">{{unit.shortName}}
+  </ion-radio>
 </div>
-<div class="extra-margin-bottom"></div>
diff --git a/src/js/controllers/preferencesUnit.js b/src/js/controllers/preferencesUnit.js
index b6cf17437..3572f441e 100644
--- a/src/js/controllers/preferencesUnit.js
+++ b/src/js/controllers/preferencesUnit.js
@@ -1,66 +1,49 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('preferencesUnitController',
-  function($scope, $timeout, $log, configService, go, walletService, profileService) {
-    var config = configService.getSync();
-    this.unitName = config.wallet.settings.unitName;
-    this.unitOpts = [
-      // TODO : add Satoshis to bitcore-wallet-client formatAmount()
-      // {
-      //     name: 'Satoshis (100,000,000 satoshis = 1BTC)',
-      //     shortName: 'SAT',
-      //     value: 1,
-      //     decimals: 0,
-      //     code: 'sat',
-      //   }, 
-      {
-        name: 'bits (1,000,000 bits = 1BTC)',
-        shortName: 'bits',
-        value: 100,
-        decimals: 2,
-        code: 'bit',
-      }
-      // TODO : add mBTC to bitcore-wallet-client formatAmount()
-      // ,{
-      //   name: 'mBTC (1,000 mBTC = 1BTC)',
-      //   shortName: 'mBTC',
-      //   value: 100000,
-      //   decimals: 5,
-      //   code: 'mbtc',
-      // }
-      , {
-        name: 'BTC',
-        shortName: 'BTC',
-        value: 100000000,
-        decimals: 8,
-        code: 'btc',
-      }
-    ];
+angular.module('copayApp.controllers').controller('preferencesUnitController', function($scope, $log, configService, go, walletService, profileService) {
 
-    this.save = function(newUnit) {
-      var opts = {
-        wallet: {
-          settings: {
-            unitName: newUnit.shortName,
-            unitToSatoshi: newUnit.value,
-            unitDecimals: newUnit.decimals,
-            unitCode: newUnit.code,
-          }
+  var config = configService.getSync();
+
+  $scope.currentUnit = config.wallet.settings.unitCode;
+
+  $scope.unitList = [
+    {
+      name: 'bits (1,000,000 bits = 1BTC)',
+      shortName: 'bits',
+      value: 100,
+      decimals: 2,
+      code: 'bit',
+    },
+    {
+      name: 'BTC',
+      shortName: 'BTC',
+      value: 100000000,
+      decimals: 8,
+      code: 'btc',
+    }
+  ];
+
+  $scope.save = function(newUnit) {
+    var opts = {
+      wallet: {
+        settings: {
+          unitName: newUnit.shortName,
+          unitToSatoshi: newUnit.value,
+          unitDecimals: newUnit.decimals,
+          unitCode: newUnit.code,
         }
-      };
-      this.unitName = newUnit.shortName;
-
-      configService.set(opts, function(err) {
-        if (err) $log.warn(err);
-        go.preferencesGlobal();
-        $scope.$emit('Local/UnitSettingUpdated');
-        walletService.updateRemotePreferences(profileService.getClients(), {}, function() {
-          $log.debug('Remote preferences saved');
-        });
-        $timeout(function() {
-          $scope.$apply();
-        }, 100);
-      });
-
+      }
     };
-  });
+
+    configService.set(opts, function(err) {
+      if (err) $log.warn(err);
+
+      go.preferencesGlobal();
+      $scope.$emit('Local/UnitSettingUpdated');
+
+      walletService.updateRemotePreferences(profileService.getClients(), {}, function() {
+        $log.debug('Remote preferences saved');
+      });
+    });
+  };
+});