From 257c435e20cf5b4c519a49fbf845cca95b23cc60 Mon Sep 17 00:00:00 2001
From: Julian Steinwachs <julian.steinwachs@fau.de>
Date: Sun, 16 Aug 2015 16:35:24 +0200
Subject: [PATCH] reply and retwist button in conversation and hastag fixes

---
 build/app-bundle.js       | 6 +++---
 jsx/other/Conversation.js | 4 ++--
 jsx/other/Hashtag.js      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/app-bundle.js b/build/app-bundle.js
index ceac6ba..dcfe45f 100755
--- a/build/app-bundle.js
+++ b/build/app-bundle.js
@@ -1564,7 +1564,7 @@ module.exports = Conversation = React.createClass({displayName: "Conversation",
     
     //alert("got event")
     
-    this.updatePosts(-1);
+    this.updatePosts(0);
     
   },
   render: function() {
@@ -1573,7 +1573,7 @@ module.exports = Conversation = React.createClass({displayName: "Conversation",
           React.createElement(ListGroupItem, null, 
             "Conversation"
           ), 
-        data: this.state.data, loading: this.state.loading})
+        data: this.state.data, loading: this.state.loading, activeAccount: this.props.activeAccount})
         );
   }
 });
@@ -1654,7 +1654,7 @@ module.exports = Hashtag = React.createClass({displayName: "Hashtag",
           React.createElement(ListGroupItem, null, 
             "Hashtag"
           ), 
-        data: this.state.data, loading: this.state.loading})
+        data: this.state.data, loading: this.state.loading, activeAccount: this.props.activeAccount})
         );
   }
 });
diff --git a/jsx/other/Conversation.js b/jsx/other/Conversation.js
index c223dc0..aebeeac 100755
--- a/jsx/other/Conversation.js
+++ b/jsx/other/Conversation.js
@@ -87,7 +87,7 @@ module.exports = Conversation = React.createClass({
     
     //alert("got event")
     
-    this.updatePosts(-1);
+    this.updatePosts(0);
     
   },
   render: function() {
@@ -96,7 +96,7 @@ module.exports = Conversation = React.createClass({
           <ListGroupItem>
             Conversation
           </ListGroupItem>
-        } data={this.state.data} loading={this.state.loading}/>
+        } data={this.state.data} loading={this.state.loading} activeAccount={this.props.activeAccount}/>
         );
   }
 });
\ No newline at end of file
diff --git a/jsx/other/Hashtag.js b/jsx/other/Hashtag.js
index be4fbdb..8e92470 100644
--- a/jsx/other/Hashtag.js
+++ b/jsx/other/Hashtag.js
@@ -74,7 +74,7 @@ module.exports = Hashtag = React.createClass({
           <ListGroupItem>
             Hashtag
           </ListGroupItem>
-        } data={this.state.data} loading={this.state.loading}/>
+        } data={this.state.data} loading={this.state.loading} activeAccount={this.props.activeAccount}/>
         );
   }
 });
\ No newline at end of file