Massive bug fix. Clear button added into fields.

components/Tracker/ActiveSessionView.tsx

@@ -68,16 +68,7 @@ const ActiveSessionView: React.FC<ActiveSessionViewProps> = ({ tracker, activeSe
         exercises
     } = tracker;
 
-    // We need activePlan from the hook or props. The hook returns 'plans' but not 'activePlan'.
-    // Actually useTracker takes activePlan as prop but doesn't return it.
-    // We should probably pass activePlan as a prop to this component directly from the parent.
-    // Let's assume the parent passes it or we modify the hook.
-    // For now, let's use the activePlan passed to the hook if possible, but the hook doesn't expose it.
-    // I will modify the hook to return activePlan or just accept it as prop here.
-    // The hook accepts activePlan as argument, so I can return it.
-    // Let's modify useTracker to return activePlan in the next step if needed, or just pass it here.
-    // Wait, I can't modify useTracker easily now without rewriting it.
-    // I'll pass activePlan as a prop to ActiveSessionView.
+
 
     const isPlanFinished = activePlan && currentStepIndex >= activePlan.steps.length;
 

components/Tracker/SetLogger.tsx

@@ -60,13 +60,15 @@ const SetLogger: React.FC<SetLoggerProps> = ({ tracker, lang, onLogSet, isSporad
                     icon={<Dumbbell size={10} />}
                     autoComplete="off"
                     type="text"
+                    rightElement={
+                        <button
+                            onClick={() => setIsCreating(true)}
+                            className="p-2 text-primary hover:bg-primary-container/20 rounded-full"
+                        >
+                            <Plus size={24} />
+                        </button>
+                    }
                 />
-                <button
-                    onClick={() => setIsCreating(true)}
-                    className="absolute right-2 top-1/2 -translate-y-1/2 p-2 text-primary hover:bg-primary-container/20 rounded-full z-10"
-                >
-                    <Plus size={24} />
-                </button>
                 {showSuggestions && (
                     <div className="absolute top-full left-0 w-full bg-surface-container rounded-xl shadow-elevation-3 overflow-hidden z-20 mt-1 max-h-60 overflow-y-auto animate-in fade-in slide-in-from-top-2">
                         {filteredExercises.length > 0 ? (
@@ -163,8 +165,8 @@ const SetLogger: React.FC<SetLoggerProps> = ({ tracker, lang, onLogSet, isSporad
                     <button
                         onClick={onLogSet}
                         className={`w-full h-14 font-medium text-lg rounded-full shadow-elevation-2 hover:shadow-elevation-3 active:scale-[0.98] transition-all flex items-center justify-center gap-2 ${isSporadic && sporadicSuccess
-                                ? 'bg-green-500 text-white'
-                                : 'bg-primary-container text-on-primary-container'
+                            ? 'bg-green-500 text-white'
+                            : 'bg-primary-container text-on-primary-container'
                             }`}
                     >
                         {isSporadic && sporadicSuccess ? <CheckCircle size={24} /> : (isSporadic ? <Plus size={24} /> : <CheckCircle size={24} />)}

components/Tracker/useTracker.ts

@@ -183,6 +183,7 @@ export const useTracker = ({
         const updateSelection = async () => {
             if (selectedExercise) {
                 setBwPercentage(selectedExercise.bodyWeightPercentage ? selectedExercise.bodyWeightPercentage.toString() : '100');
+                setSearchQuery(selectedExercise.name);
                 const set = await getLastSetForExercise(userId, selectedExercise.id);
                 setLastSet(set);