diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index 4dea2c36..9bfffbaa 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -260,6 +260,8 @@ export default {
     created_message: 'Estimate created successfully',
     updated_message: 'Estimate updated successfully',
     deleted_message: 'Estimate deleted successfully | Estimates deleted successfully',
+    user_email_does_not_exist: 'User email does not exist',
+    something_went_wrong: 'something went wrong',
     item: {
       title: 'Item Title',
       description: 'Description',
@@ -349,6 +351,8 @@ export default {
     updated_message: 'Invoice updated successfully',
     deleted_message: 'Invoice deleted successfully | Invoices deleted successfully',
     marked_as_sent_message: 'Invoice marked as sent successfully',
+    user_email_does_not_exist: 'User email does not exist',
+    something_went_wrong: 'something went wrong',
     invalid_due_amount_message: 'Total Invoice amount cannot be less than total paid amount for this Invoice. Please update the invoice or delete the associated payments to continue.'
   },
   credit_notes: {
diff --git a/resources/assets/js/store/modules/dashboard/actions.js b/resources/assets/js/store/modules/dashboard/actions.js
index 83bac228..4bd4a691 100644
--- a/resources/assets/js/store/modules/dashboard/actions.js
+++ b/resources/assets/js/store/modules/dashboard/actions.js
@@ -23,108 +23,3 @@ export const getChart = ({ commit, dispatch, state }) => {
     })
   })
 }
-
-export const sendEmail = ({ commit, dispatch, state }, data) => {
-  return new Promise((resolve, reject) => {
-    window.axios.post(`/api/invoices/send`, data).then((response) => {
-      commit(types.UPDATE_INVOICE_STATUS, { id: data.id, status: 'SENT' })
-      resolve(response)
-    }).catch((err) => {
-      reject(err)
-    })
-  })
-}
-
-
-export const markAsSent = ({ commit, dispatch, state }, data) => {
-  return new Promise((resolve, reject) => {
-    window.axios.post(`/api/invoices/mark-as-sent`, data).then((response) => {
-      commit(types.UPDATE_INVOICE_STATUS, { id: data.id, status: 'SENT' })
-      resolve(response)
-    }).catch((err) => {
-      reject(err)
-    })
-  })
-}
-
-export const deleteInvoice = ({ commit, dispatch, state }, id) => {
-  return new Promise((resolve, reject) => {
-    window.axios.delete(`/api/invoices/${id}`).then((response) => {
-      if (response.data.error) {
-        resolve(response)
-      } else {
-        commit(types.DELETE_INVOICE, id)
-        resolve(response)
-      }
-    }).catch((err) => {
-      reject(err)
-    })
-  })
-}
-
-
-export const sendEstimateEmail = ({ commit, dispatch, state }, data) => {
-  return new Promise((resolve, reject) => {
-    window.axios.post(`/api/estimates/send`, data).then((response) => {
-      commit(types.UPDATE_ESTIMATE_STATUS, { id: data.id, status: 'SENT' })
-      resolve(response)
-    }).catch((err) => {
-      reject(err)
-    })
-  })
-}
-
-export const markAsAccepted = ({ commit, dispatch, state }, data) => {
-  return new Promise((resolve, reject) => {
-    window.axios.post(`/api/estimates/accept`, data).then((response) => {
-      commit(types.UPDATE_ESTIMATE_STATUS, { id: data.id, status: 'ACCEPTED' })
-      resolve(response)
-    }).catch((err) => {
-      reject(err)
-    })
-  })
-}
-
-export const markAsRejected = ({ commit, dispatch, state }, data) => {
-  return new Promise((resolve, reject) => {
-    window.axios.post(`/api/estimates/reject`, data).then((response) => {
-      commit(types.UPDATE_ESTIMATE_STATUS, { id: data.id, status: 'REJECTED' })
-      resolve(response)
-    }).catch((err) => {
-      reject(err)
-    })
-  })
-}
-
-export const markEstimateAsSent = ({ commit, dispatch, state }, data) => {
-  return new Promise((resolve, reject) => {
-    window.axios.post(`/api/estimates/mark-as-sent`, data).then((response) => {
-      commit(types.UPDATE_ESTIMATE_STATUS, { id: data.id, status: 'SENT' })
-      resolve(response)
-    }).catch((err) => {
-      reject(err)
-    })
-  })
-}
-
-export const convertToInvoice = ({ commit, dispatch, state }, id) => {
-  return new Promise((resolve, reject) => {
-    window.axios.post(`/api/estimates/${id}/convert-to-invoice`).then((response) => {
-      // commit(types.UPDATE_INVOICE, response.data)
-      resolve(response)
-    }).catch((err) => {
-      reject(err)
-    })
-  })
-}
-
-export const deleteEstimate = ({ commit, dispatch, state }, id) => {
-  return new Promise((resolve, reject) => {
-    window.axios.delete(`/api/estimates/${id}`).then((response) => {
-      commit(types.DELETE_ESTIMATE, id)
-      resolve(response)
-    }).catch((err) => {
-      reject(err)
-    })
-  })
-}
\ No newline at end of file
diff --git a/resources/assets/js/store/modules/dashboard/mutations.js b/resources/assets/js/store/modules/dashboard/mutations.js
index 64271f42..f1a29974 100644
--- a/resources/assets/js/store/modules/dashboard/mutations.js
+++ b/resources/assets/js/store/modules/dashboard/mutations.js
@@ -1,7 +1,7 @@
 import * as types from './mutation-types'
 
 export default {
-  [types.SET_INITIAL_DATA](state, data) {
+  [types.SET_INITIAL_DATA] (state, data) {
     state.contacts = data.customersCount
     state.invoices = data.invoicesCount
     state.estimates = data.estimatesCount
@@ -30,29 +30,33 @@ export default {
     state.netProfit = data.netProfit
   },
 
-  [types.GET_INITIAL_DATA](state, data) {
+  [types.GET_INITIAL_DATA] (state, data) {
     state.isDataLoaded = data
   },
 
-  [types.UPDATE_INVOICE_STATUS](state, data) {
+  [types.UPDATE_INVOICE_STATUS] (state, data) {
     let pos = state.dueInvoices.findIndex(invoice => invoice.id === data.id)
 
-    state.dueInvoices[pos].status = data.status
+    if (state.dueInvoices[pos]) {
+      state.dueInvoices[pos].status = data.status
+    }
   },
 
-  [types.DELETE_INVOICE](state, id) {
+  [types.DELETE_INVOICE] (state, id) {
     let index = state.dueInvoices.findIndex(invoice => invoice.id === id)
     state.dueInvoices.splice(index, 1)
   },
 
-  [types.DELETE_ESTIMATE](state, id) {
+  [types.DELETE_ESTIMATE] (state, id) {
     let index = state.recentEstimates.findIndex(estimate => estimate.id === id)
     state.recentEstimates.splice(index, 1)
   },
 
-  [types.UPDATE_ESTIMATE_STATUS](state, data) {
+  [types.UPDATE_ESTIMATE_STATUS] (state, data) {
     let pos = state.recentEstimates.findIndex(estimate => estimate.id === data.id)
 
-    state.recentEstimates[pos].status = data.status
-  },
+    if (state.recentEstimates[pos]) {
+      state.recentEstimates[pos].status = data.status
+    }
+  }
 }
diff --git a/resources/assets/js/store/modules/estimate/actions.js b/resources/assets/js/store/modules/estimate/actions.js
index aa4975ad..c2396d5a 100644
--- a/resources/assets/js/store/modules/estimate/actions.js
+++ b/resources/assets/js/store/modules/estimate/actions.js
@@ -1,4 +1,5 @@
 import * as types from './mutation-types'
+import * as dashboardTypes from '../dashboard/mutation-types'
 
 export const fetchEstimates = ({ commit, dispatch, state }, params) => {
   return new Promise((resolve, reject) => {
@@ -56,7 +57,10 @@ export const fetchViewEstimate = ({ commit, dispatch, state }, id) => {
 export const sendEmail = ({ commit, dispatch, state }, data) => {
   return new Promise((resolve, reject) => {
     window.axios.post(`/api/estimates/send`, data).then((response) => {
-      commit(types.UPDATE_ESTIMATE_STATUS, {id: data.id, status: 'SENT'})
+      if (response.data.success) {
+        commit(types.UPDATE_ESTIMATE_STATUS, {id: data.id, status: 'SENT'})
+        commit('dashboard/' + dashboardTypes.UPDATE_ESTIMATE_STATUS, { id: data.id, status: 'SENT' }, { root: true })
+      }
       resolve(response)
     }).catch((err) => {
       reject(err)
@@ -80,6 +84,7 @@ export const deleteEstimate = ({ commit, dispatch, state }, id) => {
   return new Promise((resolve, reject) => {
     window.axios.delete(`/api/estimates/${id}`).then((response) => {
       commit(types.DELETE_ESTIMATE, id)
+      commit('dashboard/' + dashboardTypes.DELETE_ESTIMATE, id, { root: true })
       resolve(response)
     }).catch((err) => {
       reject(err)
@@ -112,6 +117,7 @@ export const updateEstimate = ({ commit, dispatch, state }, data) => {
 export const markAsAccepted = ({ commit, dispatch, state }, data) => {
   return new Promise((resolve, reject) => {
     window.axios.post(`/api/estimates/accept`, data).then((response) => {
+      commit('dashboard/' + dashboardTypes.UPDATE_ESTIMATE_STATUS, { id: data.id, status: 'ACCEPTED' }, { root: true })
       resolve(response)
     }).catch((err) => {
       reject(err)
@@ -122,6 +128,7 @@ export const markAsAccepted = ({ commit, dispatch, state }, data) => {
 export const markAsRejected = ({ commit, dispatch, state }, data) => {
   return new Promise((resolve, reject) => {
     window.axios.post(`/api/estimates/reject`, data).then((response) => {
+      commit('dashboard/' + dashboardTypes.UPDATE_ESTIMATE_STATUS, { id: data.id, status: 'REJECTED' }, { root: true })
       resolve(response)
     }).catch((err) => {
       reject(err)
@@ -133,6 +140,7 @@ export const markAsSent = ({ commit, dispatch, state }, data) => {
   return new Promise((resolve, reject) => {
     window.axios.post(`/api/estimates/mark-as-sent`, data).then((response) => {
       commit(types.UPDATE_ESTIMATE_STATUS, {id: data.id, status: 'SENT'})
+      commit('dashboard/' + dashboardTypes.UPDATE_ESTIMATE_STATUS, { id: data.id, status: 'SENT' }, { root: true })
       resolve(response)
     }).catch((err) => {
       reject(err)
diff --git a/resources/assets/js/store/modules/estimate/mutations.js b/resources/assets/js/store/modules/estimate/mutations.js
index 3cd372d8..dcf429ea 100644
--- a/resources/assets/js/store/modules/estimate/mutations.js
+++ b/resources/assets/js/store/modules/estimate/mutations.js
@@ -40,7 +40,9 @@ export default {
   [types.UPDATE_ESTIMATE_STATUS] (state, data) {
     let pos = state.estimates.findIndex(estimate => estimate.id === data.id)
 
-    state.estimates[pos].status = data.status
+    if (state.estimates[pos]) {
+      state.estimates[pos].status = data.status
+    }
   },
 
   [types.RESET_SELECTED_ESTIMATES] (state, data) {
diff --git a/resources/assets/js/store/modules/invoice/actions.js b/resources/assets/js/store/modules/invoice/actions.js
index 47d4dd77..65810582 100644
--- a/resources/assets/js/store/modules/invoice/actions.js
+++ b/resources/assets/js/store/modules/invoice/actions.js
@@ -1,5 +1,5 @@
 import * as types from './mutation-types'
-// import moment from 'moment'
+import * as dashboardTypes from '../dashboard/mutation-types'
 
 export const fetchInvoices = ({ commit, dispatch, state }, params) => {
   return new Promise((resolve, reject) => {
@@ -47,7 +47,10 @@ export const fetchViewInvoice = ({ commit, dispatch, state }, id) => {
 export const sendEmail = ({ commit, dispatch, state }, data) => {
   return new Promise((resolve, reject) => {
     window.axios.post(`/api/invoices/send`, data).then((response) => {
-      commit(types.UPDATE_INVOICE_STATUS, {id: data.id, status: 'SENT'})
+      if (response.data.success) {
+        commit(types.UPDATE_INVOICE_STATUS, {id: data.id, status: 'SENT'})
+        commit('dashboard/' + dashboardTypes.UPDATE_INVOICE_STATUS, {id: data.id, status: 'SENT'}, { root: true })
+      }
       resolve(response)
     }).catch((err) => {
       reject(err)
@@ -83,6 +86,7 @@ export const deleteInvoice = ({ commit, dispatch, state }, id) => {
         resolve(response)
       } else {
         commit(types.DELETE_INVOICE, id)
+        commit('dashboard/' + dashboardTypes.DELETE_INVOICE, id, { root: true })
         resolve(response)
       }
     }).catch((err) => {
@@ -123,6 +127,7 @@ export const markAsSent = ({ commit, dispatch, state }, data) => {
   return new Promise((resolve, reject) => {
     window.axios.post(`/api/invoices/mark-as-sent`, data).then((response) => {
       commit(types.UPDATE_INVOICE_STATUS, {id: data.id, status: 'SENT'})
+      commit('dashboard/' + dashboardTypes.UPDATE_INVOICE_STATUS, {id: data.id, status: 'SENT'}, { root: true })
       resolve(response)
     }).catch((err) => {
       reject(err)
diff --git a/resources/assets/js/store/modules/invoice/mutations.js b/resources/assets/js/store/modules/invoice/mutations.js
index f8a5cad2..40cdb2b4 100644
--- a/resources/assets/js/store/modules/invoice/mutations.js
+++ b/resources/assets/js/store/modules/invoice/mutations.js
@@ -31,7 +31,9 @@ export default {
   [types.UPDATE_INVOICE_STATUS] (state, data) {
     let pos = state.invoices.findIndex(invoice => invoice.id === data.id)
 
-    state.invoices[pos].status = data.status
+    if (state.invoices[pos]) {
+      state.invoices[pos].status = data.status
+    }
   },
 
   [types.RESET_SELECTED_INVOICES] (state, data) {
diff --git a/resources/assets/js/views/dashboard/Dashboard.vue b/resources/assets/js/views/dashboard/Dashboard.vue
index 24f1f261..caf7889c 100644
--- a/resources/assets/js/views/dashboard/Dashboard.vue
+++ b/resources/assets/js/views/dashboard/Dashboard.vue
@@ -404,17 +404,23 @@ export default {
   methods: {
     ...mapActions('dashboard', [
       'getChart',
-      'loadData',
+      'loadData'
+    ]),
+    ...mapActions('invoice', [
       'deleteInvoice',
       'sendEmail',
-      'markAsSent',
-      'sendEstimateEmail',
+      'markAsSent'
+    ]),
+    ...mapActions('estimate', [
       'deleteEstimate',
       'markAsAccepted',
       'markAsRejected',
-      'markEstimateAsSent',
       'convertToInvoice'
     ]),
+    ...mapActions('estimate', {
+      'sendEstimateEmail': 'sendEmail',
+      'markEstimateAsSent': 'markAsSent'
+    }),
 
     async loadChart () {
       await this.$store.dispatch('dashboard/getChart')
@@ -532,9 +538,15 @@ export default {
           }
           let response = await this.sendEmail(data)
           this.refreshInvTable()
-          if (response.data) {
+          if (response.data.success) {
             window.toastr['success'](this.$tc('invoices.send_invoice_successfully'))
+            return true
           }
+          if (response.data.error === 'user_email_does_not_exist') {
+            window.toastr['error'](this.$tc('invoices.user_email_does_not_exist'))
+            return false
+          }
+          window.toastr['error'](this.$tc('invoices.something_went_wrong'))
         }
       })
     },
@@ -618,9 +630,15 @@ export default {
           }
           let response = await this.sendEstimateEmail(data)
           this.refreshEstTable()
-          if (response.data) {
+          if (response.data.success) {
             window.toastr['success'](this.$tc('estimates.send_estimate_successfully'))
+            return true
           }
+          if (response.data.error === 'user_email_does_not_exist') {
+            window.toastr['success'](this.$tc('estimates.user_email_does_not_exist'))
+            return true
+          }
+          window.toastr['error'](this.$tc('estimates.something_went_wrong'))
         }
       })
     }
diff --git a/resources/assets/js/views/estimates/Index.vue b/resources/assets/js/views/estimates/Index.vue
index 9b826daa..904cd3df 100644
--- a/resources/assets/js/views/estimates/Index.vue
+++ b/resources/assets/js/views/estimates/Index.vue
@@ -590,9 +590,15 @@ export default {
           }
           let response = await this.sendEmail(data)
           this.refreshTable()
-          if (response.data) {
+          if (response.data.success) {
             window.toastr['success'](this.$tc('estimates.send_estimate_successfully'))
+            return true
           }
+          if (response.data.error === 'user_email_does_not_exist') {
+            window.toastr['success'](this.$tc('estimates.user_email_does_not_exist'))
+            return true
+          }
+          window.toastr['error'](this.$tc('estimates.something_went_wrong'))
         }
       })
     }
diff --git a/resources/assets/js/views/estimates/View.vue b/resources/assets/js/views/estimates/View.vue
index 27204f39..9d74e0c5 100644
--- a/resources/assets/js/views/estimates/View.vue
+++ b/resources/assets/js/views/estimates/View.vue
@@ -260,9 +260,15 @@ export default {
           this.isSendingEmail = true
           let response = await this.sendEmail({id: this.estimate.id})
           this.isSendingEmail = false
-          if (response.data) {
+          if (response.data.success) {
             window.toastr['success'](this.$tc('estimates.send_estimate_successfully'))
+            return true
           }
+          if (response.data.error === 'user_email_does_not_exist') {
+            window.toastr['success'](this.$tc('estimates.user_email_does_not_exist'))
+            return true
+          }
+          window.toastr['error'](this.$tc('estimates.something_went_wrong'))
         }
       })
     },
diff --git a/resources/assets/js/views/invoices/Index.vue b/resources/assets/js/views/invoices/Index.vue
index 51db97bf..02074749 100644
--- a/resources/assets/js/views/invoices/Index.vue
+++ b/resources/assets/js/views/invoices/Index.vue
@@ -397,9 +397,15 @@ export default {
           }
           let response = await this.sendEmail(data)
           this.refreshTable()
-          if (response.data) {
+          if (response.data.success) {
             window.toastr['success'](this.$tc('invoices.send_invoice_successfully'))
+            return true
           }
+          if (response.data.error === 'user_email_does_not_exist') {
+            window.toastr['error'](this.$tc('invoices.user_email_does_not_exist'))
+            return false
+          }
+          window.toastr['error'](this.$tc('invoices.something_went_wrong'))
         }
       })
     },
@@ -505,6 +511,7 @@ export default {
 
           if (res.data.success) {
             window.toastr['success'](this.$tc('invoices.deleted_message'))
+            this.$refs.table.refresh()
             return true
           }
 
diff --git a/resources/assets/js/views/invoices/View.vue b/resources/assets/js/views/invoices/View.vue
index 8af1a71c..5643e2f4 100644
--- a/resources/assets/js/views/invoices/View.vue
+++ b/resources/assets/js/views/invoices/View.vue
@@ -260,9 +260,15 @@ export default {
           this.isSendingEmail = true
           let response = await this.sendEmail({id: this.invoice.id})
           this.isSendingEmail = false
-          if (response.data) {
-            window.toastr['success'](this.$tc('invoices.confirm_send_invoice'))
+          if (response.data.success) {
+            window.toastr['success'](this.$tc('invoices.send_invoice_successfully'))
+            return true
           }
+          if (response.data.error === 'user_email_does_not_exist') {
+            window.toastr['error'](this.$tc('invoices.user_email_does_not_exist'))
+            return false
+          }
+          window.toastr['error'](this.$tc('invoices.something_went_wrong'))
         }
       })
     },