diff --git a/auth-web/src/components/pay/eft/ShortNameAccountLink.vue b/auth-web/src/components/pay/eft/ShortNameAccountLink.vue
index 2490105a7..db7f91688 100644
--- a/auth-web/src/components/pay/eft/ShortNameAccountLink.vue
+++ b/auth-web/src/components/pay/eft/ShortNameAccountLink.vue
@@ -215,7 +215,7 @@
 </template>
 <script lang="ts">
 
-import { Ref, computed, defineComponent, reactive, ref, toRefs, watch } from '@vue/composition-api'
+import { Ref, computed, defineComponent, nextTick, reactive, ref, toRefs, watch } from '@vue/composition-api'
 import { ShortNameLinkStatus, ShortNamePaymentActions } from '@/util/constants'
 import { BaseVDataTable } from '@/components'
 import CommonUtils from '@/util/common-util'
@@ -223,7 +223,6 @@ import { DEFAULT_DATA_OPTIONS } from '@/components/datatable/resources'
 import ModalDialog from '@/components/auth/common/ModalDialog.vue'
 import PaymentService from '@/services/payment.services'
 import ShortNameLinkingDialog from '@/components/pay/eft/ShortNameLinkingDialog.vue'
-import { Vue } from 'vue-property-decorator'
 import _ from 'lodash'
 
 export default defineComponent({
@@ -310,7 +309,7 @@ export default defineComponent({
         result.statusCode === ShortNameLinkStatus.PENDING && result.amountOwing > 0
       )
 
-      await Vue.nextTick()
+      await nextTick()
       state.expanded = [...pending]
     }
 
diff --git a/auth-web/src/components/pay/eft/ShortNamePaymentHistory.vue b/auth-web/src/components/pay/eft/ShortNamePaymentHistory.vue
index 6e02dc6c8..12faa56b5 100644
--- a/auth-web/src/components/pay/eft/ShortNamePaymentHistory.vue
+++ b/auth-web/src/components/pay/eft/ShortNamePaymentHistory.vue
@@ -140,7 +140,7 @@
   </div>
 </template>
 <script lang="ts">
-import { Ref, defineComponent, reactive, ref, toRefs, watch } from '@vue/composition-api'
+import { Ref, defineComponent, nextTick, reactive, ref, toRefs, watch } from '@vue/composition-api'
 import {
   ShortNameHistoryType,
   ShortNameHistoryTypeDescription,
@@ -153,7 +153,6 @@ import { DEFAULT_DATA_OPTIONS } from '../../datatable/resources'
 import { EFTTransactionState } from '@/models/eft-transaction'
 import ModalDialog from '@/components/auth/common/ModalDialog.vue'
 import PaymentService from '@/services/payment.services'
-import { Vue } from 'vue-property-decorator'
 import _ from 'lodash'
 import moment from 'moment-timezone'
 
@@ -255,7 +254,7 @@ export default defineComponent({
     }
 
     async function scrollToTop () {
-      await Vue.nextTick()
+      await nextTick()
       if (historyTable.value) {
         const tableWrapper = historyTable.value.$el.querySelector('.v-data-table__wrapper')
         if (tableWrapper) {