Edited zen

bodyno · bodyno · commit f787b0c13d29 · 2016-08-02T23:35:11.000+08:00
diff --git a/src/routes/Zen/components/Zen.js b/src/routes/Zen/components/Zen.js
@@ -15,20 +15,21 @@ export default class Zen extends Component {
   }
 
   render () {
-    const props = this.props
+    const { fetchZen, clearZen, zen } = this.props
+    const { fetching, text } = zen
 
     return (
       <div>
         <div>
-          <button className='btn btn-default' onClick={props.fetchZen}>
-            {props.zen.fetching ? 'Fetching...' : 'Fetch'}
+          <button className='btn btn-default' onClick={fetchZen}>
+            {fetching ? 'Fetching...' : 'Fetch'}
           </button>
           &nbsp;&nbsp;
-          <button className='btn btn-default' onClick={props.clearZen}>Clear</button>
+          <button className='btn btn-default' onClick={clearZen}>Clear</button>
         </div>
         {this.renderLoading()}
         <div>
-          {props.zen.text.map(child)}
+          {text.map(child)}
         </div>
       </div>
     )
diff --git a/src/routes/Zen/modules/zen.js b/src/routes/Zen/modules/zen.js
@@ -33,15 +33,9 @@ export function fetchZen () {
     if (getState().zen.fetching) return
 
     dispatch(requestZen())
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        resolve()
-      }, 1000)
-    }).then(() => {
-      fetch('https://api.github.com/zen')
-        .then(data => data.text())
-        .then(text => dispatch(receiveZen(text)))
-    })
+    return fetch('https://api.github.com/zen')
+      .then(data => data.text())
+      .then(text => dispatch(receiveZen(text)))
   }
 }
 
