Fix issues

BrunoQuaresma · BrunoQuaresma · commit 4e667924e739 · 2023-06-23T17:11:11.000Z
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -211,5 +211,5 @@
   "go.testFlags": ["-short", "-coverpkg=./..."],
   // We often use a version of TypeScript that's ahead of the version shipped
   // with VS Code.
-  "typescript.tsdk": "./site/node_modules/typescript/lib",
+  "typescript.tsdk": "./site/node_modules/typescript/lib"
 }
diff --git a/coderd/userauth.go b/coderd/userauth.go
@@ -1284,7 +1284,6 @@ func (api *API) convertUserToOauth(ctx context.Context, r *http.Request, db data
 		}
 	}
 	return nil
-
 }
 
 // githubLinkedID returns the unique ID for a GitHub user.
diff --git a/site/src/components/SettingsAccountForm/SettingsAccountForm.test.tsx b/site/src/components/SettingsAccountForm/SettingsAccountForm.test.tsx
@@ -31,7 +31,7 @@ describe("AccountForm", () => {
       const el = await screen.findByLabelText("Username")
       expect(el).toBeEnabled()
       const btn = await screen.findByRole("button", {
-        name: /Update settings/i,
+        name: /Update account/i,
       })
       expect(btn).toBeEnabled()
     })
@@ -61,7 +61,7 @@ describe("AccountForm", () => {
       const el = await screen.findByLabelText("Username")
       expect(el).toBeDisabled()
       const btn = await screen.findByRole("button", {
-        name: /Update settings/i,
+        name: /Update account/i,
       })
       expect(btn).toBeDisabled()
     })
diff --git a/site/src/components/SettingsSecurityForm/SettingsSecurityForm.tsx b/site/src/components/SettingsSecurityForm/SettingsSecurityForm.tsx
@@ -64,10 +64,7 @@ export const SecurityForm: FC<SecurityFormProps> = ({
       validationSchema,
       onSubmit,
     })
-  const getFieldHelpers = getFormHelpers<SecurityFormValues>(
-    form,
-    error,
-  )
+  const getFieldHelpers = getFormHelpers<SecurityFormValues>(form, error)
 
   if (disabled) {
     return (
@@ -81,9 +78,7 @@ export const SecurityForm: FC<SecurityFormProps> = ({
     <>
       <Form onSubmit={form.handleSubmit}>
         <FormFields>
-          {Boolean(error) && (
-            <ErrorAlert error={error} />
-          )}
+          {Boolean(error) && <ErrorAlert error={error} />}
           <TextField
             {...getFieldHelpers("old_password")}
             autoComplete="old_password"

Original file line number	Diff line number	Diff line change
`@@ -211,5 +211,5 @@`
`211`	`211`	`"go.testFlags": ["-short", "-coverpkg=./..."],`
`212`	`212`	`// We often use a version of TypeScript that's ahead of the version shipped`
`213`	`213`	`// with VS Code.`
`214`		`- "typescript.tsdk": "./site/node_modules/typescript/lib",`
	`214`	`+ "typescript.tsdk": "./site/node_modules/typescript/lib"`
`215`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1284,7 +1284,6 @@ func (api API) convertUserToOauth(ctx context.Context, r http.Request, db data`
`1284`	`1284`	`}`
`1285`	`1285`	`}`
`1286`	`1286`	`return nil`
`1287`		`-`
`1288`	`1287`	`}`
`1289`	`1288`
`1290`	`1289`	`// githubLinkedID returns the unique ID for a GitHub user.`