fix: :bug: allow end/home keys to work

2 files changed, 15 insertions, 3 deletions

diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx
index 7314ed91..8364645e 100644
--- a/extension/react-app/src/components/ComboBox.tsx
+++ b/extension/react-app/src/components/ComboBox.tsx
@@ -550,6 +550,12 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
                   postVscMessage("focusEditor", {});
                 }
               }
+              // Home and end keys
+              else if (event.key === "Home") {
+                (event.nativeEvent as any).preventDownshiftDefault = true;
+              } else if (event.key === "End") {
+                (event.nativeEvent as any).preventDownshiftDefault = true;
+              }
             },
             onClick: () => {
               dispatch(setBottomMessage(undefined));
diff --git a/extension/react-app/src/components/ModelSelect.tsx b/extension/react-app/src/components/ModelSelect.tsx
index 9134cd7d..ea979da7 100644
--- a/extension/react-app/src/components/ModelSelect.tsx
+++ b/extension/react-app/src/components/ModelSelect.tsx
@@ -92,8 +92,7 @@ const Select = styled.select`
 function ModelSelect(props: {}) {
   const client = useContext(GUIClientContext);
   const defaultModel = useSelector(
-    (state: RootStore) =>
-      (state.serverState.config as any)?.models?.default?.class_name
+    (state: RootStore) => (state.serverState.config as any)?.models?.default
   );
 
   return (
@@ -106,7 +105,14 @@ function ModelSelect(props: {}) {
     >
       {MODEL_INFO.map((model, idx) => {
         return (
-          <option selected={defaultModel === model.class} value={idx}>
+          <option
+            selected={
+              defaultModel?.class_name === model.class &&
+              (!defaultModel?.model?.startsWith("gpt") ||
+                defaultModel?.model === model.args.model)
+            }
+            value={idx}
+          >
             {model.title}
           </option>
         );