Merge branch 'master' into service-card-naming

assets/translations/en.json

@@ -304,6 +304,7 @@
         "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.",
         "size": "Size",
+        "price": "Price",
         "data_migration_title": "Data migration",
         "data_migration_notice": "During migration all services will be turned off.",
         "start_migration_button": "Start migration",
@@ -625,4 +626,4 @@
         "reset_onboarding_description": "Reset onboarding switch to show onboarding screen again",
         "cubit_statuses": "Cubit loading statuses"
     }
-}
+}

lib/ui/pages/server_storage/extending_volume.dart

@@ -79,10 +79,12 @@ class _ExtendingVolumePageState extends State<ExtendingVolumePage> {
           }
           final price = snapshot.data as Price;
           _pricePerGb = price.value;
-          _sizeController.text = _currentSliderGbValue.truncate().toString();
+          final currentSizeValue = _currentSliderGbValue.truncate().toString();
+          _sizeController.text = 'storage.gb'.tr(args: [currentSizeValue]);
           _priceController.text =
-              (_pricePerGb * double.parse(_sizeController.text))
-                  .toStringAsFixed(2);
+              '${(_pricePerGb * double.parse(currentSizeValue)).toStringAsFixed(2)}'
+              ' '
+              '${price.currency.shortcode}';
           minSize =
               widget.diskVolumeToResize.sizeTotal + DiskSize.fromGibibyte(3);
           if (_currentSliderGbValue < 0) {
@@ -130,7 +132,7 @@ class _ExtendingVolumePageState extends State<ExtendingVolumePage> {
                       decoration: InputDecoration(
                         border: const OutlineInputBorder(),
                         errorText: _isError ? ' ' : null,
-                        labelText: price.currency.shortcode,
+                        labelText: 'storage.price'.tr(),
                       ),
                     ),
                   ),

lib/ui/pages/services/services.dart

@@ -160,13 +160,15 @@ class _Card extends StatelessWidget {
                       ],
                     ),
                   Text(
-                    service.loginInfo,
+                    service.description,
                     style: Theme.of(context).textTheme.bodyMedium,
                   ),
                   const SizedBox(height: 10),
                   Text(
-                    service.description,
-                    style: Theme.of(context).textTheme.bodyMedium,
+                    service.loginInfo,
+                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                          color: Theme.of(context).colorScheme.secondary,
+                        ),
                   ),
                   const SizedBox(height: 10),
                 ],