ui improvements

1 files changed, 5 insertions, 9 deletions

diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp
index 82d7426..f86a1b5 100644
--- a/src/ui/ui_expenses.cpp
+++ b/src/ui/ui_expenses.cpp
@@ -315,9 +315,9 @@ static void _reset_to_default_view()
     activity_count = 0;
 }
 
-static void _reset_to_invoice_view()
+static void _invoice_saved_callback()
 {
-    current_view_state = ui::view_state::VIEW_EXISTING;
+    _reload_activities();
 }
 
 static void _draw_activity_sidepanel()
@@ -354,7 +354,7 @@ static void _draw_activity_sidepanel()
 
 static void draw_expense_update()
 {
-    if (ImGui::Button(locale::get("form.cancel"), true, false)) {
+    if (ImGui::Button(locale::get("form.back"), true, false)) {
         current_view_state = ui::view_state::VIEW_EXISTING;
     }
 
@@ -363,10 +363,8 @@ static void draw_expense_update()
         if (!can_save) ImGui::BeginDisabled();  
         ImGui::SameLine();
         if (ImGui::Button(locale::get("form.save"), true)) {
-            administration_writer::set_write_completed_event_callback(_reset_to_invoice_view);
+            administration_writer::set_write_completed_event_callback(_invoice_saved_callback);
             administration::invoice_update(&active_invoice);
-
-            _reload_activities();
         } 
         if (!can_save) ImGui::EndDisabled();
     }
@@ -394,10 +392,8 @@ static void draw_expense_create()
         if (!can_save) ImGui::BeginDisabled(); 
         ImGui::SameLine();
         if (ImGui::Button(locale::get("form.save"), true)) {
-            administration_writer::set_write_completed_event_callback(_reset_to_invoice_view);
+            administration_writer::set_write_completed_event_callback(_invoice_saved_callback);
             administration::invoice_add(&active_invoice);
-
-            _reload_activities();
         } 
         if (!can_save) ImGui::EndDisabled();
     }