Projects

lib/ui/expense/edit/expense_edit.dart

@@ -70,10 +70,10 @@ class _ExpenseEditState extends State<ExpenseEdit>
             text: localization.details,
           ),
           Tab(
-            text: localization.settings,
+            text: localization.notes,
           ),
           Tab(
-            text: localization.notes,
+            text: localization.settings,
           ),
         ],
       ),
@@ -86,10 +86,10 @@ class _ExpenseEditState extends State<ExpenseEdit>
             ExpenseEditDetails(
               viewModel: widget.viewModel,
             ),
-            ExpenseEditSettings(
+            ExpenseEditNotes(
               viewModel: widget.viewModel,
             ),
-            ExpenseEditNotes(
+            ExpenseEditSettings(
               viewModel: widget.viewModel,
             ),
           ],

lib/ui/expense/edit/expense_edit_settings.dart

@@ -150,7 +150,7 @@ class ExpenseEditSettingsState extends State<ExpenseEditSettings> {
                 ? SizedBox()
                 : SwitchListTile(
                     activeColor: Theme.of(context).accentColor,
-                    title: Text(localization.markBillable),
+                    title: Text(localization.markInvoiceable),
                     value: expense.shouldBeInvoiced,
                     onChanged: (value) {
                       viewModel.onChanged(

lib/utils/i18n.dart

@@ -891,7 +891,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'exchange_rate': 'Exchange Rate',
       'convert_currency': 'Convert Currency',
       'mark_paid': 'Mark Paid',
-      'mark_billable': 'Mark Billable',
+      'mark_invoiceable': 'Mark Invoiceable',
       'category': 'Category',
       'address': 'Address',
       'new_vendor': 'New Vendor',
@@ -2321,8 +2321,8 @@ mixin LocalizationsProvider on LocaleCodeAware {
 
   String get category => _localizedValues[localeCode]['category'] ?? '';
 
-  String get markBillable =>
-      _localizedValues[localeCode]['mark_billable'] ?? '';
+  String get markInvoiceable =>
+      _localizedValues[localeCode]['mark_invoiceable'] ?? '';
 
   String get markPaid => _localizedValues[localeCode]['mark_paid'] ?? '';