Fixes for web

lib/constants.dart

@@ -6,6 +6,9 @@ class Constants {
   static String get hostedApiUrl => kReleaseMode ? kAppProductionUrl : kAppStagingUrl;
 }
 
+// TODO remove version once #46609 is fixed
+const String kAppVersion = '2.0.4';
+
 const String kSiteUrl = 'https://invoiceninja.com';
 const String kAppProductionUrl = 'https://invoicing.co';
 const String kAppStagingUrl = 'https://staging.invoicing.co';

lib/main.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'package:package_info/package_info.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -51,6 +50,7 @@ import 'package:redux/redux.dart';
 import 'package:redux_logging/redux_logging.dart';
 import 'package:sentry/sentry.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+
 // STARTER: import - do not remove comment
 import 'package:invoiceninja_flutter/ui/design/design_screen.dart';
 import 'package:invoiceninja_flutter/ui/design/edit/design_edit_vm.dart';
@@ -77,13 +77,15 @@ import 'package:invoiceninja_flutter/redux/company_gateway/company_gateway_middl
 void main({bool isTesting = false}) async {
   WidgetsFlutterBinding.ensureInitialized();
 
-  final packageInfo = await PackageInfo.fromPlatform();
+
+  //final packageInfo = await PackageInfo.fromPlatform();
   final SentryClient _sentry = Config.SENTRY_DNS.isEmpty
       ? null
       : SentryClient(
           dsn: Config.SENTRY_DNS,
           environmentAttributes: Event(
-            release: packageInfo.version,
+            //release: packageInfo.version,
+            release: kAppVersion,
             environment: Config.PLATFORM,
           ));
 

lib/redux/app/app_middleware.dart

@@ -43,7 +43,6 @@ import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:redux/redux.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:package_info/package_info.dart';
 
 List<Middleware<AppState>> createStorePersistenceMiddleware([
   PersistenceRepository authRepository = const PersistenceRepository(
@@ -191,12 +190,14 @@ Middleware<AppState> _createLoadState(
     final action = dynamicAction as LoadStateRequest;
     try {
       final prefs = await SharedPreferences.getInstance();
-      final packageInfo = await PackageInfo.fromPlatform();
-
       final appVersion = prefs.getString(kSharedPrefAppVersion);
-      prefs.setString(kSharedPrefAppVersion, packageInfo.version);
 
-      if (appVersion != packageInfo.version) {
+      //final packageInfo = await PackageInfo.fromPlatform();
+      //prefs.setString(kSharedPrefAppVersion, packageInfo.version);
+      prefs.setString(kSharedPrefAppVersion, kAppVersion);
+
+      //if (appVersion != packageInfo.version) {
+      if (appVersion != kAppVersion) {
         throw 'New app version - clearing state';
       }
 

lib/redux/auth/auth_state.dart

@@ -1,6 +1,7 @@
 import 'package:built_value/built_value.dart';
 import 'package:built_value/serializer.dart';
 import 'package:invoiceninja_flutter/constants.dart';
+import 'package:invoiceninja_flutter/utils/formatting.dart';
 import 'package:invoiceninja_flutter/.env.dart';
 
 part 'auth_state.g.dart';
@@ -47,9 +48,8 @@ abstract class AuthState implements Built<AuthState, AuthStateBuilder> {
         kMillisecondsToReenterPassword;
   }
 
-  // TODO fix this
-  //bool get isHosted => cleanApiUrl(url).isEmpty || cleanApiUrl(url) == kAppUrl;
-  bool get isHosted => false;
+  bool get isHosted =>
+      cleanApiUrl(url).isEmpty || cleanApiUrl(url) == kAppProductionUrl;
 
   bool get isSelfHost => !isHosted;
 

lib/ui/app/menu_drawer.dart

@@ -26,9 +26,7 @@ import 'package:invoiceninja_flutter/utils/icons.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:url_launcher/url_launcher.dart';
-
 // STARTER: import - do not remove comment
-import 'package:package_info/package_info.dart';
 
 class MenuDrawer extends StatelessWidget {
   const MenuDrawer({
@@ -629,7 +627,7 @@ void _showUpdate(BuildContext context) {
 }
 
 void _showAbout(BuildContext context) async {
-  final packageInfo = await PackageInfo.fromPlatform();
+  //final packageInfo = await PackageInfo.fromPlatform();
   final localization = AppLocalization.of(context);
   final ThemeData themeData = Theme.of(context);
   final TextStyle aboutTextStyle = themeData.textTheme.bodyText2;
@@ -644,7 +642,8 @@ void _showAbout(BuildContext context) async {
       width: 40.0,
       height: 40.0,
     ),
-    applicationVersion: 'Version: ${packageInfo.version}',
+    //applicationVersion: 'Version: ${packageInfo.version}',
+    applicationVersion: 'Version: $kAppVersion',
     applicationLegalese: '© ${DateTime.now().year} Invoice Ninja',
     children: <Widget>[
       Padding(

pubspec.lock

@@ -238,7 +238,7 @@ packages:
       name: firebase_auth
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.15.5+2"
+    version: "0.15.5+3"
   firebase_auth_platform_interface:
     dependency: transitive
     description:
@@ -394,7 +394,7 @@ packages:
       name: google_sign_in
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.4"
+    version: "4.2.0"
   google_sign_in_platform_interface:
     dependency: transitive
     description:
@@ -597,7 +597,7 @@ packages:
       name: package_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.1"
+    version: "1.9.2"
   package_info:
     dependency: "direct main"
     description:
@@ -646,7 +646,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0+1"
+    version: "1.9.0"
   petitparser:
     dependency: transitive
     description:
@@ -772,7 +772,7 @@ packages:
       name: shelf_packages_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   shelf_static:
     dependency: transitive
     description:
@@ -980,7 +980,7 @@ packages:
       name: vm_service
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.1"
+    version: "4.0.0"
   vm_service_client:
     dependency: transitive
     description:

pubspec.yaml

@@ -43,7 +43,6 @@ dependencies:
   flutter_typeahead: ^1.8.0
   flutter_share: ^1.0.2+1
   package_info: ^0.4.0+16
-  #native_pdf_renderer: any
   #quick_actions: ^0.2.1
 
 dev_dependencies: