Fix pet showing on island

src/FocusApp.Client/Views/Controls/IslandDisplayView.cs

@@ -48,20 +48,20 @@ public Decor DisplayDecor
     #endregion
 
     /// <summary>When the parent appears, generate the content for this view. </summary>
-    public Action ParentLoading { get; set; }
+    public Action ParentAppearing { get; set; }
 
     enum Column {LeftWhiteSpace, PetAndDecor, RightWhiteSpace }
 
     /// <summary>
-    /// Attach the parent's appearing event to the <see cref="ParentLoading"/> event,
-    /// Attach the <see cref="ParentLoading"/> event to the <see cref="GenerateContent"/> method, and
+    /// Attach the parent's appearing event to the <see cref="ParentAppearing"/> event,
+    /// Attach the <see cref="ParentAppearing"/> event to the <see cref="GenerateContent"/> method, and
     /// generate the initial content.
     /// </summary>
     public IslandDisplayView(ContentPage parentPage)
     {
-        parentPage.Loaded += (_, _) => ParentLoading.Invoke();
+        parentPage.Appearing += (_, _) => ParentAppearing.Invoke();
 
-        ParentLoading += GenerateContent;
+        ParentAppearing += GenerateContent;
         GenerateContent();
     }
 

src/FocusApp.Client/Views/LoginPage.cs

@@ -208,7 +208,6 @@ private async void LoginPage_Loaded(object sender, EventArgs e)
         {
             // Only show the content downloading popup for getting the essential data
             await _popupService.ShowPopupAsync<SyncDataLoadingPopupInterface>();
-            Thread.Sleep(3000);
             try
             {
                 await _syncService.GatherEssentialDatabaseData();
@@ -223,8 +222,8 @@ await DisplayAlert(
 
             await _popupService.HidePopupAsync<SyncDataLoadingPopupInterface>();
 
+            await TryLoginFromStoredToken();
             _authenticationService.StartupSyncTask = Task.Run(_syncService.StartupSync);
-            _ = Task.Run(TryLoginFromStoredToken);
         });
     }
 
@@ -237,20 +236,18 @@ private async Task TryLoginFromStoredToken()
 
             if (result.IsSuccessful)
             {
+                await _popupService.HidePopupAsync<GenericLoadingPopupInterface>();
                 await MainThread.InvokeOnMainThreadAsync(async () => await Shell.Current.GoToAsync($"///" + nameof(TimerPage)));
+                return;
             }
-            else
-            {
-                _logger.LogInformation(result.Message);
-            }
+            await _popupService.HidePopupAsync<GenericLoadingPopupInterface>();
+
+            _logger.LogInformation(result.Message);
         }
         catch (Exception ex)
         {
             _logger.LogError(ex, "User was not found in database, or the user had no identity token in secure storage. Please manually log in as the user.");
         }
-
-        await _popupService.HidePopupAsync<GenericLoadingPopupInterface>();
     }
-
 }