Render selection inside areas

js/src/views/Dapps/AddDapps/AddDapps.css

@@ -18,3 +18,22 @@
 .description {
   margin-top: .5em !important;
 }
+
+.list {
+  .background {
+    background: rgba(255, 255, 255, 0.2);
+    margin: 0 -1.5em;
+    padding: 0.5em 1.5em;
+  }
+
+  .header {
+    text-transform: uppercase;
+  }
+
+  .byline {
+    font-size: 0.75em;
+    padding-top: 0.5em;
+    line-height: 1.5em;
+    opacity: 0.75;
+  }
+}

js/src/views/Dapps/AddDapps/AddDapps.js

@@ -51,13 +51,33 @@ export default class AddDapps extends Component {
         ] }
         visible
         scroll>
-        <List>
-          { store.sortedApps.map(this.renderApp) }
-        </List>
+        <div className={ styles.warning }>
+        </div>
+        { this.renderList(store.sortedLocal, 'Applications locally available', 'All applications installed locally on the machine by the user for access by the Parity client.') }
+        { this.renderList(store.sortedBuiltin, 'Applications bundled with Parity', 'Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.') }
+        { this.renderList(store.sortedNetwork, 'Applications on the global network', 'These applications are not affiliated with Parity nor are they published by Partity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each application before interacting.') }
       </Modal>
     );
   }
 
+  renderList (items, header, byline) {
+    if (!items || !items.length) {
+      return null;
+    }
+
+    return (
+      <div className={ styles.list }>
+        <div className={ styles.background }>
+          <div className={ styles.header }>{ header }</div>
+          <div className={ styles.byline }>{ byline }</div>
+        </div>
+        <List>
+          { items.map(this.renderApp) }
+        </List>
+      </div>
+    );
+  }
+
   renderApp = (app) => {
     const { store } = this.props;
     const isHidden = !store.displayApps[app.id].visible;

js/src/views/Dapps/dappsStore.js

@@ -33,7 +33,7 @@ export default class DappsStore {
   constructor (api) {
     this._api = api;
 
-    this._readDisplayApps();
+    this.readDisplayApps();
 
     Promise
       .all([
@@ -41,15 +41,23 @@ export default class DappsStore {
         this._fetchLocalApps(),
         this._fetchRegistryApps()
       ])
-      .then(this._writeDisplayApps);
+      .then(this.writeDisplayApps);
   }
 
-  @computed get sortedApps () {
-    return this.apps.sort((a, b) => a.name.localeCompare(b.name));
+  @computed get sortedBuiltin () {
+    return this.apps.filter((app) => app.type === 'builtin');
+  }
+
+  @computed get sortedLocal () {
+    return this.apps.filter((app) => app.type === 'local');
+  }
+
+  @computed get sortedNetwork () {
+    return this.apps.filter((app) => app.type === 'network');
   }
 
   @computed get visibleApps () {
-    return this.sortedApps.filter((app) => this.displayApps[app.id] && this.displayApps[app.id].visible);
+    return this.apps.filter((app) => this.displayApps[app.id] && this.displayApps[app.id].visible);
   }
 
   @action openModal = () => {
@@ -61,32 +69,37 @@ export default class DappsStore {
   }
 
   @action hideApp = (id) => {
-    const app = this.displayApps[id] || {};
-    app.visible = false;
-
-    this.displayApps[id] = app;
-    this._writeDisplayApps();
+    this.displayApps = Object.assign({}, this.displayApps, { [id]: { visible: false } });
+    this.writeDisplayApps();
   }
 
   @action showApp = (id) => {
-    const app = this.displayApps[id] || {};
-    app.visible = true;
-
-    this.displayApps[id] = app;
-    this._writeDisplayApps();
+    this.displayApps = Object.assign({}, this.displayApps, { [id]: { visible: true } });
+    this.writeDisplayApps();
   }
 
-  @action setDisplayApps = (apps) => {
-    this.displayApps = apps;
+  @action readDisplayApps = () => {
+    this.displayApps = store.get(LS_KEY_DISPLAY) || {};
   }
 
-  @action addApp = (app, visible) => {
+  @action writeDisplayApps = () => {
+    store.set(LS_KEY_DISPLAY, this.displayApps);
+  }
+
+  @action addApps = (apps) => {
     transaction(() => {
-      this.apps.push(app);
+      this.apps = this.apps
+        .concat(apps || [])
+        .sort((a, b) => a.name.localeCompare(b.name));
 
-      if (!this.displayApps[app.id]) {
-        this.displayApps[app.id] = { visible };
-      }
+      const visibility = {};
+      apps.forEach((app) => {
+        if (!this.displayApps[app.id]) {
+          visibility[app.id] = { visible: app.visible };
+        }
+      });
+
+      this.displayApps = Object.assign({}, this.displayApps, visibility);
     });
   }
 
@@ -102,13 +115,13 @@ export default class DappsStore {
     return Promise
       .all(builtinApps.map((app) => dappReg.getImage(app.id)))
       .then((imageIds) => {
-        transaction(() => {
-          builtinApps.forEach((app, index) => {
+        this.addApps(
+          builtinApps.map((app, index) => {
             app.type = 'builtin';
             app.image = hashToImageUrl(imageIds[index]);
-            this.addApp(app, app.visible);
-          });
-        });
+            return app;
+          })
+        );
       })
       .catch((error) => {
         console.warn('DappsStore:fetchBuiltinApps', error);
@@ -126,15 +139,12 @@ export default class DappsStore {
         return apps
           .map((app) => {
             app.type = 'local';
+            app.visible = true;
             return app;
           })
           .filter((app) => app.id && !['ui'].includes(app.id));
       })
-      .then((apps) => {
-        transaction(() => {
-          (apps || []).forEach((app) => this.addApp(app, true));
-        });
-      })
+      .then(this.addApps)
       .catch((error) => {
         console.warn('DappsStore:fetchLocal', error);
       });
@@ -175,7 +185,8 @@ export default class DappsStore {
                 image: hashToImageUrl(imageIds[index]),
                 contentHash: this._api.util.bytesToHex(contentIds[index]).substr(2),
                 manifestHash: this._api.util.bytesToHex(manifestIds[index]).substr(2),
-                type: 'network'
+                type: 'network',
+                visible: false
               };
 
               return app;
@@ -207,11 +218,7 @@ export default class DappsStore {
             });
           });
       })
-      .then((apps) => {
-        transaction(() => {
-          (apps || []).forEach((app) => this.addApp(app, false));
-        });
-      })
+      .then(this.addApps)
       .catch((error) => {
         console.warn('DappsStore:fetchRegistry', error);
       });
@@ -229,12 +236,4 @@ export default class DappsStore {
         return null;
       });
   }
-
-  _readDisplayApps = () => {
-    this.setDisplayApps(store.get(LS_KEY_DISPLAY) || {});
-  }
-
-  _writeDisplayApps = () => {
-    store.set(LS_KEY_DISPLAY, this.displayApps);
-  }
 }