Skip to content

Commit 26812b0

Browse files
committed
refine showing error
1 parent 540427c commit 26812b0

File tree

3 files changed

+12
-28
lines changed

3 files changed

+12
-28
lines changed

packages/checkout/widgets-lib/src/components/UnableToConnectDrawer/UnableToConnectDrawer.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@ export interface UnableToConnectDrawerProps {
1717
checkout: Checkout;
1818
onCloseDrawer: () => void;
1919
onTryAgain?: () => void;
20-
message?: string;
2120
}
2221
export function UnableToConnectDrawer({
2322
visible,
2423
checkout,
2524
onCloseDrawer,
2625
onTryAgain,
27-
message,
2826
}: UnableToConnectDrawerProps) {
2927
const { t } = useTranslation();
3028

@@ -104,7 +102,7 @@ export function UnableToConnectDrawer({
104102
paddingX: 'base.spacing.x6',
105103
}}
106104
>
107-
{message ?? t('drawers.walletConnectionError.unableToConnect.body')}
105+
{t('drawers.walletConnectionError.unableToConnect.body')}
108106
</Body>
109107
</Box>
110108
</Box>

packages/checkout/widgets-lib/src/locales/en.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,11 +1218,6 @@
12181218
"body": "Check your wallet and try again, or close and try a different option",
12191219
"actionButtonText": "Try again"
12201220
},
1221-
"passportProviderError": {
1222-
"heading": "Unable to connect",
1223-
"body": "Have you called `await passport.connectEvm()` to initialize the passport provider?",
1224-
"actionButtonText": "Try again"
1225-
},
12261221
"changedYourMind": {
12271222
"heading": "Changed your mind?",
12281223
"body": "Make sure pop ups are enabled and follow the prompts in your wallet to connect",

packages/checkout/widgets-lib/src/widgets/connect/components/WalletList.tsx

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,7 @@ export function WalletList(props: WalletListProps) {
8080
const { isWalletConnectEnabled, openWalletConnectModal } = useWalletConnect();
8181
const walletConnectItemRef = useRef(null);
8282
const [showChangedYourMindDrawer, setShowChangedYourMindDrawer] = useState(false);
83-
const [unableToConnectDrawerState, setUnableToConnectDrawerState] = useState({
84-
visible: false,
85-
message: undefined as string | undefined,
86-
});
83+
const [showUnableToConnectDrawer, setShowUnableToConnectDrawer] = useState(false);
8784
const [showNonPassportWarning, setShowNonPassportWarning] = useState(false);
8885
const [chosenProviderDetail, setChosenProviderDetail] = useState<EIP6963ProviderDetail>();
8986

@@ -204,22 +201,21 @@ export function WalletList(props: WalletListProps) {
204201
// eslint-disable-next-line no-console
205202
console.error('Connect error', err);
206203

207-
setUnableToConnectDrawerState({ visible: true, message: undefined });
204+
setShowUnableToConnectDrawer(true);
208205
}
209206
}
210207
} catch (err: any) {
211208
if (
212209
isError(err, 'INVALID_ARGUMENT')
213210
&& err.message.includes('value={ "ethereumProvider": { "isPassport": true } }')) {
214-
setUnableToConnectDrawerState({
215-
visible: true,
216-
message: t('drawers.walletConnectionError.passportProviderError.body'),
217-
});
218-
return;
211+
// eslint-disable-next-line no-console
212+
console.error('Invalid type', 'Unable to connect to the Passport provider');
219213
}
214+
220215
// eslint-disable-next-line no-console
221216
console.error('Connect unknown error', err);
222-
setUnableToConnectDrawerState({ visible: true, message: undefined });
217+
218+
setShowUnableToConnectDrawer(true);
223219
}
224220
},
225221
[checkout],
@@ -300,7 +296,7 @@ export function WalletList(props: WalletListProps) {
300296
}
301297

302298
setShowChangedYourMindDrawer(false);
303-
setUnableToConnectDrawerState({ visible: false, message: undefined });
299+
setShowUnableToConnectDrawer(false);
304300
setChosenProviderDetail(providerDetail);
305301
track({
306302
userJourney: UserJourney.CONNECT,
@@ -456,15 +452,10 @@ export function WalletList(props: WalletListProps) {
456452
/>
457453

458454
<UnableToConnectDrawer
459-
visible={unableToConnectDrawerState.visible}
455+
visible={showUnableToConnectDrawer}
460456
checkout={checkout!}
461-
onCloseDrawer={() => {
462-
setUnableToConnectDrawerState({ visible: false, message: undefined });
463-
}}
464-
onTryAgain={() => {
465-
setUnableToConnectDrawerState({ visible: false, message: undefined });
466-
}}
467-
message={unableToConnectDrawerState.message}
457+
onCloseDrawer={() => setShowUnableToConnectDrawer(false)}
458+
onTryAgain={() => setShowUnableToConnectDrawer(false)}
468459
/>
469460

470461
<NonPassportWarningDrawer

0 commit comments

Comments
 (0)