From 025d99e1e71dbaa98b4187d8c50614c4f0fd931d Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Mon, 11 Mar 2019 23:12:18 +0200
Subject: [PATCH] Fix topics and posts not loading bug, Add click listener for
 new posts in sidebar messages

---
 app/src/components/Post.js                    |  2 +-
 app/src/components/PostList.js                | 23 +++++++++++++----
 app/src/components/TopicList.js               | 25 ++++++++++++++-----
 .../TransactionsMonitorContainer.js           |  8 ++++++
 4 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/app/src/components/Post.js b/app/src/components/Post.js
index 559313f..37e0521 100644
--- a/app/src/components/Post.js
+++ b/app/src/components/Post.js
@@ -127,7 +127,7 @@ class Post extends Component {
                                                 primaryColor="#b2e8e6" secondaryColor="#00b5ad" >
                                                     <rect x="0" y="0" rx="3" ry="3" width="75" height="5.5" />
                                                 </ContentLoader>
-                                                : 'Subject:' + this.state.postSubject
+                                                : 'Subject: ' + this.state.postSubject
                                                 }
                                             </strong>
                                         </span>
diff --git a/app/src/components/PostList.js b/app/src/components/PostList.js
index 2ecc9aa..2742200 100644
--- a/app/src/components/PostList.js
+++ b/app/src/components/PostList.js
@@ -12,24 +12,37 @@ class PostList extends Component {
         super(props);
 
         this.getBlockchainData = this.getBlockchainData.bind(this);
-        this.dataKeys = [];
+
+        this.state = {
+            dataKeys: []
+        }
     }
 
     getBlockchainData(){
         if (this.props.drizzleStatus['initialized']){
+            let dataKeysShallowCopy = this.state.dataKeys.slice();
+            let fetchingNewData = false;
+
             this.props.postIDs.forEach( postID => {
-                if (!this.dataKeys[postID]) {
-                    this.dataKeys[postID] = drizzle.contracts[contract].methods[getPostMethod].cacheCall(postID);
+                if (!this.state.dataKeys[postID]) {
+                    dataKeysShallowCopy[postID] = drizzle.contracts[contract].methods[getPostMethod].cacheCall(postID);
+                    fetchingNewData = true;
                 }
             })
+
+            if (fetchingNewData){
+                this.setState({
+                    dataKeys: dataKeysShallowCopy
+                });
+            }
         }
     }
 
     render() {
         const posts = this.props.postIDs.map((postID, index) => {
             return (<Post
-                postData={(this.dataKeys[postID] && this.props.contracts[contract][getPostMethod][this.dataKeys[postID]])
-                    ? this.props.contracts[contract][getPostMethod][this.dataKeys[postID]]
+                postData={(this.state.dataKeys[postID] && this.props.contracts[contract][getPostMethod][this.state.dataKeys[postID]])
+                    ? this.props.contracts[contract][getPostMethod][this.state.dataKeys[postID]]
                     : null}
                 avatarUrl={""}
                 postIndex={index}
diff --git a/app/src/components/TopicList.js b/app/src/components/TopicList.js
index 0ec3801..e5e2ba3 100644
--- a/app/src/components/TopicList.js
+++ b/app/src/components/TopicList.js
@@ -12,24 +12,37 @@ class TopicList extends Component {
         super(props);
 
         this.getBlockchainData = this.getBlockchainData.bind(this);
-        this.dataKeys = [];
+
+        this.state = {
+            dataKeys: []
+        }
     }
 
     getBlockchainData(){
         if (this.props.drizzleStatus['initialized']){
+            let dataKeysShallowCopy = this.state.dataKeys.slice();
+            let fetchingNewData = false;
+
             this.props.topicIDs.forEach( topicID => {
-                if (!this.dataKeys[topicID]) {
-                    this.dataKeys[topicID] = drizzle.contracts[contract].methods[getTopicMethod].cacheCall(topicID);
+                if (!this.state.dataKeys[topicID]) {
+                    dataKeysShallowCopy[topicID] = drizzle.contracts[contract].methods[getTopicMethod].cacheCall(topicID);
+                    fetchingNewData = true;
                 }
             })
+
+            if (fetchingNewData){
+                this.setState({
+                    dataKeys: dataKeysShallowCopy
+                });
+            }
         }
     }
 
     render() {
-        const topics = this.props.topicIDs.map((topicID) => {
+        const topics = this.props.topicIDs.map( topicID => {
             return (<Topic
-                topicData={(this.dataKeys[topicID] && this.props.contracts[contract][getTopicMethod][this.dataKeys[topicID]])
-                    ? this.props.contracts[contract][getTopicMethod][this.dataKeys[topicID]]
+                topicData={(this.state.dataKeys[topicID] && this.props.contracts[contract][getTopicMethod][this.state.dataKeys[topicID]])
+                    ? this.props.contracts[contract][getTopicMethod][this.state.dataKeys[topicID]]
                     : null}
                 topicID={topicID}
                 key={topicID} />)
diff --git a/app/src/containers/TransactionsMonitorContainer.js b/app/src/containers/TransactionsMonitorContainer.js
index f8152f8..c4ce717 100644
--- a/app/src/containers/TransactionsMonitorContainer.js
+++ b/app/src/containers/TransactionsMonitorContainer.js
@@ -39,6 +39,14 @@ class RightSideBar extends Component {
                             );
                             this.handleMessageDismiss(null, index);
                             break;
+                        case 'PostCreated':
+                            this.props.history.push("/topic/" +
+                                this.props.transactions[transactionHash].receipt.events.PostCreated.returnValues.topicID +
+                                "/" +
+                                this.props.transactions[transactionHash].receipt.events.PostCreated.returnValues.postID
+                            );
+                            this.handleMessageDismiss(null, index);
+                            break;
                         default:
                             this.handleMessageDismiss(null, index);
                             break;