fixes

web/repertory/lib/models/mount_list.dart

@@ -17,18 +17,20 @@ class MountList with ChangeNotifier {
       UnmodifiableListView<MountConfig>(_mountList);
 
   bool hasBucketName(String mountType, String bucket, {String? excludeName}) {
+    final list = items.where(
+      (item) => item.type.toLowerCase() == mountType.toLowerCase(),
+    );
+
     return (excludeName == null
-                ? items
-                : items.whereNot(
+                ? list
+                : list.whereNot(
                   (item) =>
                       item.name.toLowerCase() == excludeName.toLowerCase(),
                 ))
-            .firstWhereOrNull(
-              (item) =>
-                  item.type.toLowerCase() == mountType.toLowerCase() &&
-                  item.bucket != null &&
-                  item.bucket!.toLowerCase() == bucket.toLowerCase(),
-            ) !=
+            .firstWhereOrNull((MountConfig item) {
+              return item.bucket != null &&
+                  item.bucket!.toLowerCase() == bucket.toLowerCase();
+            }) !=
         null;
   }
 
@@ -89,6 +91,9 @@ class MountList with ChangeNotifier {
         ),
       );
 
+      _mountList = [];
+      notifyListeners();
+
       return _fetch();
     } catch (e) {
       debugPrint('$e');

web/repertory/lib/screens/add_mount_screen.dart

@@ -1,4 +1,3 @@
-import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
@@ -133,11 +132,8 @@ class _AddMountScreenState extends State<AddMountScreen> {
               Builder(
                 builder: (context) {
                   return ElevatedButton.icon(
-                    onPressed: () {
-                      final mountList = Provider.of<MountList>(
-                        context,
-                        listen: false,
-                      );
+                    onPressed: () async {
+                      final mountList = Provider.of<MountList>(context);
 
                       List<String> failed = [];
                       if (!validateSettings(_settings[_mountType]!, failed)) {
@@ -183,12 +179,15 @@ class _AddMountScreenState extends State<AddMountScreen> {
                         }
                       }
 
-                      mountList.add(
+                      await mountList.add(
                         _mountType,
                         _mountNameController.text,
                         _settings[_mountType]!,
                       );
 
+                      if (!context.mounted) {
+                        return;
+                      }
                       Navigator.pop(context);
                     },
                     label: const Text('Add'),
@@ -207,12 +206,9 @@ class _AddMountScreenState extends State<AddMountScreen> {
       final changed = _mountType != mountType;
 
       _mountType = mountType;
-      _mountNameController.text =
-          (mountType == 'Sia' && changed)
-              ? 'default'
-              : changed
-              ? ''
-              : _mountNameController.text;
+      if (changed) {
+        _mountNameController.text = mountType == 'Sia' ? 'default' : '';
+      }
 
       _mount =
           (_mountNameController.text.isEmpty)

web/repertory/lib/widgets/mount_settings.dart

@@ -604,7 +604,7 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
                           listen: false,
                         ).hasBucketName(
                           widget.mount.type,
-                          subValue,
+                          value,
                           excludeName: widget.mount.name,
                         ),
                   ],
@@ -862,7 +862,7 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
                       listen: false,
                     ).hasBucketName(
                       widget.mount.type,
-                      subValue,
+                      value,
                       excludeName: widget.mount.name,
                     ),
               ],