Merge branch 'master' into backblaze-refactor

assets/translations/en.json

@@ -312,6 +312,7 @@
         "extending_volume_description": "Resizing volume will allow you to store more data on your server without extending the server itself. Volume can only be extended: shrinking is not possible.",
         "extending_volume_price_info": "Price includes VAT and is estimated from pricing data provided by your server provider. Server will be rebooted after resizing.",
         "extending_volume_error": "Couldn't initialize volume extending.",
+        "extending_volume_modal_description": "Upgrade to {} for {} plan per month.",
         "size": "Size",
         "price": "Price",
         "data_migration_title": "Data migration",

lib/logic/providers/dns_providers/cloudflare.dart

@@ -69,13 +69,6 @@ class CloudflareDnsProvider extends DnsProvider {
         )
         .toList();
 
-    /// TODO: Remove when domain selection for more than one domain on account is implemented, move cachedZoneId writing to domain saving method
-    _adapter = ApiAdapter(
-      isWithToken: true,
-      cachedDomain: result.data[0].name,
-      cachedZoneId: result.data[0].id,
-    );
-
     return GenericResult(
       success: true,
       data: domains,

lib/ui/pages/server_storage/extending_volume.dart

@@ -8,6 +8,7 @@ import 'package:selfprivacy/logic/models/disk_size.dart';
 import 'package:selfprivacy/logic/models/price.dart';
 import 'package:selfprivacy/ui/components/buttons/brand_button.dart';
 import 'package:selfprivacy/ui/components/info_box/info_box.dart';
+import 'package:selfprivacy/ui/helpers/modals.dart';
 import 'package:selfprivacy/ui/layouts/brand_hero_screen.dart';
 import 'package:selfprivacy/logic/models/disk_status.dart';
 
@@ -46,7 +47,6 @@ class _ExtendingVolumePageState extends State<ExtendingVolumePage> {
   late double _currentSliderGbValue;
   double _pricePerGb = 1.0;
 
-  // TODO: Wtfff hardcode?!?!?
   final DiskSize maxSize = const DiskSize(byte: 500000000000);
   late DiskSize minSize;
 
@@ -155,14 +155,24 @@ class _ExtendingVolumePageState extends State<ExtendingVolumePage> {
                 onPressed: _isError || isAlreadyResizing
                     ? null
                     : () {
-                        context.read<ApiProviderVolumeCubit>().resizeVolume(
+                        showPopUpAlert(
-                              widget.diskVolumeToResize,
+                          alertTitle: 'storage.extending_volume_title'.tr(),
-                              DiskSize.fromGibibyte(
+                          description:
-                                _currentSliderGbValue.truncate().toDouble(),
+                              'storage.extending_volume_modal_description'.tr(
-                              ),
+                            args: [_sizeController.text, _priceController.text],
-                              context.read<ApiServerVolumeCubit>().reload,
+                          ),
-                            );
+                          actionButtonTitle: 'basis.continue'.tr(),
-                        context.router.popUntilRoot();
+                          actionButtonOnPressed: () {
+                            context.read<ApiProviderVolumeCubit>().resizeVolume(
+                                  widget.diskVolumeToResize,
+                                  DiskSize.fromGibibyte(
+                                    _currentSliderGbValue.truncate().toDouble(),
+                                  ),
+                                  context.read<ApiServerVolumeCubit>().reload,
+                                );
+                            context.router.popUntilRoot();
+                          },
+                        );
                       },
                 child: Text('storage.extend_volume_button.title'.tr()),
               ),