Merge branch 'develop'

Author: hillelcoren

lib/ui/app/forms/date_picker.dart

@@ -143,10 +143,19 @@ class _DatePickerState extends State<DatePicker> {
               value = value.replaceAll(RegExp(r'[^0-9]'), '');
 
               if (value.length <= 2) {
+                if (value.length == 1) {
+                  value = '0$value';
+                }
+
                 firstPart = value;
               } else if (value.length == 3) {
-                firstPart = '0' + value.substring(0, 1);
-                secondPart = value.substring(1, 3);
+                if (value.substring(0, 1) == '0') {
+                  firstPart = value.substring(0, 2);
+                  secondPart = '0' + value.substring(2, 3);
+                } else {
+                  firstPart = '0' + value.substring(0, 1);
+                  secondPart = value.substring(1, 3);
+                }
               } else {
                 if (value.length == 5) {
                   value = '0$value';

lib/ui/task/edit/task_edit_desktop.dart

@@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/constants.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
+import 'package:invoiceninja_flutter/redux/task/task_selectors.dart';
 import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/custom_field.dart';
@@ -111,11 +112,27 @@ class _TaskEditDesktopState extends State<TaskEditDesktop> {
     final task = viewModel.task;
     final state = viewModel.state;
 
+    final company = state.company;
+    final client = state.clientState.get(task.clientId);
     final taskTimes = task.getTaskTimes(sort: false);
     if (!taskTimes.any((taskTime) => taskTime.isEmpty)) {
       taskTimes.add(TaskTime().rebuild((b) => b..startDate = null));
     }
 
+    final rateLabel = localization.rate +
+        ' • ' +
+        formatNumber(
+            taskRateSelector(
+              company: company,
+              task: TaskEntity(),
+              client: client,
+              project: state.projectState.get(task.projectId),
+            ),
+            context,
+            currencyId: (client.currencyId ?? '').isNotEmpty
+                ? client.currencyId
+                : company.currencyId);
+
     return ListView(
       children: [
         Row(
@@ -201,8 +218,9 @@ class _TaskEditDesktopState extends State<TaskEditDesktop> {
                     autocorrect: false,
                   ),
                   DecoratedFormField(
+                    key: ValueKey('__rate__'),
                     controller: _rateController,
-                    label: localization.rate,
+                    label: rateLabel,
                     keyboardType: TextInputType.number,
                   ),
                   DynamicSelector(

lib/ui/task/edit/task_edit_details.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
+import 'package:invoiceninja_flutter/redux/task/task_selectors.dart';
 import 'package:invoiceninja_flutter/ui/app/entity_dropdown.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/custom_field.dart';
@@ -100,6 +101,22 @@ class _TaskEditDetailsState extends State<TaskEditDetails> {
     final task = viewModel.task;
     final state = viewModel.state;
 
+    final company = state.company;
+    final client = state.clientState.get(task.clientId);
+    final rateLabel = localization.rate +
+        ' • ' +
+        formatNumber(
+            taskRateSelector(
+              company: company,
+              task: TaskEntity(),
+              client: client,
+              project: state.projectState.get(task.projectId),
+            ),
+            context,
+            currencyId: (client.currencyId ?? '').isNotEmpty
+                ? client.currencyId
+                : company.currencyId);
+
     return ListView(
       children: <Widget>[
         FormCard(
@@ -152,8 +169,9 @@ class _TaskEditDetailsState extends State<TaskEditDetails> {
               autocorrect: false,
             ),
             DecoratedFormField(
+              key: ValueKey('__rate__'),
               controller: _rateController,
-              label: localization.rate,
+              label: rateLabel,
               keyboardType: TextInputType.number,
             ),
             DynamicSelector(