diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index 92db8d63..1ac1b5d7 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -310,6 +310,7 @@ export default {
     invoice_template: 'Invoice Template',
     template: 'Template',
     mark_as_sent: 'Mark as sent',
+    confirm_send_invoice: 'This invoice will be sent via email to the customer',
     invoice_mark_as_sent: 'This invoice will be marked as sent',
     confirm_send: 'This invoice will be sent via email to the customer',
     invoice_date: 'Invoice Date',
diff --git a/resources/assets/js/store/modules/invoice/actions.js b/resources/assets/js/store/modules/invoice/actions.js
index 64d167a0..47d4dd77 100644
--- a/resources/assets/js/store/modules/invoice/actions.js
+++ b/resources/assets/js/store/modules/invoice/actions.js
@@ -47,6 +47,7 @@ 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'})
       resolve(response)
     }).catch((err) => {
       reject(err)
@@ -121,7 +122,7 @@ export const updateInvoice = ({ commit, dispatch, state }, data) => {
 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, response.data)
+      commit(types.UPDATE_INVOICE_STATUS, {id: data.id, status: 'SENT'})
       resolve(response)
     }).catch((err) => {
       reject(err)
diff --git a/resources/assets/js/store/modules/invoice/getters.js b/resources/assets/js/store/modules/invoice/getters.js
index 2e57c1de..fa2b598e 100644
--- a/resources/assets/js/store/modules/invoice/getters.js
+++ b/resources/assets/js/store/modules/invoice/getters.js
@@ -4,3 +4,7 @@ export const getTemplateId = (state) => state.invoiceTemplateId
 export const selectedInvoices = (state) => state.selectedInvoices
 export const totalInvoices = (state) => state.totalInvoices
 export const selectedCustomer = (state) => state.selectedCustomer
+export const getInvoice = (state) => (id) => {
+  let invId = parseInt(id)
+  return state.invoices.find(invoice => invoice.id === invId)
+}
diff --git a/resources/assets/js/store/modules/invoice/mutation-types.js b/resources/assets/js/store/modules/invoice/mutation-types.js
index 9c7553dd..c92a4755 100644
--- a/resources/assets/js/store/modules/invoice/mutation-types.js
+++ b/resources/assets/js/store/modules/invoice/mutation-types.js
@@ -14,3 +14,4 @@ export const SELECT_CUSTOMER = 'SELECT_CUSTOMER'
 export const RESET_SELECTED_CUSTOMER = 'RESET_SELECTED_CUSTOMER'
 export const SET_SELECT_ALL_STATE = 'SET_SELECT_ALL_STATE'
 export const RESET_SELECTED_INVOICES = 'RESET_SELECTED_INVOICES'
+export const UPDATE_INVOICE_STATUS = 'UPDATE_INVOICE_STATUS'
diff --git a/resources/assets/js/store/modules/invoice/mutations.js b/resources/assets/js/store/modules/invoice/mutations.js
index b765f045..f8a5cad2 100644
--- a/resources/assets/js/store/modules/invoice/mutations.js
+++ b/resources/assets/js/store/modules/invoice/mutations.js
@@ -28,6 +28,12 @@ export default {
     state.invoices[pos] = data.invoice
   },
 
+  [types.UPDATE_INVOICE_STATUS] (state, data) {
+    let pos = state.invoices.findIndex(invoice => invoice.id === data.id)
+
+    state.invoices[pos].status = data.status
+  },
+
   [types.RESET_SELECTED_INVOICES] (state, data) {
     state.selectedInvoices = []
     state.selectAllField = false
diff --git a/resources/assets/js/views/invoices/View.vue b/resources/assets/js/views/invoices/View.vue
index f79052ef..05ccdc48 100644
--- a/resources/assets/js/views/invoices/View.vue
+++ b/resources/assets/js/views/invoices/View.vue
@@ -5,8 +5,9 @@
       <div class="page-actions row">
         <div class="col-xs-2 mr-3">
           <base-button
-            :loading="isRequestOnGoing"
-            :disabled="isRequestOnGoing"
+            v-if="invoice.status === 'DRAFT'"
+            :loading="isMarkingAsSent"
+            :disabled="isMarkingAsSent"
             :outline="true"
             color="theme"
             @click="onMarkAsSent"
@@ -14,7 +15,17 @@
             {{ $t('invoices.mark_as_sent') }}
           </base-button>
         </div>
-        <router-link :to="`/admin/payments/${$route.params.id}/create`">
+        <base-button
+          v-if="invoice.status === 'DRAFT'"
+          :loading="isSendingEmail"
+          :disabled="isSendingEmail"
+          :outline="true"
+          color="theme"
+          @click="onSendInvoice"
+        >
+          {{ $t('invoices.send_invoice') }}
+        </base-button>
+        <router-link v-if="invoice.status === 'SENT'" :to="`/admin/payments/${$route.params.id}/create`">
           <base-button
             color="theme"
           >
@@ -135,7 +146,7 @@
   </div>
 </template>
 <script>
-import { mapActions } from 'vuex'
+import { mapActions, mapGetters } from 'vuex'
 const _ = require('lodash')
 export default {
   data () {
@@ -143,42 +154,43 @@ export default {
       id: null,
       count: null,
       invoices: [],
-      invoice: null,
       currency: null,
-      shareableLink: null,
       searchData: {
         orderBy: null,
         orderByField: null,
         searchText: null
       },
       isRequestOnGoing: false,
-      isSearching: false
+      isSearching: false,
+      isSendingEmail: false,
+      isMarkingAsSent: false
     }
   },
   computed: {
+    invoice () {
+      return this.$store.getters['invoice/getInvoice'](this.$route.params.id)
+    },
     getOrderBy () {
       if (this.searchData.orderBy === 'asc' || this.searchData.orderBy == null) {
         return true
       }
       return false
+    },
+    shareableLink () {
+      return `/invoices/pdf/${this.invoice.unique_hash}`
     }
   },
-  watch: {
-    '$route.params.id' (val) {
-      this.fetchInvoice()
-    }
-  },
-  mounted () {
+  created () {
     this.loadInvoices()
     this.onSearched = _.debounce(this.onSearched, 500)
   },
   methods: {
     ...mapActions('invoice', [
       'fetchInvoices',
-      'fetchViewInvoice',
       'getRecord',
       'searchInvoice',
       'markAsSent',
+      'sendEmail',
       'deleteInvoice',
       'selectInvoice'
     ]),
@@ -187,7 +199,6 @@ export default {
       if (response.data) {
         this.invoices = response.data.invoices.data
       }
-      this.fetchInvoice()
     },
     async onSearched () {
       let data = ''
@@ -209,15 +220,6 @@ export default {
         this.invoices = response.data.invoices.data
       }
     },
-    async fetchInvoice () {
-      let invoice = await this.fetchViewInvoice(this.$route.params.id)
-
-      if (invoice.data) {
-        this.invoice = invoice.data.invoice
-        this.shareableLink = invoice.data.shareable_link
-        this.currency = invoice.data.invoice.user.currency
-      }
-    },
     sortData () {
       if (this.searchData.orderBy === 'asc') {
         this.searchData.orderBy = 'desc'
@@ -229,23 +231,41 @@ export default {
       return true
     },
     async onMarkAsSent () {
-       swal({
+      swal({
         title: this.$t('general.are_you_sure'),
         text: this.$t('invoices.invoice_mark_as_sent'),
         icon: '/assets/icon/check-circle-solid.svg',
         buttons: true,
         dangerMode: true
-      }).then(async (MarkAsSend_Invoice) => {
-        if (MarkAsSend_Invoice) {
-          this.isRequestOnGoing = true
+      }).then(async (willMarkAsSent) => {
+        if (willMarkAsSent) {
+          this.isMarkingAsSent = true
           let response = await this.markAsSent({id: this.invoice.id})
-          this.isRequestOnGoing = false
+          this.isMarkingAsSent = false
           if (response.data) {
             window.toastr['success'](this.$tc('invoices.marked_as_sent_message'))
           }
         }
       })
     },
+    async onSendInvoice () {
+      swal({
+        title: this.$tc('general.are_you_sure'),
+        text: this.$tc('invoices.confirm_send_invoice'),
+        icon: '/assets/icon/paper-plane-solid.svg',
+        buttons: true,
+        dangerMode: true
+      }).then(async (willSendInvoice) => {
+        if (willSendInvoice) {
+          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'))
+          }
+        }
+      })
+    },
     async removeInvoice (id) {
       this.selectInvoice([parseInt(id)])
       this.id = id