Fix installed version, fallback for channel switch

flipperdevices · Jul 20, 2023 · 4b8c9a7 · 4b8c9a7
1 parent 20f6573
commit 4b8c9a7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/frontend/flipperzero-protobuf b/frontend/flipperzero-protobuf
diff --git a/frontend/src/components/InstalledApps.vue b/frontend/src/components/InstalledApps.vue
@@ -120,7 +120,7 @@
         <q-space />
 
         <div class="column items-end q-ml-md">
-          <span v-if="app.currentVersion.version" class="text-grey-7">Version:</span>
+          <span class="text-grey-7">Version:</span>
           <b>{{ app.currentVersion.version }}</b>
         </div>
         <div class="q-ml-md" style="width: 80px;">
@@ -166,7 +166,7 @@
         <q-space />
 
         <div class="column items-end q-ml-md">
-          <span class="text-grey-7">Version:</span>
+          <span v-if="app.installedVersion.version" class="text-grey-7">Version:</span>
           <b>{{ app.installedVersion.version }}</b>
         </div>
         <div class="q-ml-md" style="width: 80px;">

diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue
@@ -868,6 +868,16 @@ export default defineComponent({
       if (!process.env.PRODUCTION) {
         this.flags.catalogCanSwitchChannel = true
       }
+      // FIXME
+      if (location.host === 'lab.flipper.net') {
+        this.flags.catalogCanSwitchChannel = false
+      } else if (location.host === 'lab.flipp.dev') {
+        this.flags.catalogCanSwitchChannel = false
+        if (!localStorage.getItem('catalogChannel')) {
+          this.flags.catalogChannelProduction = false
+          this.toggleCatalogChannel()
+        }
+      }
       navigator.serial.addEventListener('disconnect', e => {
         this.autoReconnect()
       })

diff --git a/frontend/src/pages/Apps.vue b/frontend/src/pages/Apps.vue
@@ -829,7 +829,7 @@ export default defineComponent({
           const installed = this.installedApps.find(e => e.id === this.currentApp.id)
           if (installed) {
             this.currentApp.isInstalled = true
-            this.currentApp.installedVersion = { ...installed }
+            this.currentApp.installedVersion = installed.installedVersion
 
             this.currentApp.installedVersion.isOutdated = this.currentApp.currentVersion.id !== this.currentApp.installedVersion.id
           }
+0 −10		Changelog
+0 −2		application.options
+0 −13		application.proto
+0 −6		flipper.proto
+0 −8		gui.proto
+0 −3		property.options
+0 −13		property.proto