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.

Sign up for GitHub

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

custom blockexplorer #1200

Merged
merged 2 commits into from
Nov 26, 2024
Merged

custom blockexplorer #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5421764
custom blockexplorer
KillariDev Nov 22, 2024
839af3e
Merge branch 'main' into custom-blockexplorer
KillariDev Nov 26, 2024
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
3 changes: 2 additions & 1 deletion app/ts/components/pages/SettingsView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { defaultRpcs } from '../../background/settings.js'
import { getChainName } from '../../utils/constants.js'
import { getRpcList } from '../../background/storageVariables.js'
import { useComputed, useSignal } from '@preact/signals'
import { serialize } from '../../types/wire-types.js'

type CheckBoxSettingParam = {
text: string
Expand Down Expand Up @@ -220,7 +221,7 @@ const RpcSummary = ({ info }: { info: RpcEntry }) => {
const networkName = getChainName(info.chainId)

// rerender form if entry is updated in the background by specifying a unique key
const infoKey = Object.values(info).join('|')
const infoKey = JSON.stringify(serialize(RpcEntry, info))

return (
<li class = 'grid brief'>
Expand Down
11 changes: 9 additions & 2 deletions app/ts/components/subcomponents/ConfigureRpcConnection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,17 +191,19 @@ const ConfigureRpcForm = ({ defaultValues, onCancel, onSave, onRemove }: Configu

const parseRpcFormData = (formData: FormData) => {
const chainIdFromForm = formData.get('chainId')?.toString()

const blockExplorerUrlForm = formData.get('blockExplorerUrl')?.toString()
const blockExplorerApiKeyForm = formData.get('blockExplorerApiKey')?.toString()
const isBlockExplorerDefined = blockExplorerUrlForm !== undefined && blockExplorerApiKeyForm !== undefined && blockExplorerUrlForm.length > 0 && blockExplorerApiKeyForm.length > 0
const newRpcEntry = {
name: formData.get('name')?.toString() || '',
chainId: chainIdFromForm ? `0x${ BigInt(chainIdFromForm).toString(16) }` : '',
httpsRpc: formData.get('httpsRpc')?.toString() || '',
currencyName: formData.get('currencyName')?.toString() || '',
currencyTicker: formData.get('currencyTicker')?.toString() || '',
...isBlockExplorerDefined ? { blockExplorer: { apiUrl: blockExplorerUrlForm || '', apiKey: blockExplorerApiKeyForm } } : {},
minimized: true,
primary: false,
}

return RpcEntry.safeParse(newRpcEntry)
}

Expand All @@ -225,6 +227,9 @@ const ConfigureRpcForm = ({ defaultValues, onCancel, onSave, onRemove }: Configu
return defaultValues?.currencyName || ''
})

const blockExplorerUrlDefault = useComputed(() => defaultValues?.blockExplorer?.apiUrl || '')
const blockExplorerApiKeyDefault = useComputed(() => defaultValues?.blockExplorer?.apiKey || '')

return (
<form method = 'dialog' class = 'grid' style = '--gap-y: 1.5rem' onSubmit = { handleFormSubmit }>
<header class = 'grid' style = '--grid-cols: 1fr auto'>
Expand All @@ -242,6 +247,8 @@ const ConfigureRpcForm = ({ defaultValues, onCancel, onSave, onRemove }: Configu
<TextInput label = 'Chain ID' name = 'chainId' style = '--area: 5 / span 1' defaultValue = { chainIdDefault.value } required readOnly />
<TextInput label = 'Currency Name *' name = 'currencyName' defaultValue = { currencyNameDefault.value } style = '--area: 7 / span 1' required />
<TextInput label = 'Currency Ticker *' name = 'currencyTicker' defaultValue = { currencyTickerDefault.value } style = '--area: 7 / span 1' required />
<TextInput label = 'Block Explorer Url' name = 'blockExplorerUrl' defaultValue = { blockExplorerUrlDefault.value } style = '--area: 8 / span 1' />
<TextInput label = 'Block Explorer Api Key' name = 'blockExplorerApiKey' defaultValue = { blockExplorerApiKeyDefault.value } style = '--area: 8 / span 1' />
</div>
</main>

Expand Down
Loading