Skip to content

Commit 97a10c3

Browse files
committed
Update remaining packages & fix build
1 parent 4f811cc commit 97a10c3

16 files changed

Lines changed: 157 additions & 120 deletions

‎components/AccountBalances.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import {fundAccount} from "src/accounts"
55
import {formattedBalance} from "src/balance"
66
import {FLOW_TYPE, TokenTypes} from "src/constants"
77
import useConfig from "hooks/useConfig"
8-
import {Label, Themed} from "theme-ui"
8+
import {Label} from "theme-ui"
9+
import {Themed} from "@theme-ui/mdx"
910
import {SXStyles} from "types"
1011
import AccountSectionHeading from "./AccountSectionHeading"
1112
import Button from "./Button"

‎components/AccountForm.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,13 @@ export default function AccountForm({
7979
}
8080
}}
8181
>
82-
{({values, setFieldValue}) => (
82+
{({
83+
values,
84+
setFieldValue,
85+
}: {
86+
values: {label: string | undefined; scopes: Set<string>}
87+
setFieldValue: (field: string, value: any) => void
88+
}) => (
8389
<>
8490
<div sx={dialogStyles.body}>
8591
<Form data-test="fund-account-form" sx={styles.form}>

‎components/AccountListItemScopes.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/** @jsxImportSource theme-ui */
22
import Switch from "components/Switch"
33
import useAuthnContext from "hooks/useAuthnContext"
4-
import {Label, Themed} from "theme-ui"
4+
import {Label} from "theme-ui"
5+
import {Themed} from "@theme-ui/mdx"
56
import {SXStyles} from "types"
67
import AccountSectionHeading from "./AccountSectionHeading"
78

‎components/AccountsList.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import PlusButton from "components/PlusButton"
55
import useAuthnContext from "hooks/useAuthnContext"
66
import {Account, NewAccount} from "src/accounts"
77
import accountGenerator from "src/accountGenerator"
8-
import {Box, Themed} from "theme-ui"
8+
import {Box} from "theme-ui"
9+
import {Themed} from "@theme-ui/mdx"
910
import {SXStyles} from "types"
1011
import FormErrors from "./FormErrors"
1112
import useConfig from "hooks/useConfig"

‎components/AccountsListItem.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import {Account, NewAccount} from "src/accounts"
77
import {useEffect, useState} from "react"
88
import {chooseAccount} from "src/accountAuth"
99
import {formattedBalance} from "src/balance"
10-
import {Flex, Themed} from "theme-ui"
10+
import {Flex} from "theme-ui"
11+
import {Themed} from "@theme-ui/mdx"
1112
import {SXStyles} from "types"
1213
import {getBaseUrl} from "src/utils"
1314

‎components/ConnectedAppHeader.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import useAuthnContext from "hooks/useAuthnContext"
55
import {Account, NewAccount} from "src/accounts"
66
import {useState} from "react"
77
import {UNTITLED_APP_NAME} from "src/constants"
8-
import {Button, Link, Themed} from "theme-ui"
8+
import {Button, Link} from "theme-ui"
9+
import {Themed} from "@theme-ui/mdx"
910
import {SXStyles} from "types"
1011
import ConnectedAppIcon from "./ConnectedAppIcon"
1112

‎components/Dialog.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ export default function Dialog({
111111
const {isExpanded, setCodePreview} = useAuthzContext()
112112

113113
return (
114-
// @ts-expect-error The headless-ui dialog raises a "Expression produces a union type that is too complex to represent" error when used with theme-ui sx props
115-
// See https://github.com/tailwindlabs/headlessui/issues/233, https://github.com/tailwindlabs/headlessui/issues/330
116114
<HUIDialog
117115
open={true}
118116
onClose={onClose}

‎components/Inputs.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export const CustomInputComponent = ({
4646
{...props}
4747
sx={showError ? {...sx, ...errorInputStyles} : sx}
4848
/>
49-
{showError && <FieldError>{errors[field.name]}</FieldError>}
49+
{showError && <FieldError>{String(errors[field.name])}</FieldError>}
5050
</>
5151
)
5252
}

0 commit comments

Comments
 (0)