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

Jump to bottom

fix(subbridge): remove polkadotXcm #354

Merged
merged 1 commit into from
Nov 3, 2023
Merged

fix(subbridge): remove polkadotXcm #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion apps/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@talismn/connect-wallets": "^1.2.3",
"@tanstack/react-query": "^4.36.1",
"@tanstack/react-query-devtools": "^4.36.1",
"@types/react": "^18.2.33",
"@types/react": "^18.2.34",
"@types/react-dom": "^18.2.14",
"ajv": "^8.12.0",
"date-fns": "^2.30.0",
Expand Down
6 changes: 3 additions & 3 deletions apps/index/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@mui/lab": "5.0.0-alpha.151",
"@mui/material": "^5.14.16",
"@next/bundle-analyzer": "^14.0.1",
"@phala/index": "^1.0.40",
"@phala/index": "^1.0.39",
"@phala/lib": "workspace:*",
"@phala/store": "workspace:*",
"@phala/util": "workspace:*",
Expand All @@ -29,7 +29,7 @@
"@talismn/connect-ui": "^1.1.2",
"@talismn/connect-wallets": "^1.2.3",
"decimal.js": "^10.4.3",
"ethers": "^6.8.0",
"ethers": "^6.8.1",
"jotai": "^2.5.0",
"jotai-devtools": "^0.7.0",
"lodash-es": "^4.17.21",
Expand All @@ -48,7 +48,7 @@
"@swc-jotai/react-refresh": "^0.1.0",
"@types/lodash-es": "^4.17.10",
"@types/node": "^18.18.8",
"@types/react": "^18.2.33",
"@types/react": "^18.2.34",
"@types/react-dom": "^18.2.14",
"eslint": "^8.52.0",
"eslint-config-next": "^14.0.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/subbridge/components/BridgeBody/Action/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const Action: FC = () => {
{isWalletConnected && fromChain.kind === 'evm' && (
<EvmAction onConfirm={onConfirm} />
)}
{isWalletConnected && fromChain.kind === 'polkadot' && (
{isWalletConnected && fromChain.kind === 'substrate' && (
<PolkadotAction onConfirm={onConfirm} />
)}

Expand Down
2 changes: 1 addition & 1 deletion apps/subbridge/components/BridgeBody/AmountInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const AmountInput: FC<BoxProps & Pick<InputProps, 'endAdornment'>> = ({
)

const fromNativeChain =
fromChain.kind === 'polkadot' && fromChain.nativeAsset === asset.id
fromChain.kind === 'substrate' && fromChain.nativeAsset === asset.id

return (
<Box {...props}>
Expand Down
4 changes: 2 additions & 2 deletions apps/subbridge/components/BridgeBody/DestinationAccountInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const DestinationAccountInput: FC<BoxProps> = (props) => {
) {
setDestinationAccount(evmAccount)
} else if (
fromChain.kind === 'polkadot' &&
fromChain.kind === 'substrate' &&
polkadotAccount?.address != null
) {
setDestinationAccount(polkadotAccount.address)
Expand All @@ -72,7 +72,7 @@ const DestinationAccountInput: FC<BoxProps> = (props) => {

const displayValue = useMemo(() => {
if (
toChain.kind === 'polkadot' &&
toChain.kind === 'substrate' &&
useSameAccountEnabled &&
polkadotAccount != null &&
polkadotAccount.address === destinationAccount
Expand Down
2 changes: 1 addition & 1 deletion apps/subbridge/components/BridgeConfirmationDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ const Detail: FC<
}
> = ({kind, chain, account, asset, amount, ...paperProps}) => {
const displayAccount = useMemo(() => {
if (chain.kind === 'polkadot' && account.length > 0) {
if (chain.kind === 'substrate' && account.length > 0) {
const {ss58Format} = chain
return encodeAddress(account, ss58Format)
}
Expand Down
2 changes: 1 addition & 1 deletion apps/subbridge/components/ConnectWalletButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const ConnectWalletButton: FC<ButtonProps> = (props) => {
return <ConnectEvmWalletButton {...props} />
}

if (fromChain.kind === 'polkadot') {
if (fromChain.kind === 'substrate') {
return <ConnectPolkadotButton {...props} />
}

Expand Down
2 changes: 1 addition & 1 deletion apps/subbridge/components/TopBar/Account/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const Account: FC = () => {
return <EvmAccount />
}

if (fromChain.kind === 'polkadot') {
if (fromChain.kind === 'substrate') {
return <PolkadotAccount />
}

Expand Down
Loading