Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dApp: Wallet connection info alert #917

Merged
merged 6 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions dapp/src/components/ConnectWalletModal/ConnectWalletAlert.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react"
import { Box, Link, VStack } from "@chakra-ui/react"
import { AlertStatus, Box, Link, VStack } from "@chakra-ui/react"
import { AnimatePresence, Variants, motion } from "framer-motion"
import { EXTERNAL_HREF } from "#/constants"
import {
Expand All @@ -18,6 +18,15 @@ export enum ConnectionAlert {
Default = "DEFAULT",
}

type ConnectionAlerts = Record<
ConnectionAlert,
{
title: string
description?: React.ReactNode
status?: AlertStatus
}
>

function ContactSupport() {
return (
<Box as="span">
Expand All @@ -36,10 +45,10 @@ function ContactSupport() {
)
}

const CONNECTION_ALERTS = {
const CONNECTION_ALERTS: ConnectionAlerts = {
[ConnectionAlert.Rejected]: {
title: "Wallet connection rejected.",
description: "If you encountered an error, please try again.",
title: "Please connect your wallet to start using Acre",
status: "info",
},
[ConnectionAlert.NotSupported]: {
title: "Not supported.",
Expand All @@ -66,10 +75,12 @@ const collapseVariants: Variants = {
expanded: { height: "auto" },
}

type ConnectWalletAlertProps = AlertProps & { type?: ConnectionAlert }
type ConnectWalletAlertProps = Omit<AlertProps, "status"> & {
type?: ConnectionAlert
}

export default function ConnectWalletAlert(props: ConnectWalletAlertProps) {
const { type, status, ...restProps } = props
const { type, ...restProps } = props

const data = type ? CONNECTION_ALERTS[type] : undefined

Expand All @@ -85,11 +96,13 @@ export default function ConnectWalletAlert(props: ConnectWalletAlertProps) {
overflow="hidden"
w="full"
>
<Alert status={status} mb={6} {...restProps}>
<Alert status={data.status || "error"} mb={6} {...restProps}>
<AlertIcon />
<VStack w="full" align="start" spacing={0}>
<AlertTitle textAlign="start">{data.title}</AlertTitle>
<AlertDescription>{data.description}</AlertDescription>
{data.description && (
<AlertDescription>{data.description}</AlertDescription>
)}
</VStack>
</Alert>
</Box>
Expand Down
4 changes: 2 additions & 2 deletions dapp/src/components/ConnectWalletModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export function ConnectWalletModalBase({
}))

const [selectedConnectorId, setSelectedConnectorId] = useState<string>()
const { type, status, resetConnectionAlert } = useWalletConnectionAlert()
const { type, resetConnectionAlert } = useWalletConnectionAlert()
const isSignedMessage = useIsSignedMessage()

const handleButtonOnClick = (connector: OrangeKitConnector) => {
Expand Down Expand Up @@ -59,7 +59,7 @@ export function ConnectWalletModalBase({
<ModalHeader>{`Select your ${isEmbed ? "account" : "wallet"}`}</ModalHeader>

<ModalBody gap={0}>
<ConnectWalletAlert type={type} status={status} />
<ConnectWalletAlert type={type} />

{enabledConnectors.map((connector) => (
<ConnectWalletButton
Expand Down
2 changes: 1 addition & 1 deletion dapp/src/components/shared/Alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import Spinner from "./Spinner"
const STATUSES = {
info: {
icon: IconInfoCircle,
colorScheme: "gold",
colorScheme: "blue",
kkosiorowska marked this conversation as resolved.
Show resolved Hide resolved
},
warning: {
icon: IconExclamationCircle,
Expand Down
12 changes: 3 additions & 9 deletions dapp/src/contexts/WalletConnectionAlertContext.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import { ConnectionAlert } from "#/components/ConnectWalletModal/ConnectWalletAlert"
import { AlertStatus } from "@chakra-ui/react"
import React, { createContext, useCallback, useMemo, useState } from "react"

type WalletConnectionAlertContextValue = {
type?: ConnectionAlert
status: AlertStatus
setConnectionAlert: (type: ConnectionAlert, status?: AlertStatus) => void
setConnectionAlert: (type: ConnectionAlert) => void
resetConnectionAlert: () => void
}

Expand All @@ -20,17 +18,14 @@ export function WalletConnectionAlertContextProvider({
children: React.ReactNode
}): React.ReactElement {
const [type, setType] = useState<ConnectionAlert>()
const [status, setStatus] = useState<AlertStatus>("error")

const resetConnectionAlert = useCallback(() => {
setType(undefined)
setStatus("error")
}, [setType])

const setConnectionAlert = useCallback(
(connectionAlert: ConnectionAlert, alertStatus: AlertStatus = "error") => {
(connectionAlert: ConnectionAlert) => {
setType(connectionAlert)
setStatus(alertStatus)
},
[setType],
)
Expand All @@ -39,11 +34,10 @@ export function WalletConnectionAlertContextProvider({
useMemo<WalletConnectionAlertContextValue>(
() => ({
type,
status,
setConnectionAlert,
resetConnectionAlert,
}),
[resetConnectionAlert, setConnectionAlert, status, type],
[resetConnectionAlert, setConnectionAlert, type],
)

return (
Expand Down
5 changes: 5 additions & 0 deletions dapp/src/theme/Alert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ const baseStyle = multiStyleConfig.definePartsStyle({
p: 4,
rounded: "xl",
},
title: {
fontWeight: "semibold",
mr: 0,
},

description: {
fontWeight: "medium",
textAlign: "start",
Expand Down
10 changes: 5 additions & 5 deletions dapp/src/theme/Modal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ const baseStyleHeader = defineStyle({
fontSize: "xl",
lineHeight: "xl",
fontWeight: "bold",
pt: { sm: 10 },
px: { sm: 10 },
pt: { sm: 8 },
px: { sm: 8 },
pb: 8,
})

Expand All @@ -51,15 +51,15 @@ const baseStyleBody = defineStyle({
alignItems: "center",
gap: 6,
pt: 0,
px: { base: 0, sm: 10 },
pb: { base: 0, sm: 10 },
px: { base: 0, sm: 8 },
pb: { base: 0, sm: 8 },
})

const baseStyleFooter = defineStyle({
flexDirection: "column",
gap: 6,
px: { base: 0, sm: 8 },
pb: { base: 0, sm: 10 },
pb: { base: 0, sm: 8 },
})

const multiStyleConfig = createMultiStyleConfigHelpers(parts.keys)
Expand Down
Loading