From 6d6e942d9d291161bfb69f512f2309447585f718 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Fri, 25 Nov 2016 16:46:57 +0100
Subject: [PATCH] Add dappreg link to apps list (#3568)

* Fix rendering when contract is empty

* Add registration dapp to app list
---
 js/src/dapps/dappreg/ButtonBar/buttonBar.js   |  4 ++--
 js/src/dapps/dappreg/Dapp/dapp.js             |  4 ++++
 js/src/dapps/dappreg/SelectDapp/selectDapp.js |  4 ++++
 js/src/dapps/dappreg/dappsStore.js            |  7 +++++--
 js/src/views/Dapps/builtin.json               | 10 ++++++++++
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/js/src/dapps/dappreg/ButtonBar/buttonBar.js b/js/src/dapps/dappreg/ButtonBar/buttonBar.js
index 289def0ea..074c527d0 100644
--- a/js/src/dapps/dappreg/ButtonBar/buttonBar.js
+++ b/js/src/dapps/dappreg/ButtonBar/buttonBar.js
@@ -50,12 +50,12 @@ export default class ButtonBar extends Component {
           key='delete'
           label='Delete'
           warning
-          disabled={ !this.dappsStore.currentApp.isOwner && !this.dappsStore.isContractOwner }
+          disabled={ !this.dappsStore.currentApp || (!this.dappsStore.currentApp.isOwner && !this.dappsStore.isContractOwner) }
           onClick={ this.onDeleteClick } />,
         <Button
           key='edit'
           label='Edit'
-          disabled={ !this.dappsStore.currentApp.isOwner }
+          disabled={ !this.dappsStore.currentApp || !this.dappsStore.currentApp.isOwner }
           onClick={ this.onEditClick } />,
         <Button
           key='new'
diff --git a/js/src/dapps/dappreg/Dapp/dapp.js b/js/src/dapps/dappreg/Dapp/dapp.js
index 31d889868..2e07f6ba0 100644
--- a/js/src/dapps/dappreg/Dapp/dapp.js
+++ b/js/src/dapps/dappreg/Dapp/dapp.js
@@ -33,6 +33,10 @@ export default class Dapp extends Component {
       ? this.dappsStore.wipApp
       : this.dappsStore.currentApp;
 
+    if (!app) {
+      return null;
+    }
+
     return (
       <div className={ styles.app }>
         { this.dappsStore.isNew ? this.renderOwnerSelect(app) : this.renderOwnerStatic(app) }
diff --git a/js/src/dapps/dappreg/SelectDapp/selectDapp.js b/js/src/dapps/dappreg/SelectDapp/selectDapp.js
index 458f5fbe2..8c0e846f3 100644
--- a/js/src/dapps/dappreg/SelectDapp/selectDapp.js
+++ b/js/src/dapps/dappreg/SelectDapp/selectDapp.js
@@ -36,6 +36,10 @@ export default class SelectDapp extends Component {
       );
     }
 
+    if (!this.dappsStore.currentApp) {
+      return null;
+    }
+
     let overlayImg = null;
     if (this.dappsStore.currentApp.imageHash) {
       overlayImg = (
diff --git a/js/src/dapps/dappreg/dappsStore.js b/js/src/dapps/dappreg/dappsStore.js
index 7072cb663..4baf7337c 100644
--- a/js/src/dapps/dappreg/dappsStore.js
+++ b/js/src/dapps/dappreg/dappsStore.js
@@ -136,7 +136,10 @@ export default class DappsStore {
         .sort((a, b) => a.name.localeCompare(b.name));
 
       this.apps = ownApps.concat(otherApps);
-      this.currentApp = this.apps[0];
+
+      if (this.apps.length) {
+        this.currentApp = this.apps[0];
+      }
     });
   }
 
@@ -328,7 +331,7 @@ export default class DappsStore {
       })
       .then(() => {
         this.sortApps();
-        this.setLoading(this.count === 0);
+        this.setLoading(false);
       })
       .catch((error) => {
         console.error('Store:loadDapps', error);
diff --git a/js/src/views/Dapps/builtin.json b/js/src/views/Dapps/builtin.json
index 414464315..1124c52fd 100644
--- a/js/src/views/Dapps/builtin.json
+++ b/js/src/views/Dapps/builtin.json
@@ -54,5 +54,15 @@
     "version": "1.0.0",
     "visible": true,
     "secure": true
+  },
+  {
+    "id": "0x7bbc4f1a27628781b96213e781a1b8eec6982c1db8fac739af6e4c5a55862c03",
+    "url": "dappreg",
+    "name": "Dapp Registration",
+    "description": "Enables the registration and content management of dapps on the network",
+    "author": "Parity Team <admin@ethcore.io>",
+    "version": "1.0.0",
+    "visible": false,
+    "secure": true
   }
 ]