Merge pull request #231 from xenohunter/master

Small fixes
wavesplatform · May 2, 2017 · 8fbeaee · 8fbeaee
2 parents 18793d9 + 48a0782
commit 8fbeaee
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/src/js/portfolio/asset.details.controller.js b/src/js/portfolio/asset.details.controller.js
@@ -5,12 +5,7 @@
         var details = this;
 
         function transformAddress(address) {
-            var result = address;
-
-            if (isMyAddress(result))
-                result = 'You';
-
-            return result;
+            return isMyAddress(address) ? 'You' : address;
         }
 
         function isMyAddress(address) {
@@ -19,8 +14,9 @@
 
         $scope.$on(events.ASSET_DETAILS, function (event, assetId) {
             var asset = applicationContext.cache.assets[assetId];
-            if (angular.isUndefined(asset))
+            if (angular.isUndefined(asset)) {
                 throw new Error('Failed to find asset details by id ' + assetId);
+            }
 
             details.assetId = assetId;
             details.name = asset.currency.displayName;

diff --git a/src/less/leasing/component.less b/src/less/leasing/component.less
@@ -16,13 +16,17 @@ waves-leasing {
         padding: 30px 4% 20px;
 
         &.balance table {
-          margin-top: 10px;
+          margin-top: 5px;
         }
 
         &.form table {
           width: 100%;
           margin-bottom: 10px;
 
+          .padded-more {
+            padding-top: 4px;
+          }
+
           .button-container {
             padding-top: 10px;
             text-align: center;

diff --git a/src/templates/leasing/component.html b/src/templates/leasing/component.html
@@ -10,6 +10,7 @@
       <section-header>QUICK NOTE</section-header>
       <p>You can transfer or trade only the the money which isn't leased. The leased money cannot be spent by you nor by anyone else.</p>
       <p>You can cancel a leasing transaction as soon as it is in the blockchain. That happens in about a minute most usually.</p>
+      <p>Generative balance will be renewed after 1000 blocks.</p>
     </div>
   </div>
 

diff --git a/src/templates/leasing/lease.form.component.html b/src/templates/leasing/lease.form.component.html
@@ -11,8 +11,8 @@
       <td><input class="wInput form-control" name="leasingAmount" type="text" placeholder="Leasing amount" ng-model="$ctrl.amount" decimal-input-restrictor/></td>
     </tr>
     <tr>
-      <td class="padded">Waves fee</td>
-      <td class="padded">
+      <td class="padded">Fee</td>
+      <td class="padded padded-more">
         <md-autocomplete md-input-name="leasingFee" md-selected-item="$ctrl.autocomplete.selectedFee" md-search-text="$ctrl.autocomplete.searchText"
                          md-items="item in $ctrl.autocomplete.querySearch($ctrl.autocomplete.searchText)"
                          md-item-text="item.amount.toString()" md-min-length="0" md-require-match="" md-no-cache="true"