From 019dbe963d9aef3cdd5e4d0d9a6dd00259cee608 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Thu, 1 Jun 2023 08:33:54 -0700
Subject: [PATCH 1/2] Properly set peer instead of peer_id on resource import
 task.

---
 .../plugins/device/assets/src/views/SelectContentPage/api.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/api.js b/kolibri/plugins/device/assets/src/views/SelectContentPage/api.js
index d845c0bfc70..e3a595c5649 100644
--- a/kolibri/plugins/device/assets/src/views/SelectContentPage/api.js
+++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/api.js
@@ -13,7 +13,7 @@ export function startImportTask(params) {
 
   if (importSource.type === 'peer' || importSource.type === 'studio') {
     if (importSource.id) {
-      taskParams.peer_id = importSource.id;
+      taskParams.peer = importSource.id;
     }
     taskParams.type = TaskTypes.REMOTECONTENTIMPORT;
   } else if (importSource.type === 'drive') {

From d5574ce80d72993b50237687395a806f95c3dba1 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Thu, 1 Jun 2023 08:50:41 -0700
Subject: [PATCH 2/2] Properly set immersive page title.

---
 .../src/views/AvailableChannelsPage/index.vue | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue b/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue
index 562ca4dbfec..89ecf7f7cb1 100644
--- a/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue
@@ -1,7 +1,7 @@
 <template>
 
   <ImmersivePage
-    :appBarTitle="toolbarTitle()"
+    :appBarTitle="toolbarTitle"
     :route="backRoute"
   >
     <KPageContainer class="device-container">
@@ -265,6 +265,19 @@
             return '';
         }
       },
+      toolbarTitle() {
+        switch (this.transferType) {
+          case TransferTypes.LOCALIMPORT:
+            return this.$tr('importFromDisk', { driveName: this.selectedDrive.name });
+          case TransferTypes.PEERIMPORT:
+            return this.$tr('importFromPeer', {
+              deviceName: this.selectedPeer.device_name || this.selectedPeer.nickname,
+              address: this.selectedPeer.base_url,
+            });
+          default:
+            return this.$tr('importFromKolibriStudio');
+        }
+      },
       channelsAreLoading() {
         return this.status === 'LOADING_CHANNELS_FROM_KOLIBRI_STUDIO';
       },
@@ -299,19 +312,6 @@
       }
     },
     methods: {
-      toolbarTitle(transferType) {
-        switch (transferType) {
-          case TransferTypes.LOCALIMPORT:
-            return this.$tr('importFromDisk', { driveName: this.selectedDrive.name });
-          case TransferTypes.PEERIMPORT:
-            return this.$tr('importFromPeer', {
-              deviceName: this.selectedPeer.device_name || this.selectedPeer.nickname,
-              address: this.selectedPeer.base_url,
-            });
-          default:
-            return this.$tr('importFromKolibriStudio');
-        }
-      },
       channelIsOnDevice(channel) {
         const match = this.installedChannelsWithResources.find(({ id }) => id === channel.id);
         return Boolean(match);