both bugs fixed. it's reactive and no more conflicting cards

1 files changed, 8 insertions, 4 deletions

diff --git a/src/components/status/status.js b/src/components/status/status.js
index fcdc6f61..2b5bcb55 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -38,19 +38,23 @@ const Status = {
     },
     repeaterClass () {
       const user = this.statusoid.user
-      return highlightClass(user, this.$store)
+      return highlightClass(user)
     },
     userClass () {
       const user = this.retweet ? (this.statusoid.retweeted_status.user) : this.statusoid.user
-      return highlightClass(user, this.$store)
+      return highlightClass(user)
     },
     repeaterStyle () {
       const user = this.statusoid.user
-      return highlightStyle(user, this.$store)
+      const highlight = this.$store.state.config.highlight
+      const color = highlight[user.screen_name]
+      return highlightStyle(color)
     },
     userStyle () {
       const user = this.retweet ? (this.statusoid.retweeted_status.user) : this.statusoid.user
-      return highlightStyle(user, this.$store)
+      const highlight = this.$store.state.config.highlight
+      const color = highlight[user.screen_name]
+      return highlightStyle(color)
     },
     hideAttachments () {
       return (this.$store.state.config.hideAttachments && !this.inConversation) ||