Skip to content

Commit 70353f8

Browse files
committed
fix issues after history reorg
1 parent ad1b6c1 commit 70353f8

File tree

5 files changed

+16
-26
lines changed

5 files changed

+16
-26
lines changed

typescript/ui/src/components/nav/Footer.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { GithubIcon } from '@hyperlane-xyz/widgets';
21
import Image from 'next/image';
32
import Link from 'next/link';
43
import { ReactNode } from 'react';
54

6-
import { DiscordIcon, GithubIcon, HyperlaneLogo, TwitterIcon } from '@hyperlane-xyz/widgets';
5+
import { GithubIcon } from '@hyperlane-xyz/widgets';
76

87
import { links } from '../../consts/links';
98
import Logo from '../../images/logos/app-logo.svg';

typescript/ui/src/features/WarpContextInitGate.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { useTimeout } from '@hyperlane-xyz/widgets';
1+
import { ColorPalette, SpinnerIcon, useTimeout } from '@hyperlane-xyz/widgets';
22
import { PropsWithChildren, useState } from 'react';
3-
import { Spinner } from '../components/animation/Spinner';
43
import { useReadyMultiProvider } from './chains/hooks';
54

65
const INIT_TIMEOUT = 10_000; // 10 seconds

typescript/ui/src/features/transfer/TransferTokenForm.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
import { TokenAmount, WarpCore } from '@hyperlane-xyz/sdk';
2-
import { ProtocolType, errorToString, isNullish, toWei } from '@hyperlane-xyz/utils';
3-
import { ChevronIcon, IconButton, SpinnerIcon, SwapIcon } from '@hyperlane-xyz/widgets';
2+
import { errorToString, isNullish, ProtocolType, toWei } from '@hyperlane-xyz/utils';
3+
import {
4+
AccountInfo,
5+
ChevronIcon,
6+
getAccountAddressAndPubKey,
7+
IconButton,
8+
SpinnerIcon,
9+
SwapIcon,
10+
useAccountAddressForChain,
11+
useAccounts,
12+
} from '@hyperlane-xyz/widgets';
413
import BigNumber from 'bignumber.js';
514
import { Form, Formik, useFormikContext } from 'formik';
615
import { useMemo, useState } from 'react';
@@ -10,7 +19,6 @@ import { ConnectAwareSubmitButton } from '../../components/buttons/ConnectAwareS
1019
import { SolidButton } from '../../components/buttons/SolidButton';
1120
import { TextField } from '../../components/input/TextField';
1221
import { config } from '../../consts/config';
13-
import SwapIcon from '../../images/icons/swap.svg';
1422
import { Color } from '../../styles/Color';
1523
import { logger } from '../../utils/logger';
1624
import { ChainConnectionWarning } from '../chains/ChainConnectionWarning';

typescript/ui/src/features/transfer/TransfersDetailsModal.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
import { ProtocolType } from '@hyperlane-xyz/utils';
22
import {
3+
CopyButton,
34
MessageStatus,
45
MessageTimeline,
56
Modal,
67
SpinnerIcon,
8+
useAccountForChain,
79
useMessageTimeline,
810
useTimeout,
911
useWalletDetails,
1012
WideChevronIcon,
1113
} from '@hyperlane-xyz/widgets';
1214
import Image from 'next/image';
1315
import { useCallback, useEffect, useMemo, useState } from 'react';
14-
import { CopyButton } from '../../components/buttons/CopyButton';
1516
import { ChainLogo } from '../../components/icons/ChainLogo';
1617
import { TokenIcon } from '../../components/icons/TokenIcon';
1718
import LinkIcon from '../../images/icons/external-link-icon.svg';

typescript/ui/src/features/wallet/SideBarMenu.tsx

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { AccountList } from '@hyperlane-xyz/widgets';
2-
import { SpinnerIcon } from '@hyperlane-xyz/widgets';
1+
import { AccountList, SpinnerIcon } from '@hyperlane-xyz/widgets';
32
import Image from 'next/image';
43
import { useEffect, useMemo, useRef, useState } from 'react';
54
import { toast } from 'react-toastify';
@@ -78,28 +77,12 @@ export function SideBarMenu({
7877
<div className="w-full rounded-t-md bg-primary-500 px-3.5 py-2 text-base font-normal tracking-wider text-white">
7978
Connected Wallets
8079
</div>
81-
<<<<<<< HEAD
8280
<AccountList
8381
multiProvider={multiProvider}
8482
onClickConnectWallet={onClickConnectWallet}
8583
onCopySuccess={onCopySuccess}
8684
className="px-3 py-3"
8785
/>
88-
=======
89-
<div className="my-3 space-y-2 px-3">
90-
{readyAccounts.map((acc, i) => (
91-
<AccountSummary key={i} account={acc} />
92-
))}
93-
<button onClick={onConnectWallet} className={`${styles.btn} pl-2.5`}>
94-
<WalletIcon width={17} height={14} />
95-
<div className="ml-2">Connect wallet</div>
96-
</button>
97-
<button onClick={onClickDisconnect} className={`${styles.btn} pl-2.5`}>
98-
<LogoutIcon width={20} height={20} />
99-
<div className="ml-2">Disconnect all wallets</div>
100-
</button>
101-
</div>
102-
>>>>>>> daa5453 (feat: remove redundant components, add from widgets)
10386
<div className="mb-4 w-full bg-primary-500 px-3.5 py-2 text-base font-normal tracking-wider text-white">
10487
Transfer History
10588
</div>

0 commit comments

Comments
 (0)