Merge pull request #1107 from Keith-CY/fix-withdraw-apc

fix(neuron): use deposit timestamp to calculate phase2 dao cell apc
nervosnetwork · Nov 14, 2019 · b5d4b35 · b5d4b35
2 parents e8ac6fb + abdab3f
commit b5d4b35
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
@@ -19,6 +19,7 @@ const DAORecord = ({
   actionLabel,
   onClick,
   timestamp,
+  depositTimestamp,
   depositOutPoint,
   epoch,
   withdraw,
@@ -142,7 +143,13 @@ const DAORecord = ({
         </div>
       </div>
       <div className={styles.secondaryInfo}>
-        <span>{`APC: ~${calculateAPC(compensation.toString(), capacity, `${Date.now() - +timestamp}`)}%`}</span>
+        <span>
+          {`APC: ~${calculateAPC(
+            compensation.toString(),
+            capacity,
+            `${Date.now() - +(depositTimestamp || timestamp)}`
+          )}%`}
+        </span>
         <span>{uniformTimeFormatter(+timestamp)}</span>
         <span>{metaInfo}</span>
       </div>

diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
@@ -177,6 +177,7 @@ declare namespace State {
     typeHash: string | null
     daoData: string
     timestamp: string
+    depositTimestamp?: string
   }
 
   interface NervosDAO {