feat(neuron-ui): adjust the order of dao records

nervosnetwork · Nov 12, 2019 · e8398b6 · e8398b6
1 parent 96b4ef6
commit e8398b6
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts b/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts
@@ -271,9 +271,17 @@ export const backupWallet = (params: Controller.BackupWalletParams) => (dispatch
 export const updateNervosDaoData = (walletID: Controller.GetNervosDaoDataParams) => (dispatch: StateDispatch) => {
   getNervosDaoData(walletID).then(res => {
     if (res.status === 1) {
+      const withdrawList = res.result
+        .filter((r: State.NervosDAORecord) => !r.depositOutPoint)
+        .sort((r1: State.NervosDAORecord, r2: State.NervosDAORecord) => +r2.timestamp - +r1.timestamp)
+
+      const claimList = res.result
+        .filter((r: State.NervosDAORecord) => r.depositOutPoint)
+        .sort((r1: State.NervosDAORecord, r2: State.NervosDAORecord) => +r2.timestamp - +r1.timestamp)
+
       dispatch({
         type: NeuronWalletActions.UpdateNervosDaoData,
-        payload: { records: res.result },
+        payload: { records: [...claimList, ...withdrawList] },
       })
     } else {
       addNotification(failureResToNotification(res))(dispatch)