merge

Author: dOrgJelli

README.md

@@ -2,13 +2,29 @@
 
 > [Arc.react](https://github.com/daostack/arc.react) componentizes [DAOstack's Arc.js library](https://github.com/daostack/arc.js), enabling easier React application integration.
 
-Turn any React app into a DAO enabled dApp in just 1, 2, 3...
+**Turn any React app into a DAO enabled dApp in just:**
 
-1. `npm i --save @daostack/arc.react`
-2. `<Arc config={new ArcConfig("rinkeby")}>`
-3. `<DAO address="0xMY_DAO">`
+1...
 
-Enabling you to build custom interfaces for displaying and interacting with your DAO's members...
+```bash
+npm i --save @daostack/arc.react`
+```
+
+2...
+
+```html
+<Arc config={new ArcConfig("rinkeby")}>
+```
+
+3...
+
+```html
+<DAO address="0xMY_DAO"></DAO>
+```
+
+**Enabling you to build custom interfaces for displaying and interacting with your DAO's:**
+
+members...
 
 ```html
 <Members>
@@ -42,7 +58,7 @@ proposals...
 </Proposals>
 ```
 
-and any other entity [within the DAOstack protocol](./src/components).
+**and any other entity [within the DAOstack protocol](./src/components)!**
 
 ## Read The Docs
 

src/components/DAO.tsx

@@ -9,7 +9,7 @@ import {
 } from "../";
 import { CreateContextFeed } from "../runtime/ContextFeed";
 
-interface RequiredProps extends ComponentProps {
+interface RequiredProps extends ComponentProps<Entity, Data> {
   // Address of the DAO Avatar
   address: string;
 }

src/components/DAOs.tsx

@@ -43,6 +43,7 @@ class InferredDAOs extends ComponentList<InferredProps, Component> {
         key={`${entity.id}_${index}`}
         address={entity.id}
         config={config}
+        entity={entity}
       >
         {children}
       </Component>

src/components/Member.tsx

@@ -1,4 +1,5 @@
 import * as React from "react";
+import { Member as Entity, IMemberState as Data } from "@dorgtech/arc.js";
 import {
   Arc as Protocol,
   ArcConfig as ProtocolConfig,
@@ -9,9 +10,8 @@ import {
   ComponentProps,
 } from "../";
 import { CreateContextFeed } from "../runtime/ContextFeed";
-import { Member as Entity, IMemberState as Data } from "@dorgtech/arc.js";
 
-interface RequiredProps extends ComponentProps {
+interface RequiredProps extends ComponentProps<Entity, Data> {
   // Address of the member
   address: string;
   dao?: string | DAOEntity;

src/components/Members.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
 import { Observable } from "rxjs";
+import { IMemberQueryOptions as FilterOptions } from "@dorgtech/arc.js";
 import {
   Arc as Protocol,
   ArcConfig as ProtocolConfig,
@@ -14,7 +15,6 @@ import {
   ComponentListProps,
   createFilterFromScope,
 } from "../";
-import { IMemberQueryOptions as FilterOptions } from "@dorgtech/arc.js";
 import { CreateContextFeed } from "../runtime/ContextFeed";
 
 type Scopes = "DAO";
@@ -59,6 +59,7 @@ class InferredMembers extends ComponentList<InferredProps, Component> {
         address={entity.coreState!.address}
         dao={entity.coreState!.dao.entity}
         config={config}
+        entity={entity}
       >
         {children}
       </Component>

src/components/Queue.tsx

@@ -11,7 +11,7 @@ import {
 } from "../";
 import { CreateContextFeed } from "../runtime/ContextFeed";
 
-interface RequiredProps extends ComponentProps {
+interface RequiredProps extends ComponentProps<Entity, Data> {
   // Address of the Queue Avatar
   id: string;
   dao?: string | DAOEntity;

src/components/Queues.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
 import { Observable } from "rxjs";
+import { IQueueQueryOptions as FilterOptions } from "@dorgtech/arc.js";
 import {
   Arc as Protocol,
   ArcConfig as ProtocolConfig,
@@ -14,7 +15,6 @@ import {
   ComponentListProps,
   createFilterFromScope,
 } from "../";
-import { IQueueQueryOptions as FilterOptions } from "@dorgtech/arc.js";
 import { CreateContextFeed } from "../runtime/ContextFeed";
 
 type Scopes = "DAO";
@@ -57,6 +57,7 @@ class InferredQueues extends ComponentList<InferredProps, Component> {
         dao={dao}
         id={entity.id}
         config={config}
+        entity={entity}
       >
         {children}
       </Component>

src/components/Reputation.tsx

@@ -14,7 +14,7 @@ import {
 } from "../";
 import { CreateContextFeed } from "../runtime/ContextFeed";
 
-interface RequiredProps extends ComponentProps {
+interface RequiredProps extends ComponentProps<Entity, Data> {
   // Address of the Reputation Token
   address?: string;
 }

src/components/Reputations.tsx

@@ -1,5 +1,6 @@
 import * as React from "react";
 import { Observable } from "rxjs";
+import { IReputationQueryOptions as FilterOptions } from "@dorgtech/arc.js";
 import {
   Arc as Protocol,
   ArcConfig as ProtocolConfig,
@@ -11,8 +12,6 @@ import {
   ComponentListLogs,
   ComponentListProps,
 } from "../";
-
-import { IReputationQueryOptions as FilterOptions } from "@dorgtech/arc.js";
 import { CreateContextFeed } from "../runtime/ContextFeed";
 
 type RequiredProps = ComponentListProps<Entity, FilterOptions>;
@@ -44,6 +43,7 @@ class InferredReputations extends ComponentList<InferredProps, Component> {
         key={`${entity.id}_${index}`}
         address={entity.address}
         config={config}
+        entity={entity}
       >
         {children}
       </Component>

src/components/Reward.tsx

@@ -9,7 +9,7 @@ import {
   ComponentProps,
 } from "../";
 
-interface RequiredProps extends ComponentProps {
+interface RequiredProps extends ComponentProps<Entity, Data> {
   // Reward ID
   id: string;
 }