fix(settings): prevent error on start

fix colors
ph1p · Aug 19, 2019 · 7781044 · 7781044
1 parent 9bb8acd
commit 7781044
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/assets/css/ui.css b/src/assets/css/ui.css
@@ -118,6 +118,14 @@ body {
   color: #0d6540;
 }
 
+.messages .message.orange .user {
+  color: #865427;
+}
+.messages .message.orange .selection {
+  border-color: #865427;
+  color: #865427;
+}
+
 .messages .message.gray {
   background-color: #4f4f4f;
 }
@@ -130,18 +138,23 @@ body {
 }
 .messages .message.purple {
   background-color: #7b61ff;
+  color: #433688;
 }
 .messages .message.green {
   background-color: #1bc47d;
+  color: #0d6540;
 }
 .messages .message.lightgreen {
   background-color: #6fcf97;
+  color: #3a8459;
 }
 .messages .message.red {
   background-color: #f24822;
+  color: #842713;
 }
 .messages .message.orange {
   background-color: #f2994a;
+  color: #865427;
 }
 
 .chat .footer {

diff --git a/src/ui.tsx b/src/ui.tsx
@@ -61,7 +61,10 @@ const init = (url = 'https://figma-chat.ph1p.dev/') => {
       if (pmessage) {
         if (pmessage.type === 'user-settings') {
           setMainReady(true);
-          setUserSettings(pmessage.settings);
+          setUserSettings({
+            ...userSettings,
+            ...pmessage.settings
+          });
 
           socket.emit('set user', pmessage.settings);
         }