refactor

TrustyFund · Apr 4, 2018 · 6aaa4f3 · 6aaa4f3
1 parent f76e5ce
commit 6aaa4f3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/src/actions/transactions.js b/src/actions/transactions.js
@@ -83,13 +83,20 @@ export const removePendingDistribution = (store) => {
   commit(types.REMOVE_PENDING_DISTRIBUTION);
 };
 
+
+export const handleOrdersError = (store) => {
+  const { commit } = store;
+  commit(types.PROCESS_PENDING_ORDERS_ERROR);
+  createOrdersFromDistribution(store);
+};
+
+
 export const processPendingOrders = async (store) => {
   const { getters, commit, rootGetters } = store;
   commit(types.PROCESS_PENDING_ORDERS_REQUEST);
   const keys = rootGetters['account/getKeys'];
   if (!keys) {
-    commit(types.PROCESS_PENDING_ORDERS_ERROR);
-    createOrdersFromDistribution(store);
+    handleOrdersError(store);
     return {
       success: false,
       error: 'Account is locked'
@@ -101,8 +108,7 @@ export const processPendingOrders = async (store) => {
       orders: pendingOrders.sellOrders,
       keys });
     if (!sellResult.success) {
-      commit(types.PROCESS_PENDING_ORDERS_ERROR);
-      createOrdersFromDistribution(store);
+      handleOrdersError(store);
       return {
         success: false,
         error: sellResult.error
@@ -117,8 +123,7 @@ export const processPendingOrders = async (store) => {
     });
     console.log(buyResult);
     if (!buyResult.success) {
-      commit(types.PROCESS_PENDING_ORDERS_ERROR);
-      createOrdersFromDistribution(store);
+      handleOrdersError(store);
       return {
         success: false,
         error: buyResult.error

diff --git a/src/modules/transactions.js b/src/modules/transactions.js
@@ -5,7 +5,10 @@ import * as actions from '../actions/transactions';
 
 const initialState = {
   pendingDistributionUpdate: null,
-  pendingOrders: {},
+  pendingOrders: {
+    sellOrders: [],
+    buyOrders: []
+  },
   pendingTransfer: false,
   pending: false,
   error: null,
@@ -24,7 +27,8 @@ const initialState = {
 
 const getters = {
   getPendingOrders: state => state.pendingOrders,
-  hasPendingOrders: state => state.pendingOrders.sellOrders || state.pendingOrders.buyOrders,
+  hasPendingOrders: state => state.pendingOrders.sellOrders.length
+    || state.pendingOrders.buyOrders.length,
   getPendingDistribution: state => state.pendingDistributionUpdate,
   hasPendingTransfer: state => state.pendingTransfer !== false,
   areTransactionsProcessing: state => state.transactionsProcessing,
@@ -61,7 +65,8 @@ const mutations = {
   },
   [types.REMOVE_PENDING_DISTRIBUTION](state) {
     state.pendingDistributionUpdate = null;
-    state.pendingOrders = {};
+    state.pendingOrders.sellOrders = [];
+    state.pendingOrders.buyOrders = [];
     state.sellOrdersProcessed = false;
   },
   [types.PROCESS_PENDING_ORDERS_REQUEST](state) {