Surface errors in vault wizard summary pages

Author: d2dyno1

src/Platforms/SecureFolderFS.Maui/Views/Modals/Wizard/SummaryWizardPage.xaml

@@ -33,12 +33,14 @@
                     <RoundRectangle CornerRadius="24" />
                 </Border.StrokeShape>
                 <Grid>
+                    <!--  Success indicator  -->
                     <mi:MauiIcon
                         HorizontalOptions="Center"
                         Icon="{mi_material:Material Icon=Check,
                                                     IconSize=48}"
                         IconColor="{AppThemeBinding Light={StaticResource PrimaryLightColor},
                                                     Dark={StaticResource PrimaryDarkColor}}"
+                        IsVisible="{Binding ViewModel.IsError, Mode=OneWay, Converter={StaticResource BoolInvertConverter}}"
                         OnPlatforms="Android"
                         VerticalOptions="Center" />
                     <mi:MauiIcon
@@ -47,6 +49,27 @@
                                                       IconSize=48}"
                         IconColor="{AppThemeBinding Light={StaticResource PrimaryLightColor},
                                                     Dark={StaticResource PrimaryDarkColor}}"
+                        IsVisible="{Binding ViewModel.IsError, Mode=OneWay, Converter={StaticResource BoolInvertConverter}}"
+                        OnPlatforms="iOS"
+                        VerticalOptions="Center" />
+
+                    <!--  Error indicator  -->
+                    <mi:MauiIcon
+                        HorizontalOptions="Center"
+                        Icon="{mi_material:Material Icon=ErrorOutline,
+                                                    IconSize=48}"
+                        IconColor="{AppThemeBinding Light={StaticResource PrimaryLightColor},
+                                                    Dark={StaticResource PrimaryDarkColor}}"
+                        IsVisible="{Binding ViewModel.IsError, Mode=OneWay}"
+                        OnPlatforms="Android"
+                        VerticalOptions="Center" />
+                    <mi:MauiIcon
+                        HorizontalOptions="Center"
+                        Icon="{mi_cupertino:Cupertino Icon=ExclamationmarkCircle,
+                                                      IconSize=48}"
+                        IconColor="{AppThemeBinding Light={StaticResource PrimaryLightColor},
+                                                    Dark={StaticResource PrimaryDarkColor}}"
+                        IsVisible="{Binding ViewModel.IsError, Mode=OneWay}"
                         OnPlatforms="iOS"
                         VerticalOptions="Center" />
                 </Grid>

src/Platforms/SecureFolderFS.Uno/Views/VaultWizard/SummaryWizardPage.xaml

@@ -22,18 +22,34 @@
             Orientation="Vertical"
             Spacing="8">
             <Grid Width="32" Height="32">
-                <Ellipse Margin="0,-4,0,2" Fill="LimeGreen" />
-                <not_win:FontIcon FontSize="18" Glyph="&#xE73E;" />
-                <win:AnimatedVisualPlayer
-                    x:Name="VisualPlayer"
-                    AutoPlay="False"
-                    Loaded="VisualPlayer_Loaded">
-                    <AnimatedVisualPlayer.Source>
-                        <animvis:AnimatedAcceptVisualSource x:Name="CheckVisualSource" />
-                    </AnimatedVisualPlayer.Source>
-                </win:AnimatedVisualPlayer>
+                <!--  Success indicator  -->
+                <Grid Visibility="{x:Bind ViewModel.IsError, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter=invert}">
+                    <Ellipse Margin="0,-4,0,2" Fill="LimeGreen" />
+                    <not_win:FontIcon FontSize="18" Glyph="&#xE73E;" />
+                    <win:AnimatedVisualPlayer
+                        x:Name="VisualPlayer"
+                        AutoPlay="False"
+                        Loaded="VisualPlayer_Loaded">
+                        <AnimatedVisualPlayer.Source>
+                            <animvis:AnimatedAcceptVisualSource x:Name="CheckVisualSource" />
+                        </AnimatedVisualPlayer.Source>
+                    </win:AnimatedVisualPlayer>
+                </Grid>
+
+                <!--  Error indicator  -->
+                <FontIcon
+                    FontSize="24"
+                    Foreground="{ThemeResource SystemFillColorCriticalBrush}"
+                    Glyph="&#xE7BA;"
+                    Visibility="{x:Bind ViewModel.IsError, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
             </Grid>
-            <TextBlock FontSize="20" Text="{x:Bind ViewModel.Message, Mode=OneWay}" />
+            <TextBlock
+                MaxWidth="400"
+                HorizontalAlignment="Center"
+                FontSize="20"
+                HorizontalTextAlignment="Center"
+                Text="{x:Bind ViewModel.Message, Mode=OneWay}"
+                TextWrapping="Wrap" />
         </StackPanel>
 
         <TextBlock

src/Sdk/SecureFolderFS.Sdk/ViewModels/Views/Wizard/SummaryWizardViewModel.cs

@@ -19,6 +19,7 @@ public sealed partial class SummaryWizardViewModel : OverlayViewModel, IStagingV
 
         [ObservableProperty] private string? _Message;
         [ObservableProperty] private string? _VaultName;
+        [ObservableProperty] private bool _IsError;
 
         public SummaryWizardViewModel(IVaultModel vaultModel, IVaultCollectionModel vaultCollectionModel)
         {
@@ -50,12 +51,13 @@ public override async void OnAppearing()
             // Add the newly created vault
             _vaultCollectionModel.Add(_vaultModel);
 
-            // Try to save the new vault
-            var result = await _vaultCollectionModel.TrySaveAsync();
-            _ = result; // TODO: Maybe use the result to indicate whether the save was successful or not
-
-            // Display result as message
-            Message = "VaultAdded".ToLocalized();
+            // Try to save the new vault and reflect the outcome to the user. A silent failure here would
+            // leave the vault absent after the next app restart, so it must be surfaced
+            var saved = await _vaultCollectionModel.TrySaveAsync();
+            IsError = !saved;
+            Message = saved
+                ? "VaultAdded".ToLocalized()
+                : "VaultAddedSaveFailed".ToLocalized();
         }
     }
 }

src/Shared/SecureFolderFS.Shared/Models/Result.Message.cs

@@ -20,6 +20,19 @@ public MessageResult(bool isSuccess, string? message = null)
         {
             Message = message;
         }
+
+        /// <summary>
+        /// Creates an instance of <see cref="IResultWithMessage"/> by combining the given base result and an additional message.
+        /// </summary>
+        /// <param name="baseResult">The base result, which contains the success state or an exception.</param>
+        /// <param name="message">The additional message to include in the result.</param>
+        /// <returns>A new instance of <see cref="IResultWithMessage"/> containing the provided base result and message.</returns>
+        public static IResultWithMessage WithMessage(IResult baseResult, string message)
+        {
+            return baseResult.Exception is not null
+                ? new MessageResult(baseResult.Exception, message)
+                : new MessageResult(baseResult.Successful, message);
+        }
     }
 
     /// <inheritdoc cref="IResultWithMessage{T}"/>