Hide OAI key option until we can port over to GA model

whathes · Mar 28, 2023 · 28e4b81 · 28e4b81
1 parent 9e04a00
commit 28e4b81
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 29 deletions.
diff --git a/src/appComponent.tsx b/src/appComponent.tsx
@@ -54,7 +54,7 @@ const customStyles = {
         height: 'auto',
         marginLeft: 'auto',
         marginRight: 'auto',
-        maxWidth: '600px',
+        maxWidth: '700px',
     },
 }
 
@@ -73,7 +73,7 @@ function ErrorPopup() {
             <div className="errorPopup">
                 <div className="errorPopup__title">
                     <div className="errorPopup__title_text">
-                        Maximum Capacity
+                        We ran into a problem
                     </div>
                     <div
                         className="errorPopup__title_close"
@@ -83,8 +83,7 @@ function ErrorPopup() {
                     </div>
                 </div>
                 <div className="errorPopup__body">
-                    We're getting more traffic than we can handle right now.
-                    Please try again later.
+                    Something unexpected happened. Please try again later. If this continues, please contact [email protected].
                     <br />
                 </div>
             </div>
@@ -153,7 +152,10 @@ function NoAuthRateLimitPopup() {
                 </div>
                 <div className="errorPopup__body">
                     We're getting more traffic than we can handle right
-                    now. To avoid these limits, you can enter your OpenAI API key in Settings.
+                    now. Please try again in one minute. To avoid these limits, you can optionally upgrade to <a
+                        className="pay-link"
+                        onClick={() => dispatch(ts.upgradeCursor(null))}
+                    >pro</a>.
                 </div>
             </div>
         </Modal>

diff --git a/src/components/settingsPane.tsx b/src/components/settingsPane.tsx
@@ -162,27 +162,7 @@ export function SettingsPopup() {
                                 />
                             </div>
 
-                            <div className="settings__item">
-                                <div className="settings__item_title">
-                                    OpenAI API Key
-                                </div>
-                                <div className="settings__item_description">
-                                    We'll use your key for any requests to OpenAI. This will help you avoid "maximum capacity" limits.
-                                </div>
-                                <input
-                                    className="settings__item_textarea"
-                                    placeholder="Enter your OpenAI API Key"
-                                    type="password"
-                                    onChange={(e) => {
-                                        dispatch(
-                                            changeSettings({
-                                                openAIKey: e.target.value,
-                                            })
-                                        )
-                                    }}
-                                    value={settings.openAIKey || ""}
-                                    />
-                            </div>
+                            <CursorLogin />
 
                             <CopilotPanel />
                             {/* REMOVED CODEBASE-WIDE FEATURES!
@@ -193,7 +173,6 @@ export function SettingsPopup() {
                                     languageName={name}
                                 />
                             ))}
-                            <CursorLogin />
                         </div>
                     </div>
                     <div className="cover-bar"></div>
@@ -248,7 +227,7 @@ function CursorLogin() {
         <div className="settings__item">
             <div className="settings__item_title">Cursor Pro</div>
             <div className="settings__item_description">
-                If you'd like to pay for unlimited requests, instead of using your OpenAI API key.
+                Optionally reserve capacity to avoid "maximum capacity" limits.
             </div>
             {currentPanel}
         </div>

diff --git a/src/features/chat/chatThunks.ts b/src/features/chat/chatThunks.ts
@@ -295,7 +295,6 @@ export async function getPayload({
         customCodeBlocks,
         codeBlockIdentifiers,
         msgType: chatState.msgType,
-        apiKey: oaiKey,
         // Messy, but needed for the single lsp stuff to work
         maxOrigLine: forContinue
             ? getLastBotMessage(chatState, conversationId)!.maxOrigLine
@@ -330,6 +329,7 @@ export async function getPayload({
         contextType: state.settingsState.settings.contextType,
 
         rootPath: state.global.rootPath,
+        apiKey: oaiKey,
     }
 
     // document.cookie = `repo_path=${state.global.rootPath}`