Merge branch 'main' into feature/merchant-keys-panel-146

static/js/index.js

@@ -12,6 +12,7 @@ window.app = Vue.createApp({
       activeChatCustomer: '',
       orderPubkey: null,
       showKeys: false,
+      stallCount: 0,
       importKeyDialog: {
         show: false,
         data: {
@@ -140,6 +141,7 @@ window.app = Vue.createApp({
       this.shippingZones = []
       this.activeChatCustomer = ''
       this.showKeys = false
+      this.stallCount = 0
     },
     createMerchant: async function (privateKey) {
       try {
@@ -404,7 +406,6 @@ window.app = Vue.createApp({
     },
     goToOrders: function (stallId) {
       this.selectedStallFilter = stallId
-      this.activeTab = 'orders'
     }
   },
   created: async function () {