From a9b96f22a38def5a4754e7c8b325270d98732495 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Tue, 28 Sep 2021 23:53:26 +1000
Subject: [PATCH] Fixes for purchase order editing

---
 .github/workflows/test.yaml | 2 +-
 lib/api_form.dart           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 453850b4..8b1950b7 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -47,7 +47,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: '12.x'
+          java-version: '8.x'
       - name: Setup Flutter
         uses: subosito/flutter-action@v1
         with:
diff --git a/lib/api_form.dart b/lib/api_form.dart
index f134a806..5da5eff3 100644
--- a/lib/api_form.dart
+++ b/lib/api_form.dart
@@ -194,7 +194,7 @@ class APIFormField {
         labelStyle: _labelStyle(),
       ),
       initialValue: DateTime.tryParse((value ?? "") as String),
-      autovalidateMode: AutovalidateMode.always,
+      autovalidateMode: AutovalidateMode.disabled,
       validator: (e) {
         // TODO
       },
@@ -600,8 +600,8 @@ Future<void> launchApiForm(BuildContext context, String title, String url, Map<S
       continue;
     }
 
-    Map<String, dynamic> remoteField = (availableFields[fieldName] ?? {}) as Map<String, dynamic>;
-    Map<String, dynamic> localField = (fields[fieldName] ?? {}) as Map<String, dynamic>;
+    final remoteField = Map<String, dynamic>.from(availableFields[fieldName] as Map);
+    final localField = Map<String, dynamic>.from(fields[fieldName] as Map);
 
     // Override defined field parameters, if provided
     for (String key in localField.keys) {