From 2701eb99af30de3da6af99accd32a0c044476ea8 Mon Sep 17 00:00:00 2001
From: Vusal Gakhramanov <vgakhramanov@wavesplatform.com>
Date: Tue, 1 Oct 2019 17:31:08 +0300
Subject: [PATCH 1/3] DEXW-2203: fix ledger icon

---
 .../directives/avatar/less/avatar.active.less | 21 ++++++++-------
 .../ui/directives/avatar/less/avatar.less     | 26 ++++++++++++-------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/modules/ui/directives/avatar/less/avatar.active.less b/src/modules/ui/directives/avatar/less/avatar.active.less
index d7b59374f1..8bff06b4c3 100644
--- a/src/modules/ui/directives/avatar/less/avatar.active.less
+++ b/src/modules/ui/directives/avatar/less/avatar.active.less
@@ -7,12 +7,6 @@
       transform: scale(1.25);
       box-shadow: 0 0 0 4px #fff, 0 4px 18px 0 rgba(30, 41, 73, 0.15);
     }
-
-    
-    &[type='ledger'] .avatar__wrap:not(.scripted)::after {
-      bottom: 3px;
-      left: calc(100% ~'- 18px');
-    }
   }
   
   &.avatar {
@@ -23,11 +17,20 @@
   }
 }
 
+// .create,
+// .ledger {
+  .avatars-list .avatar_active.avatar[type='ledger'] .avatar__wrap:not(.scripted)::after {
+    bottom: 3px;
+    left: calc(100% ~'- 18px');
+  }
+// }
+
 @media screen and (max-width: 480px) {
-  .avatar_active {
-    .avatar[type='ledger'] .avatar__wrap:not(.scripted)::after {
+  // .create,
+  // .ledger {
+    .avatars-list .avatar[type='ledger'].avatar_active .avatar__wrap:not(.scripted)::after {
       bottom: 8px;
       left: calc(100% ~'- 23px');
     }
-  }
+  // }
 }
\ No newline at end of file
diff --git a/src/modules/ui/directives/avatar/less/avatar.less b/src/modules/ui/directives/avatar/less/avatar.less
index 0d14447525..885e28df92 100644
--- a/src/modules/ui/directives/avatar/less/avatar.less
+++ b/src/modules/ui/directives/avatar/less/avatar.less
@@ -63,12 +63,6 @@
     }
   }
 
-  &[type='ledger'] .avatar__wrap:not(.scripted)::after {
-    bottom: 8px;
-    left: calc(100% ~'- 23px');
-    transition: left 0.3s, bottom 0.3s;
-  }
-
   &__wrapper { // .avatar__wrapper
     display: flex;
     align-items: center;
@@ -83,9 +77,21 @@
   }
 }
 
-@media screen and (max-width: 480px) {
-  .avatar[type='ledger'] .avatar__wrap:not(.scripted)::after {
-    bottom: 13px;
-    left: calc(100% ~'- 28px');
+// .create,
+// .ledger {
+  .avatars-list .avatar[type='ledger'] .avatar__wrap:not(.scripted)::after {
+    bottom: 8px;
+    left: calc(100% ~'- 23px');
+    transition: left 0.3s, bottom 0.3s;
   }
+// }
+
+@media screen and (max-width: 480px) {
+  // .create,
+  // .ledger {
+    .avatars-list .avatar[type='ledger'] .avatar__wrap:not(.scripted)::after {
+      bottom: 13px;
+      left: calc(100% ~'- 28px');
+    }
+  // }
 }
\ No newline at end of file

From c8108b4dae03d4830505d3b31512774ff6297ef5 Mon Sep 17 00:00:00 2001
From: Vusal Gakhramanov <vgakhramanov@wavesplatform.com>
Date: Tue, 1 Oct 2019 18:26:34 +0300
Subject: [PATCH 2/3] DEXW-2203: fix mobile

---
 .../ui/directives/avatar/less/avatar.active.less   | 14 ++++----------
 src/modules/ui/directives/avatar/less/avatar.less  |  6 ------
 .../mainHeader/templates/mobileHeader.html         |  2 +-
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/modules/ui/directives/avatar/less/avatar.active.less b/src/modules/ui/directives/avatar/less/avatar.active.less
index 8bff06b4c3..a6dc0bc094 100644
--- a/src/modules/ui/directives/avatar/less/avatar.active.less
+++ b/src/modules/ui/directives/avatar/less/avatar.active.less
@@ -17,20 +17,14 @@
   }
 }
 
-// .create,
-// .ledger {
   .avatars-list .avatar_active.avatar[type='ledger'] .avatar__wrap:not(.scripted)::after {
     bottom: 3px;
     left: calc(100% ~'- 18px');
   }
-// }
 
 @media screen and (max-width: 480px) {
-  // .create,
-  // .ledger {
-    .avatars-list .avatar[type='ledger'].avatar_active .avatar__wrap:not(.scripted)::after {
-      bottom: 8px;
-      left: calc(100% ~'- 23px');
-    }
-  // }
+  .avatars-list .avatar[type='ledger'].avatar_active .avatar__wrap:not(.scripted)::after {
+    bottom: 8px;
+    left: calc(100% ~'- 23px');
+  }
 }
\ No newline at end of file
diff --git a/src/modules/ui/directives/avatar/less/avatar.less b/src/modules/ui/directives/avatar/less/avatar.less
index 885e28df92..edb9a9deca 100644
--- a/src/modules/ui/directives/avatar/less/avatar.less
+++ b/src/modules/ui/directives/avatar/less/avatar.less
@@ -77,21 +77,15 @@
   }
 }
 
-// .create,
-// .ledger {
   .avatars-list .avatar[type='ledger'] .avatar__wrap:not(.scripted)::after {
     bottom: 8px;
     left: calc(100% ~'- 23px');
     transition: left 0.3s, bottom 0.3s;
   }
-// }
 
 @media screen and (max-width: 480px) {
-  // .create,
-  // .ledger {
     .avatars-list .avatar[type='ledger'] .avatar__wrap:not(.scripted)::after {
       bottom: 13px;
       left: calc(100% ~'- 28px');
     }
-  // }
 }
\ No newline at end of file
diff --git a/src/modules/ui/directives/mainHeader/templates/mobileHeader.html b/src/modules/ui/directives/mainHeader/templates/mobileHeader.html
index c8473a8e46..ab9a3643b5 100644
--- a/src/modules/ui/directives/mainHeader/templates/mobileHeader.html
+++ b/src/modules/ui/directives/mainHeader/templates/mobileHeader.html
@@ -71,7 +71,7 @@
 
                     <div class="mobile-menu__user">
                         <div class="mobile-menu__avatar has-helper"> <!-- MOBILE -->
-                            <w-avatar size="40" address="$ctrl.address"></w-avatar>
+                            <w-avatar type="{{$ctrl.userType}}" size="40" address="$ctrl.address"></w-avatar>
                         </div>
 
                         <div class="mobile-menu__info mobile-user">

From e772377ed7a35997f2946f90d5e9dab3e3b5e339 Mon Sep 17 00:00:00 2001
From: Vusal Gakhramanov <vgakhramanov@wavesplatform.com>
Date: Wed, 2 Oct 2019 14:13:43 +0300
Subject: [PATCH 3/3] DEXW-2203: fix scripted avatars

---
 src/modules/ui/directives/avatar/Avatar.js    |  3 +-
 .../directives/avatar/less/avatar-active.less | 18 +++++++++
 .../directives/avatar/less/avatar.active.less | 30 ---------------
 .../ui/directives/avatar/less/avatar.less     | 13 -------
 .../directives/avatar/less/avatars-list.less  | 37 +++++++++++++++++++
 5 files changed, 56 insertions(+), 45 deletions(-)
 create mode 100644 src/modules/ui/directives/avatar/less/avatar-active.less
 delete mode 100644 src/modules/ui/directives/avatar/less/avatar.active.less
 create mode 100644 src/modules/ui/directives/avatar/less/avatars-list.less

diff --git a/src/modules/ui/directives/avatar/Avatar.js b/src/modules/ui/directives/avatar/Avatar.js
index 3474841987..ff92ec6b12 100644
--- a/src/modules/ui/directives/avatar/Avatar.js
+++ b/src/modules/ui/directives/avatar/Avatar.js
@@ -39,8 +39,7 @@
                 this.style = { width: `${this.size}px`, height: `${this.size}px` };
 
                 this.receive(user.changeScript, () => {
-                    this.hasScript = user.hasScript();
-                    $scope.$apply();
+                    this.$onChanges();
                 });
             }
 
diff --git a/src/modules/ui/directives/avatar/less/avatar-active.less b/src/modules/ui/directives/avatar/less/avatar-active.less
new file mode 100644
index 0000000000..e098846da7
--- /dev/null
+++ b/src/modules/ui/directives/avatar/less/avatar-active.less
@@ -0,0 +1,18 @@
+@import (reference) 'icons';
+@import (reference) 'config';
+
+.avatar_active {
+  .avatar {
+    &__img {
+      transform: scale(1.25);
+      box-shadow: 0 0 0 4px #fff, 0 4px 18px 0 rgba(30, 41, 73, 0.15);
+    }
+  }
+  
+  &.avatar {
+    .avatar__wrap {
+      cursor: default;
+      opacity: 1;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/modules/ui/directives/avatar/less/avatar.active.less b/src/modules/ui/directives/avatar/less/avatar.active.less
deleted file mode 100644
index a6dc0bc094..0000000000
--- a/src/modules/ui/directives/avatar/less/avatar.active.less
+++ /dev/null
@@ -1,30 +0,0 @@
-@import (reference) 'icons';
-@import (reference) 'config';
-
-.avatar_active {
-  .avatar {
-    &__img {
-      transform: scale(1.25);
-      box-shadow: 0 0 0 4px #fff, 0 4px 18px 0 rgba(30, 41, 73, 0.15);
-    }
-  }
-  
-  &.avatar {
-    .avatar__wrap {
-      cursor: default;
-      opacity: 1;
-    }
-  }
-}
-
-  .avatars-list .avatar_active.avatar[type='ledger'] .avatar__wrap:not(.scripted)::after {
-    bottom: 3px;
-    left: calc(100% ~'- 18px');
-  }
-
-@media screen and (max-width: 480px) {
-  .avatars-list .avatar[type='ledger'].avatar_active .avatar__wrap:not(.scripted)::after {
-    bottom: 8px;
-    left: calc(100% ~'- 23px');
-  }
-}
\ No newline at end of file
diff --git a/src/modules/ui/directives/avatar/less/avatar.less b/src/modules/ui/directives/avatar/less/avatar.less
index edb9a9deca..fc3c15a6a4 100644
--- a/src/modules/ui/directives/avatar/less/avatar.less
+++ b/src/modules/ui/directives/avatar/less/avatar.less
@@ -75,17 +75,4 @@
       opacity: 1;
     }
   }
-}
-
-  .avatars-list .avatar[type='ledger'] .avatar__wrap:not(.scripted)::after {
-    bottom: 8px;
-    left: calc(100% ~'- 23px');
-    transition: left 0.3s, bottom 0.3s;
-  }
-
-@media screen and (max-width: 480px) {
-    .avatars-list .avatar[type='ledger'] .avatar__wrap:not(.scripted)::after {
-      bottom: 13px;
-      left: calc(100% ~'- 28px');
-    }
 }
\ No newline at end of file
diff --git a/src/modules/ui/directives/avatar/less/avatars-list.less b/src/modules/ui/directives/avatar/less/avatars-list.less
new file mode 100644
index 0000000000..f3c8bc6e62
--- /dev/null
+++ b/src/modules/ui/directives/avatar/less/avatars-list.less
@@ -0,0 +1,37 @@
+@import (reference) 'icons';
+@import (reference) 'config';
+
+.avatars-list {
+	.avatar[type='ledger'] {
+		.avatar__wrap:not(.scripted)::after {
+			bottom: 8px;
+			left: calc(100% ~'- 23px');
+			transition: left 0.3s, bottom 0.3s;
+		}
+
+		&.avatar_active {
+			.avatar__wrap:not(.scripted)::after {
+				bottom: 3px;
+				left: calc(100% ~'- 18px');
+			}
+		}
+	}
+}
+  
+@media screen and (max-width: 480px) {
+	.avatars-list {
+		.avatar[type='ledger'] {
+			.avatar__wrap:not(.scripted)::after {
+				bottom: 13px;
+				left: calc(100% ~'- 28px');
+			}
+
+			&.avatar_active {
+				.avatar__wrap:not(.scripted)::after {
+					bottom: 8px;
+					left: calc(100% ~'- 23px');
+				}
+			}
+		}
+	}
+}
\ No newline at end of file