diff --git a/resources/assets/js/store/modules/invoice/actions.js b/resources/assets/js/store/modules/invoice/actions.js
index 4910fe63..47d4dd77 100644
--- a/resources/assets/js/store/modules/invoice/actions.js
+++ b/resources/assets/js/store/modules/invoice/actions.js
@@ -122,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/views/invoices/View.vue b/resources/assets/js/views/invoices/View.vue
index 4a7359fd..ee4db7b1 100644
--- a/resources/assets/js/views/invoices/View.vue
+++ b/resources/assets/js/views/invoices/View.vue
@@ -14,7 +14,6 @@
           >
             {{ $t('invoices.mark_as_sent') }}
           </base-button>
-      
         </div>
         <base-button
           v-if="invoice.status === 'DRAFT'"
@@ -24,8 +23,8 @@
           color="theme"
           @click="onSendInvoice"
         >
-        {{ $t('invoices.send_invoice') }}
-      </base-button>
+          {{ $t('invoices.send_invoice') }}
+        </base-button>
         <router-link v-if="invoice.status === 'SENT'" :to="`/admin/payments/${$route.params.id}/create`">
           <base-button
             color="theme"
@@ -147,7 +146,7 @@
   </div>
 </template>
 <script>
-import { mapActions } from 'vuex'
+import { mapActions, mapGetters } from 'vuex'
 const _ = require('lodash')
 export default {
   data () {
@@ -155,9 +154,7 @@ export default {
       id: null,
       count: null,
       invoices: [],
-      invoice: null,
       currency: null,
-      shareableLink: null,
       searchData: {
         orderBy: null,
         orderByField: null,
@@ -170,26 +167,31 @@ export default {
     }
   },
   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()
+      this.invoice()
     }
   },
-  mounted () {
+  created () {
     this.loadInvoices()
     this.onSearched = _.debounce(this.onSearched, 500)
   },
   methods: {
     ...mapActions('invoice', [
       'fetchInvoices',
-      'fetchViewInvoice',
       'getRecord',
       'searchInvoice',
       'markAsSent',
@@ -202,7 +204,6 @@ export default {
       if (response.data) {
         this.invoices = response.data.invoices.data
       }
-      this.fetchInvoice()
     },
     async onSearched () {
       let data = ''
@@ -224,15 +225,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'
@@ -244,7 +236,7 @@ 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',
@@ -261,8 +253,8 @@ export default {
         }
       })
     },
-     async onSendInvoice () {
-       swal({
+    async onSendInvoice () {
+      swal({
         title: this.$tc('general.are_you_sure'),
         text: this.$tc('invoices.confirm_send_invoice'),
         icon: '/assets/icon/paper-plane-solid.svg',
@@ -272,7 +264,6 @@ export default {
         if (willSendInvoice) {
           this.isSendingEmail = true
           let response = await this.sendEmail({id: this.invoice.id})
-          this.fetchInvoice()
           this.isSendingEmail = false
           if (response.data) {
             window.toastr['success'](this.$tc('invoices.confirm_send_invoice'))