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

[Issue-813]: Still allow add network from dApp in case cannot connect to this provider #1089

Merged
merged 1 commit into from
Oct 21, 2023
Merged

[Issue-813]: Still allow add network from dApp in case cannot connect to this provider #1089

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
155 changes: 136 additions & 19 deletions src/screens/Confirmations/variants/AddNetworkConfirmation/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
import { ConfirmationDefinitions, ConfirmationResult } from '@subwallet/extension-base/background/KoniTypes';
import { ConfirmationContent, ConfirmationGeneralInfo } from 'components/common/Confirmation';
import ConfirmationFooter from 'components/common/Confirmation/ConfirmationFooter';
import { Button, Icon } from 'components/design-system-ui';
import { ActivityIndicator, Button, Icon } from 'components/design-system-ui';
import { FieldBase } from 'components/Field/Base';
import { useSubWalletTheme } from 'hooks/useSubWalletTheme';
import { CheckCircle, Globe, ShareNetwork, XCircle } from 'phosphor-react-native';
import React, { useCallback, useMemo, useState } from 'react';
import { CheckCircle, Globe, ShareNetwork, WifiHigh, WifiSlash, XCircle } from 'phosphor-react-native';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { Text, View } from 'react-native';
import { completeConfirmation } from 'messaging/index';
import { completeConfirmation, validateCustomChain } from 'messaging/index';
import i18n from 'utils/i18n/i18n';

import createStyle from './styles';
import { ValidationInfo } from 'screens/ImportNetwork';
import { isUrl } from 'utils/index';
import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
import { Warning } from 'components/Warning';

interface Props {
request: ConfirmationDefinitions['addNetworkRequest'][0];
Expand All @@ -28,7 +32,10 @@ const AddNetworkConfirmation: React.FC<Props> = (props: Props) => {
const {
payload: { chainEditInfo, chainSpec, mode },
} = request;

const [isShowConnectionStatus, setIsShowConnectionStatus] = useState(false);
const [providerValidation, setProviderValidation] = useState<ValidationInfo>({ status: '' });
const [isValidating, setIsValidating] = useState(false);
const [errorMessage, setErrorMessage] = useState<string | undefined>(undefined);
const theme = useSubWalletTheme().swThemes;

const styles = useMemo(() => createStyle(theme), [theme]);
Expand All @@ -54,33 +61,117 @@ const AddNetworkConfirmation: React.FC<Props> = (props: Props) => {
}, 300);
}, [request]);

const handleErrorMessage = useCallback((errorCode: _CHAIN_VALIDATION_ERROR) => {
switch (errorCode) {
case _CHAIN_VALIDATION_ERROR.CONNECTION_FAILURE:
return i18n.errorMessage.cannotConnectToThisProvider;
case _CHAIN_VALIDATION_ERROR.EXISTED_PROVIDER:
return i18n.errorMessage.thisChainHasAlreadyBeenAdded;
case _CHAIN_VALIDATION_ERROR.EXISTED_CHAIN:
return i18n.errorMessage.thisChainHasAlreadyBeenAdded;
default:
return i18n.errorMessage.validateProviderError;
}
}, []);

const providerValidateFunc = useCallback(
(provider: string) => {
if (isUrl(provider)) {
setIsShowConnectionStatus(true);
setIsValidating(true);
const parsedProvider = provider.split(' ').join('');

validateCustomChain(parsedProvider)
.then(result => {
setIsValidating(false);

if (result.success) {
setProviderValidation({ status: 'success' });
setErrorMessage(undefined);
}

if (result.error) {
setProviderValidation({ status: 'error' });
setErrorMessage(handleErrorMessage(result.error));
}
})
.catch(() => {
setIsValidating(false);
setProviderValidation({ status: 'error' });
setErrorMessage(i18n.errorMessage.validateProviderError);
});
} else {
setProviderValidation({ status: '' });
setIsShowConnectionStatus(false);
setErrorMessage(i18n.errorMessage.invalidProviderUrl);
}
},
[handleErrorMessage],
);

useEffect(() => {
providerValidateFunc(chainEditInfo.providers[chainEditInfo.currentProvider]);
}, [chainEditInfo.currentProvider, chainEditInfo.providers, providerValidateFunc]);

const providerSuffix = useCallback(() => {
if (!isShowConnectionStatus) {
return <></>;
}

if (providerValidation.status === 'success') {
return (
<Icon size={'sm'} iconColor={theme.colorSuccess} phosphorIcon={WifiHigh} type={'phosphor'} weight={'bold'} />
);
}

if (isValidating) {
return <ActivityIndicator size={20} indicatorColor={theme.colorTextLight5} />;
}

if (providerValidation.status === 'error') {
return <Icon size="sm" iconColor={theme['gray-4']} phosphorIcon={WifiSlash} type={'phosphor'} weight={'bold'} />;
}

return <></>;
}, [isShowConnectionStatus, isValidating, providerValidation.status, theme]);

return (
<React.Fragment>
<ConfirmationContent gap={theme.size}>
<ConfirmationGeneralInfo request={request} gap={theme.size} />
<Text style={styles.title}>{i18n.confirmation.addNetworkRequest}</Text>
<View>
<FieldBase>
<View style={styles.textField}>
<Icon iconColor={theme['gray-3']} size="md" phosphorIcon={ShareNetwork} />
<Text style={styles.text}>
{chainEditInfo.providers[chainEditInfo.currentProvider] || i18n.confirmation.providerUrl}
</Text>
<View style={styles.networkUrlField}>
<View style={{ flexDirection: 'row', alignItems: 'center', gap: theme.sizeXS }}>
<Icon iconColor={theme['gray-3']} size="md" phosphorIcon={ShareNetwork} />
<Text style={[styles.text, !!errorMessage && { color: theme.colorError }]}>
{chainEditInfo.providers[chainEditInfo.currentProvider] || i18n.confirmation.providerUrl}
</Text>
</View>
{providerSuffix()}
</View>
</FieldBase>

{errorMessage && <Warning isDanger message={errorMessage} style={{ marginBottom: 8 }} />}
<View style={styles.row}>
<View style={styles.row1column1}>
<FieldBase>
<View style={styles.textField}>
<Icon iconColor={theme['gray-3']} size="md" phosphorIcon={Globe} />
<Text style={styles.text}>{chainEditInfo.name || i18n.common.network}</Text>
<Text style={[styles.text, { color: !chainEditInfo.name ? theme.colorTextLight4 : theme.colorText }]}>
{chainEditInfo.name || i18n.common.network}
</Text>
</View>
</FieldBase>
</View>
<View style={styles.row1column2}>
<FieldBase>
<View style={styles.textField}>
<Text style={styles.text}>{chainEditInfo.symbol || i18n.common.symbol}</Text>
<Text
style={[styles.text, { color: !chainEditInfo.symbol ? theme.colorTextLight4 : theme.colorText }]}>
{chainEditInfo.symbol || i18n.common.symbol}
</Text>
</View>
</FieldBase>
</View>
Expand All @@ -89,31 +180,49 @@ const AddNetworkConfirmation: React.FC<Props> = (props: Props) => {
<View style={styles.row2column}>
<FieldBase>
<View style={styles.textField}>
<Text style={styles.text}>{chainSpec?.decimals || i18n.common.decimals}</Text>
<Text
style={[styles.text, { color: !chainSpec?.decimals ? theme.colorTextLight4 : theme.colorText }]}>
{chainSpec?.decimals || i18n.common.decimals}
</Text>
</View>
</FieldBase>
</View>
<View style={styles.row2column}>
<FieldBase>
<View style={styles.textField}>
<Text style={styles.text}>{chainSpec?.evmChainId || i18n.confirmation.chainId}</Text>
<Text
style={[styles.text, { color: !chainSpec?.evmChainId ? theme.colorTextLight4 : theme.colorText }]}>
{chainSpec?.evmChainId || i18n.confirmation.chainId}
</Text>
</View>
</FieldBase>
</View>
</View>
<FieldBase>
<View style={styles.textField}>
<Text style={styles.text}>{chainEditInfo.chainType || i18n.confirmation.chainType}</Text>
<Text
style={[styles.text, { color: !chainEditInfo.chainType ? theme.colorTextLight4 : theme.colorText }]}>
{chainEditInfo.chainType || i18n.confirmation.chainType}
</Text>
</View>
</FieldBase>
<FieldBase>
<View style={styles.textField}>
<Text style={styles.text}>{chainEditInfo.blockExplorer || i18n.confirmation.blockExplorer}</Text>
<Text
style={[
styles.text,
{ color: !chainEditInfo.blockExplorer ? theme.colorTextLight4 : theme.colorText },
]}>
{chainEditInfo.blockExplorer || i18n.confirmation.blockExplorer}
</Text>
</View>
</FieldBase>
<FieldBase>
<View style={styles.textField}>
<Text style={styles.text}>{chainEditInfo.crowdloanUrl || i18n.confirmation.crowdloanURL}</Text>
<Text
style={[styles.text, { color: !chainEditInfo.crowdloanUrl ? theme.colorTextLight4 : theme.colorText }]}>
{chainEditInfo.crowdloanUrl || i18n.confirmation.crowdloanURL}
</Text>
</View>
</FieldBase>
</View>
Expand All @@ -124,8 +233,16 @@ const AddNetworkConfirmation: React.FC<Props> = (props: Props) => {
</Button>
<Button
block={true}
icon={<Icon phosphorIcon={CheckCircle} weight="fill" />}
disabled={mode === 'update'}
icon={
<Icon
phosphorIcon={CheckCircle}
weight="fill"
iconColor={
mode === 'update' || providerValidation.status !== 'success' ? theme.colorTextLight4 : theme.colorWhite
}
/>
}
disabled={mode === 'update' || providerValidation.status !== 'success'}
onPress={onApprove}
loading={loading}>
{i18n.buttonTitles.approve}
Expand Down
12 changes: 12 additions & 0 deletions src/screens/Confirmations/variants/AddNetworkConfirmation/styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { StyleSheet, TextStyle, ViewStyle } from 'react-native';
import { ThemeTypes } from 'styles/themes';
import { FontMedium, FontSemiBold } from 'styles/sharedStyles';

export interface ComponentStyle {
title: TextStyle;
text: TextStyle;
textField: ViewStyle;
networkUrlField: ViewStyle;
row: ViewStyle;
row1column1: ViewStyle;
row1column2: ViewStyle;
Expand All @@ -20,17 +22,27 @@ export default (theme: ThemeTypes) => {
alignItems: 'center',
gap: theme.sizeXS,
},
networkUrlField: {
display: 'flex',
flexDirection: 'row',
padding: theme.paddingSM,
alignItems: 'center',
gap: theme.sizeXS,
justifyContent: 'space-between',
},
text: {
color: theme.colorText,
fontSize: theme.fontSizeHeading6,
lineHeight: theme.fontSizeHeading6 * theme.lineHeightHeading6,
...FontMedium,
},
title: {
color: theme.colorTextBase,
textAlign: 'center',
width: '100%',
fontSize: theme.fontSizeHeading4,
lineHeight: theme.fontSizeHeading4 * theme.lineHeightHeading4,
...FontSemiBold,
},
row: {
display: 'flex',
Expand Down
2 changes: 1 addition & 1 deletion src/screens/ImportNetwork.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { useToast } from 'react-native-toast-notifications';
import { HIDE_MODAL_DURATION } from 'constants/index';
import i18n from 'utils/i18n/i18n';

interface ValidationInfo {
export interface ValidationInfo {
status: ValidateStatus;
message?: string[];
}
Expand Down
Loading