Skip to content

Commit 8d9431d

Browse files
committed
Revert "add ConnectEmbed + Fix double connection issue with Safe/Smart in ConnectWallet (#1952)"
This reverts commit fb0cb67.
1 parent 914befd commit 8d9431d

File tree

14 files changed

+231
-723
lines changed

14 files changed

+231
-723
lines changed

packages/react-core/src/core/providers/thirdweb-wallet-provider.tsx

Lines changed: 81 additions & 303 deletions
Large diffs are not rendered by default.

packages/react/src/evm/index.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
export {
2-
ConnectEmbed,
3-
type ConnectEmbedProps,
4-
} from "../wallet/ConnectWallet/Modal/ConnectEmbed";
5-
61
export {
72
useIsWalletModalOpen,
83
useSetIsWalletModalOpen,
@@ -15,10 +10,7 @@ export {
1510
ConnectWallet,
1611
type ConnectWalletProps,
1712
} from "../wallet/ConnectWallet/ConnectWallet";
18-
export {
19-
ConnectModalInline,
20-
type ConnectModalInlineProps,
21-
} from "../wallet/ConnectWallet/Modal/ConnectModalInline";
13+
export { ConnectModalInline } from "../wallet/ConnectWallet/Modal/ConnectModalInline";
2214

2315
export { NetworkSelector } from "../wallet/ConnectWallet/NetworkSelector";
2416
export type { NetworkSelectorProps } from "../wallet/ConnectWallet/NetworkSelector";

packages/react/src/evm/locales/en.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ export function enDefault() {
5252
personalWallet: "Personal Wallet",
5353
smartWallet: "Smart Wallet",
5454
or: "OR",
55-
goBackButton: "Back",
5655
download: {
5756
chrome: "Download Chrome Extension",
5857
android: "Download on Google Play",

packages/react/src/evm/locales/es.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ export function esDefault(): ThirdwebLocale {
5454
personalWallet: "Cartera personal",
5555
smartWallet: "Cartera inteligente",
5656
or: "O",
57-
goBackButton: "Atras",
5857
download: {
5958
chrome: "Descargar extensión para Chrome",
6059
android: "Descargar en Google Play",

packages/react/src/evm/locales/ja.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ export function jaDefault(): ThirdwebLocale {
5353
personalWallet: "パーソナルウォレット",
5454
smartWallet: "スマートウォレット",
5555
or: "または",
56-
goBackButton: "戻る", // TODO - check translation
5756
download: {
5857
chrome: "Chrome拡張をダウンロード",
5958
android: "Google Playでダウンロード",

packages/react/src/evm/providers/wallet-ui-states-provider.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export type ModalConfig = {
2020
onLogin?: (token: string) => void;
2121
onLogout?: () => void;
2222
};
23-
isEmbed?: boolean;
2423
};
2524

2625
const WalletModalOpen = /* @__PURE__ */ createContext(false);
@@ -48,7 +47,6 @@ export const WalletUIStatesProvider = (
4847
termsOfServiceUrl?: string;
4948
privacyPolicyUrl?: string;
5049
welcomeScreen?: WelcomeScreen;
51-
isEmbed?: boolean;
5250
}>,
5351
) => {
5452
const [isWalletModalOpen, setIsWalletModalOpen] = useState(false);
@@ -64,7 +62,6 @@ export const WalletUIStatesProvider = (
6462
privacyPolicyUrl: props.privacyPolicyUrl,
6563
welcomeScreen: props.welcomeScreen,
6664
titleIconUrl: props.titleIconUrl,
67-
isEmbed: props.isEmbed,
6865
});
6966

7067
return (

packages/react/src/wallet/ConnectWallet/Modal/ConnectEmbed.tsx

Lines changed: 0 additions & 140 deletions
This file was deleted.

packages/react/src/wallet/ConnectWallet/Modal/ConnectModal.tsx

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
useThirdwebAuthContext,
88
useUser,
99
useWallet,
10-
useWalletContext,
1110
useWallets,
1211
} from "@thirdweb-dev/react-core";
1312
import {
@@ -44,8 +43,6 @@ export const ConnectModalContent = (props: {
4443
const walletConfigs = useWallets();
4544
const connectionStatus = useConnectionStatus();
4645
const disconnect = useDisconnect();
47-
const { setIsConnectingToPersonalWallet, personalWalletInfo } =
48-
useWalletContext();
4946

5047
const isWalletModalOpen = useIsWalletModalOpen();
5148
const setIsWalletModalOpen = useSetIsWalletModalOpen();
@@ -62,17 +59,13 @@ export const ConnectModalContent = (props: {
6259
const authConfig = useThirdwebAuthContext();
6360

6461
const closeModal = () => {
65-
personalWalletInfo.disconnect();
66-
setIsConnectingToPersonalWallet(false);
67-
6862
setIsWalletModalOpen(false);
6963
onModalUnmount(() => {
7064
setScreen(initialScreen);
7165
});
7266
};
7367

7468
const { setHideModal } = props;
75-
7669
const handleConnected = useCallback(() => {
7770
const requiresSignIn = modalConfig.auth?.loginOptional
7871
? false
@@ -268,9 +261,6 @@ export const ConnectModal = () => {
268261
wallet,
269262
]);
270263

271-
const { setIsConnectingToPersonalWallet, personalWalletInfo } =
272-
useWalletContext();
273-
274264
return (
275265
<CustomThemeProvider theme={theme}>
276266
<Modal
@@ -280,9 +270,6 @@ export const ConnectModal = () => {
280270
setOpen={(value) => {
281271
setIsWalletModalOpen(value);
282272
if (!value) {
283-
setIsConnectingToPersonalWallet(false);
284-
personalWalletInfo.disconnect();
285-
286273
const requiresSignIn = auth?.loginOptional
287274
? false
288275
: !!authConfig?.authUrl && !user?.address;

0 commit comments

Comments
 (0)