From 4a484027de392402f2abba389a6aeb98bdbf2dc2 Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Sat, 23 Apr 2016 21:44:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=20=D0=B2=D0=BD=D0=B5=D0=B4=D1=80=D1=91=D0=BD=20RabbitMQ.=20?=
 =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=BB=D0=B5=D1=80=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20?=
 =?UTF-8?q?=D1=81=20RabbitMQ=20=D0=BD=D0=B0=D1=83=D1=87=D0=B8=D0=BB=D1=81?=
 =?UTF-8?q?=D1=8F=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=B2=D0=B0=D1=82=D1=8C?=
 =?UTF-8?q?=20=D1=82=D0=B8=D0=BF=D0=B8=D0=B7=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=B0=D1=80=D0=B3=D1=83=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=82=D1=8B=20=D0=B4=D0=BB=D1=8F=20$body=20=D0=94=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=82=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=86=D0=B0=20=D1=81=20=D0=B8=D1=81=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=B5=D0=B9=20=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D0=B0=20Mojang=20=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B2=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D0=B0=D0=BA=D0=BA=D0=B0?=
 =?UTF-8?q?=D1=83=D0=BD=D1=82=D0=B0=20=D0=B2=20AccountsController?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/profile/Profile.jsx | 4 +++-
 src/components/user/User.js        | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/profile/Profile.jsx b/src/components/profile/Profile.jsx
index 04cf88c..38dd408 100644
--- a/src/components/profile/Profile.jsx
+++ b/src/components/profile/Profile.jsx
@@ -51,7 +51,9 @@ export default class Profile extends Component {
                             <ProfileField
                                 label={<Message {...messages.nickname} />}
                                 value={user.username}
-                                warningMessage={<Message {...messages.mojangPriorityWarning} />}
+                                warningMessage={user.hasMojangUsernameCollision ? (
+                                    <Message {...messages.mojangPriorityWarning} />
+                                ) : ''}
                             />
 
                             <ProfileField
diff --git a/src/components/user/User.js b/src/components/user/User.js
index 49f954e..3614350 100644
--- a/src/components/user/User.js
+++ b/src/components/user/User.js
@@ -26,7 +26,8 @@ export default class User {
             isGuest: true,
             isActive: true,
             shouldChangePassword: false, // TODO: нужно ещё пробросить причину необходимости смены
-            passwordChangedAt: null
+            passwordChangedAt: null,
+            hasMojangUsernameCollision: false,
         };
 
         const user = Object.keys(defaults).reduce((user, key) => {
@@ -60,5 +61,6 @@ export const userShape = PropTypes.shape({
     avatar: PropTypes.string,
     isGuest: PropTypes.bool.isRequired,
     isActive: PropTypes.bool.isRequired,
-    passwordChangedAt: PropTypes.number
+    passwordChangedAt: PropTypes.number,
+    hasMojangUsernameCollision: PropTypes.bool,
 });