From 0b9ef27d04f388b86acad854ad118c870fead02a Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 7 Apr 2024 15:11:59 +0200
Subject: [PATCH] fix(migration): show correct message after starting a
 migration

Related to https://github.com/go-vikunja/vikunja/issues/238
---
 frontend/src/views/migrate/MigrationHandler.vue | 2 +-
 pkg/modules/migration/handler/listeners.go      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/migrate/MigrationHandler.vue b/frontend/src/views/migrate/MigrationHandler.vue
index 24b140da6..71bbb8701 100644
--- a/frontend/src/views/migrate/MigrationHandler.vue
+++ b/frontend/src/views/migrate/MigrationHandler.vue
@@ -3,7 +3,7 @@
 		<h1>{{ $t('migrate.titleService', {name: migrator.name}) }}</h1>
 		<p>{{ $t('migrate.descriptionDo') }}</p>
 
-		<template v-if="message === '' && lastMigrationStartedAt === null">
+		<template v-if="message === '' && lastMigrationStartedAt === null && !migrationJustStarted">
 			<template v-if="isMigrating === false">
 				<template v-if="migrator.isFileMigrator">
 					<p>{{ $t('migrate.importUpload', {name: migrator.name}) }}</p>
diff --git a/pkg/modules/migration/handler/listeners.go b/pkg/modules/migration/handler/listeners.go
index fa6d1dac0..e24c89ccb 100644
--- a/pkg/modules/migration/handler/listeners.go
+++ b/pkg/modules/migration/handler/listeners.go
@@ -51,7 +51,7 @@ func (s *MigrationListener) Handle(msg *message.Message) (err error) {
 	mstr := registeredMigrators[event.MigratorKind]
 	event.Migrator = mstr.MigrationStruct()
 
-	// unmarshaling again to make sure the migrator has the correct type now
+	// unmarshalling again to make sure the migrator has the correct type now
 	err = json.Unmarshal(msg.Payload, event)
 	if err != nil {
 		return