From d49d49f05837998faf5e389d81e3a29f4195b033 Mon Sep 17 00:00:00 2001
From: ekomarovskaya <ekomarovskaya@wavesplatform.com>
Date: Tue, 9 Apr 2019 14:24:50 +0300
Subject: [PATCH 1/2] CLIENT-1785: change asset info

---
 .../ui/directives/transaction/transactions.less     | 13 ++++++++++++-
 .../ui/directives/transaction/types/exchange.html   |  6 +++---
 src/modules/utils/modals/sendAsset/send.modal.less  |  8 +++++---
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/modules/ui/directives/transaction/transactions.less b/src/modules/ui/directives/transaction/transactions.less
index 6c798e90df..71e71709f4 100644
--- a/src/modules/ui/directives/transaction/transactions.less
+++ b/src/modules/ui/directives/transaction/transactions.less
@@ -173,13 +173,24 @@ w-transaction .transaction {
         &:last-child {
           padding-right: @padding-main-layout * 4.4;
           text-align: right;
+
+          .top {
+            word-break: break-all;
+          }
         }
 
         .top {
-          word-break: break-all;
           .spam-label {
             display: none;
           }
+
+          .flex {
+            flex: 0;
+
+            .ellipsis {
+              max-width: 120px;
+            }
+          }
         }
         .bottom {
           color: @color-basic-500;
diff --git a/src/modules/ui/directives/transaction/types/exchange.html b/src/modules/ui/directives/transaction/types/exchange.html
index 7ae73977d5..f031f2c30e 100644
--- a/src/modules/ui/directives/transaction/types/exchange.html
+++ b/src/modules/ui/directives/transaction/types/exchange.html
@@ -1,9 +1,9 @@
 <div class="line-wrapper">
     <div class="line">
-        <div class="body-2 top fs-mobile">
-            <span>
+        <div class="body-2 top flex fs-mobile">
+            <span class="flex">
                 <span w-i18n="transaction.headers.{{::$ctrl.typeName}}"></span>
-                <span>
+                <span class="ellipsis">
                     {{$ctrl.getAssetName($ctrl.transaction.amount.asset)}}
                 </span>
                 <span ng-if="$ctrl.isScamAmount"
diff --git a/src/modules/utils/modals/sendAsset/send.modal.less b/src/modules/utils/modals/sendAsset/send.modal.less
index f75daafffe..d2e8c5ddae 100644
--- a/src/modules/utils/modals/sendAsset/send.modal.less
+++ b/src/modules/utils/modals/sendAsset/send.modal.less
@@ -224,6 +224,7 @@ md-dialog.modal-send {
 
         &__balance {
           font-size: 15px;
+          display: flex;
           @media screen and (max-width: 540px) {
             font-size: 13px;
           }
@@ -245,10 +246,11 @@ md-dialog.modal-send {
     w-select {
       .title {
         overflow-x: hidden;
+      }
 
-        span {
-          white-space: nowrap;
-        }
+      span {
+        max-width: 82px;
+        white-space: nowrap;
       }
 
       .expanded {

From f19ecca7ede00249f78891af40b88d7b197c3a05 Mon Sep 17 00:00:00 2001
From: ekomarovskaya <ekomarovskaya@wavesplatform.com>
Date: Thu, 25 Apr 2019 18:22:26 +0300
Subject: [PATCH 2/2] CLIENT-1785: change asset info

---
 .../directives/transaction/transactions.less  |  9 ++++-
 .../transaction/types/transfer.html           |  2 +-
 .../utils/modals/sendAsset/send-header.html   | 12 +++---
 .../utils/modals/sendAsset/send.modal.less    | 38 ++++++++++---------
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/modules/ui/directives/transaction/transactions.less b/src/modules/ui/directives/transaction/transactions.less
index 71e71709f4..bc89b37439 100644
--- a/src/modules/ui/directives/transaction/transactions.less
+++ b/src/modules/ui/directives/transaction/transactions.less
@@ -154,7 +154,7 @@ w-transaction .transaction {
   .transaction-info {
     display: flex;
     flex-direction: row;
-    width: 100%;
+    width: ~'calc(100% - 88px)';
 
     .full-width {
       width: 100%;
@@ -168,6 +168,8 @@ w-transaction .transaction {
       .line {
         height: 50%;
         flex-basis: 50%;
+        box-sizing: border-box;
+        overflow: hidden;
         color: @color-basic-700;
 
         &:last-child {
@@ -250,6 +252,11 @@ w-transaction .transaction {
   }
 }
 
+.transaction-amounts {
+  max-width: 100%;
+  display: inline-block;
+}
+
 @media screen and (max-width: 960px) {
   .leasing w-transaction .transaction {
     .icon {
diff --git a/src/modules/ui/directives/transaction/types/transfer.html b/src/modules/ui/directives/transaction/types/transfer.html
index 0c1e183ccc..2561750200 100644
--- a/src/modules/ui/directives/transaction/types/transfer.html
+++ b/src/modules/ui/directives/transaction/types/transfer.html
@@ -12,7 +12,7 @@
     </div>
     <div class="line">
         <div class="body-2 top fs-mobile">
-                <span w-i18n="transaction.amounts.{{::$ctrl.typeName}}"
+                <span class="transaction-amounts ellipsis" w-i18n="transaction.amounts.{{::$ctrl.typeName}}"
                       params="{amount: $ctrl.transaction.amount.toFormat(), name: $ctrl.transaction.amount.asset.name}"></span>
         </div>
         <div ng-if="$ctrl.mirrorBalance" class="footnote-1 bottom fs-mobile">
diff --git a/src/modules/utils/modals/sendAsset/send-header.html b/src/modules/utils/modals/sendAsset/send-header.html
index dd6d8098be..cf9a029669 100644
--- a/src/modules/utils/modals/sendAsset/send-header.html
+++ b/src/modules/utils/modals/sendAsset/send-header.html
@@ -4,11 +4,11 @@
          class="input-like big flex-row split-half">
         <div class="flex-row">
             <w-asset-logo class="marker-hide" size="24" asset-id="{{::$ctrl.state.assetId}}"></w-asset-logo>
-            <div class="asset__name">{{$ctrl.balance.asset.name}}</div>
+            <div class="asset__name ellipsis">{{$ctrl.balance.asset.name}}</div>
         </div>
         <div ng-click="$ctrl.activate()" class="flex-row asset__balance">
-            <w-balance money="$ctrl.balance"></w-balance>
-            <span class="mobile-ellipsis ellipsis">&nbsp;{{$ctrl.balance.asset.displayName}}</span>
+            <w-balance class="ellipsis asset__amount" money="$ctrl.balance"></w-balance>
+            <span class="mobile-ellipsis ellipsis asset__name">&nbsp;{{$ctrl.balance.asset.displayName}}</span>
         </div>
     </div>
     <w-select class="big"
@@ -22,11 +22,11 @@
             <div class="flex-row split-half">
                 <div class="flex-row">
                     <w-asset-logo class="marker-hide" size="24" asset-id="{{::option.asset.id}}"></w-asset-logo>
-                    <div class="asset__name">{{::option.asset.name}}</div>
+                    <div class="asset__name ellipsis">{{::option.asset.name}}</div>
                 </div>
                 <div class="asset__balance">
-                    <w-balance money="option"></w-balance>
-                    <span class="mobile-ellipsis ellipsis">&nbsp;{{::option.asset.displayName}}</span>
+                    <w-balance class="ellipsis asset__amount" money="option"></w-balance>
+                    <span class="mobile-ellipsis ellipsis asset__name">&nbsp;{{::option.asset.displayName}}</span>
                 </div>
             </div>
         </w-option>
diff --git a/src/modules/utils/modals/sendAsset/send.modal.less b/src/modules/utils/modals/sendAsset/send.modal.less
index d2e8c5ddae..d526798a92 100644
--- a/src/modules/utils/modals/sendAsset/send.modal.less
+++ b/src/modules/utils/modals/sendAsset/send.modal.less
@@ -171,6 +171,7 @@ md-dialog.modal-send {
 
     .asset__name {
       margin-left: 10px;
+      max-width: 122px;
     }
 
     .flex-row {
@@ -229,30 +230,16 @@ md-dialog.modal-send {
             font-size: 13px;
           }
         }
-      }
-    }
 
-    .input-like {
-      position: relative;
-      padding: 0 20px;
-      border-radius: @border-radius;
-      width: 100%;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      overflow-x: hidden;
-    }
+        &__amount {
+          max-width: 100px;
+        }
+      }
 
-    w-select {
       .title {
         overflow-x: hidden;
       }
 
-      span {
-        max-width: 82px;
-        white-space: nowrap;
-      }
-
       .expanded {
         .select-list {
           margin-bottom: 40px;
@@ -265,6 +252,17 @@ md-dialog.modal-send {
       }
     }
 
+    .input-like {
+      position: relative;
+      padding: 0 20px;
+      border-radius: @border-radius;
+      width: 100%;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      overflow-x: hidden;
+    }
+
     .amount-wrap {
       display: flex;
       flex-direction: row;
@@ -283,6 +281,10 @@ md-dialog.modal-send {
     w-balance {
       vertical-align: top;
       white-space: nowrap;
+
+      &.asset__amount {
+        max-width: 100px;
+      }
     }
 
     w-balance-input {