Merge branch 'develop'

invoiceninja · Feb 4, 2024 · 095b3a1 · 095b3a1
2 parents 423ec92 + 488210a
commit 095b3a1
Show file tree

Hide file tree

Showing 10 changed files with 1,039 additions and 434 deletions.
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
@@ -86,7 +86,7 @@ jobs:
           draft: false
           prerelease: false
           title: "Latest Release"
-          automatic_release_tag: "v5.0.153"
+          automatic_release_tag: "v5.0.154"
           files: |
             ${{ github.workspace }}/artifacts/Invoice-Ninja-Archive
             ${{ github.workspace }}/artifacts/Invoice-Ninja-Hash

diff --git a/flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml b/flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml
@@ -50,6 +50,7 @@
   </screenshots>
   <content_rating type="oars-1.1"/>
   <releases>
+    <release version="5.0.154" date="2024-02-04"/>
     <release version="5.0.153" date="2024-01-29"/>
     <release version="5.0.152" date="2024-01-24"/>
     <release version="5.0.151" date="2024-01-23"/>

diff --git a/lib/constants.dart b/lib/constants.dart
@@ -6,7 +6,7 @@ class Constants {
 }
 
 // TODO remove version once #46609 is fixed
-const String kClientVersion = '5.0.153';
+const String kClientVersion = '5.0.154';
 const String kMinServerVersion = '5.0.4';
 
 const String kAppName = 'Invoice Ninja';

diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
@@ -1425,7 +1425,12 @@ void _showAbout(BuildContext context) async {
                           .replaceFirst(':value', state.appVersion));
                     },
                     onLongPress: () async {
-                      if (kReleaseMode) {
+                      if (!kReleaseMode && supportsInAppPurchase()) {
+                        showDialog<void>(
+                          context: context,
+                          builder: (context) => UpgradeDialog(),
+                        );
+                      } else {
                         showMessageDialog(
                             message: FLUTTER_VERSION['channel']!.toUpperCase() +
                                 ' • ' +
@@ -1436,11 +1441,6 @@ void _showAbout(BuildContext context) async {
                                 onPressed: () => store.dispatch(UserLogout()),
                               ),
                             ]);
-                      } else {
-                        showDialog<void>(
-                          context: context,
-                          builder: (context) => UpgradeDialog(),
-                        );
                       }
                     },
                   ),

diff --git a/lib/ui/auth/init_screen.dart b/lib/ui/auth/init_screen.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 
 // Package imports:
 import 'package:flutter_redux/flutter_redux.dart';
+import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:redux/redux.dart';
 
 // Project imports:
@@ -12,6 +13,8 @@ import 'package:invoiceninja_flutter/redux/auth/auth_actions.dart';
 class InitScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
+    final localization = AppLocalization.of(context)!;
+
     return StoreBuilder(
         onInit: (Store<AppState> store) =>
             store.dispatch(LoadStateRequest(context)),
@@ -21,9 +24,32 @@ class InitScreen extends StatelessWidget {
             child: Column(
               mainAxisSize: MainAxisSize.max,
               children: <Widget>[
+                Expanded(child: SizedBox()),
                 Expanded(
                   child: Center(child: Image.asset('assets/images/icon.png')),
                 ),
+                Expanded(
+                  child: Stack(
+                    alignment: Alignment.center,
+                    children: [
+                      SizedBox(
+                        height: 50,
+                        width: 100,
+                        child: Material(
+                          child: ElevatedButton(
+                            child: Text(
+                              localization.logout.toUpperCase(),
+                              style: TextStyle(color: Colors.white),
+                            ),
+                            onPressed: () {
+                              store.dispatch(UserLogout());
+                            },
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
                 SizedBox(
                   height: 4.0,
                   child: LinearProgressIndicator(),

diff --git a/lib/ui/transaction/transaction_presenter.dart b/lib/ui/transaction/transaction_presenter.dart
@@ -77,7 +77,7 @@ class TransactionPresenter extends EntityPresenter {
               currencyId: transaction.currencyId)!),
         );
       case TransactionFields.description:
-        return Text(transaction.description);
+        return Text(transaction.formattedDescription);
       case TransactionFields.participantName:
         return Text(transaction.participantName);
       case TransactionFields.participant: