Merge branch 'develop'

lib/ui/invoice/invoice_pdf.dart

@@ -262,18 +262,19 @@ class _InvoicePdfViewState extends State<InvoicePdfView> {
           : null,
       body: Column(
         children: [
-          Material(
-            child: Padding(
-              padding: const EdgeInsets.symmetric(vertical: 8),
-              child: Row(
-                children: [
-                  if (supportsDesignTemplates()) designPicker,
-                  activityPicker,
-                  if (invoice.isInvoice && _activityId == null) deliveryNote,
-                ],
+          if (widget.showAppBar)
+            Material(
+              child: Padding(
+                padding: const EdgeInsets.symmetric(vertical: 8),
+                child: Row(
+                  children: [
+                    if (supportsDesignTemplates()) designPicker,
+                    activityPicker,
+                    if (invoice.isInvoice && _activityId == null) deliveryNote,
+                  ],
+                ),
               ),
             ),
-          ),
           Expanded(
             child: _isLoading || _response == null
                 ? LoadingIndicator()

pubspec.lock

@@ -544,22 +544,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
-  google_identity_services_web:
-    dependency: transitive
-    description:
-      name: google_identity_services_web
-      sha256: "554748f2478619076128152c58905620d10f9c7fc270ff1d3a9675f9f53838ed"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1+1"
   google_sign_in:
     dependency: "direct main"
     description:
       name: google_sign_in
-      sha256: f45038d27bcad37498f282295ae97eece23c9349fc16649154067b87b9f1fd03
+      sha256: "821f354c053d51a2d417b02d42532a19a6ea8057d2f9ebb8863c07d81c98aaf9"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.5"
+    version: "5.4.4"
   google_sign_in_android:
     dependency: transitive
     description:
@@ -588,10 +580,10 @@ packages:
     dependency: transitive
     description:
       name: google_sign_in_web
-      sha256: "939e9172a378ec4eaeb7f71eeddac9b55ebd0e8546d336daec476a68e5279766"
+      sha256: "75cc41ebc53b1756320ee14d9c3018ad3e6cea298147dbcd86e9d0c8d6720b40"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.0+5"
+    version: "0.10.2+1"
   graphs:
     dependency: transitive
     description:

pubspec.yaml

@@ -21,7 +21,7 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   #google_sign_in: ^6.0.1
-  google_sign_in: ^6.1.5
+  google_sign_in: 5.4.4 #https://pub.dev/packages/google_sign_in_web
   in_app_review: ^2.0.4
   in_app_purchase: ^3.1.1
   pinput: ^3.0.1