Merge branch 'fix/trimming-hashtag-after-autocomplete-selection'

toggl-open-source · May 11, 2021 · a66900b · a66900b
2 parents 695bc71 + ae3f38e
commit a66900b
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/ui/osx/TogglDesktop/Features/Timer/TimerViewController/TimerViewModel.swift b/src/ui/osx/TogglDesktop/Features/Timer/TimerViewController/TimerViewModel.swift
@@ -533,13 +533,6 @@ final class TimerViewModel: NSObject {
         // User has selected an autocomplete item.
         // It could be a time entry, a task or a project.
 
-        if let newDescription = autocompleteItem.description {
-            entryDescription = newDescription
-            if timeEntry.isRunning() {
-                saveCurrentDescription()
-            }
-        }
-
         fillEntryProject(from: autocompleteItem)
 
         selectedTags = autocompleteItem.tags ?? []
@@ -549,6 +542,13 @@ final class TimerViewModel: NSObject {
         } else {
             billableState = .unavailable
         }
+
+        if let newDescription = autocompleteItem.description {
+            entryDescription = newDescription
+            if timeEntry.isRunning() {
+                saveCurrentDescription()
+            }
+        }
     }
 
     private func fillEntryProject(from autocompleteItem: AutocompleteItem) {