Merge branch 'cake-tech:dev' into dev

cw_core/lib/wallet_info.dart

@@ -452,7 +452,8 @@ class WalletInfo {
     await WalletInfoAddressInfo.deleteByWalletInfoId(internalId);
     final entries = addressInfos.entries.toList();
     for (final addressInfo in entries) {
-      for (final info in addressInfo.value) {
+      final infoList = addressInfo.value.toList();
+      for (final info in infoList) {
         await WalletInfoAddressInfo.insert(
           walletInfoId: internalId,
           mapKey: addressInfo.key,

lib/src/screens/settings/mweb_node_page.dart

@@ -28,31 +28,33 @@ class _MwebNodePageState extends State<MwebNodePage> {
 
   @override
   Widget build(BuildContext context) {
-    return ModalPageWrapper(
-        topBar: ModalTopBar(
-          title: S.current.litecoin_mweb_settings,
-          onLeadingPressed: Navigator.of(context).pop,
-          leadingIcon: Icon(Icons.arrow_back_ios_new)),
-        content: Container(
-          child: NewListSections(
-              controllers: {
-                widget.mwebSettingsViewModelBase.mwebNodeUri: _nodeUriController,
-              },
-              sections: {
-            'main': [
-              ListItemTextField(
-                keyValue: widget.mwebSettingsViewModelBase.mwebNodeUri,
-                label: S.current.node_address,
-                validator: NodePathValidator(),
-              ),
-            ]
-          }),
+    return SafeArea(
+      child: ModalPageWrapper(
+          topBar: ModalTopBar(
+            title: S.current.litecoin_mweb_settings,
+            onLeadingPressed: Navigator.of(context).pop,
+            leadingIcon: Icon(Icons.arrow_back_ios_new)),
+          content: Container(
+            child: NewListSections(
+                controllers: {
+                  widget.mwebSettingsViewModelBase.mwebNodeUri: _nodeUriController,
+                },
+                sections: {
+              'main': [
+                ListItemTextField(
+                  keyValue: widget.mwebSettingsViewModelBase.mwebNodeUri,
+                  label: S.current.node_address,
+                  validator: NodePathValidator(),
+                ),
+              ]
+            }),
+          ),
+          bottomContent: LoadingPrimaryButton(
+        onPressed: () => save(context),
+        text: S.of(context).save,
+        color: Theme.of(context).colorScheme.primary,
+        textColor: Theme.of(context).colorScheme.onPrimary,
         ),
-        bottomContent: LoadingPrimaryButton(
-      onPressed: () => save(context),
-      text: S.of(context).save,
-      color: Theme.of(context).colorScheme.primary,
-      textColor: Theme.of(context).colorScheme.onPrimary,
       ),
     );
   }