Skip to content

Commit 440944b

Browse files
authored
Merge pull request #12595 from ethereum/staging
`staging` -> `dev`
2 parents f3b8253 + 7f51a76 commit 440944b

File tree

5 files changed

+22
-49
lines changed

5 files changed

+22
-49
lines changed

src/components/Glossary/GlossaryTooltip/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const GlossaryTooltip = ({ children, termKey }: GlossaryTooltipProps) => {
2626
options={{ ns: "glossary-tooltip" }}
2727
/>
2828
}
29-
onOpen={() => {
29+
onBeforeOpen={() => {
3030
trackCustomEvent({
3131
eventCategory: "Glossary Tooltip",
3232
eventAction: cleanPath(asPath),

src/components/Tooltip/index.tsx

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,15 @@ import { isMobile } from "@/lib/utils/isMobile"
1414
export interface IProps extends PopoverProps {
1515
content: ReactNode
1616
children?: ReactNode
17+
onBeforeOpen?: () => void
1718
}
1819

19-
const Tooltip: React.FC<IProps> = ({ content, children, ...rest }) => {
20+
const Tooltip: React.FC<IProps> = ({
21+
content,
22+
children,
23+
onBeforeOpen,
24+
...rest
25+
}) => {
2026
const { isOpen, onOpen, onClose } = useDisclosure()
2127

2228
// Close the popover when the user scrolls.
@@ -45,10 +51,15 @@ const Tooltip: React.FC<IProps> = ({ content, children, ...rest }) => {
4551
}
4652
}, [isOpen, onClose])
4753

54+
const handleOpen = () => {
55+
onBeforeOpen?.()
56+
onOpen()
57+
}
58+
4859
return (
4960
<Popover
5061
isOpen={isOpen}
51-
onOpen={onOpen}
62+
onOpen={handleOpen}
5263
onClose={onClose}
5364
placement="top"
5465
trigger={isMobile() ? "click" : "hover"}

src/data/wallets/wallet-data.ts

Lines changed: 7 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ export const walletsData: WalletData[] = [
4545
image: KeystoneImage,
4646
brand_color: "#ffffff",
4747
url: "https://keyst.one/",
48-
wallet_live_date: "Dec 2018",
4948
active_development_team: true,
5049
languages_supported: ["en", "zh", "es", "ko"],
5150
twitter: "https://twitter.com/KeystoneWallet",
@@ -91,7 +90,6 @@ export const walletsData: WalletData[] = [
9190
image: LoopringImage,
9291
brand_color: "#ffffff",
9392
url: "https://loopring.io/#/wallet",
94-
wallet_live_date: "Nov 25, 2020",
9593
active_development_team: true,
9694
languages_supported: ["en", "zh"],
9795
twitter: "https://twitter.com/loopringorg",
@@ -133,12 +131,11 @@ export const walletsData: WalletData[] = [
133131
documentation: "",
134132
},
135133
{
136-
last_updated: "March 7, 2024",
134+
last_updated: "2024-03-07",
137135
name: "Argent",
138136
image: ArgentImage,
139137
brand_color: "#ffffff",
140138
url: "https://www.argent.xyz/",
141-
wallet_live_date: "2018",
142139
active_development_team: true,
143140
languages_supported: ["en"],
144141
twitter: "https://twitter.com/argenthq",
@@ -184,7 +181,6 @@ export const walletsData: WalletData[] = [
184181
image: CoinbaseImage,
185182
brand_color: "#0052FF",
186183
url: "https://www.coinbase.com/wallet",
187-
wallet_live_date: "2018",
188184
active_development_team: true,
189185
languages_supported: [
190186
"en",
@@ -241,7 +237,6 @@ export const walletsData: WalletData[] = [
241237
image: FrameImage,
242238
brand_color: "#222021",
243239
url: "https://frame.sh",
244-
wallet_live_date: "April 2019",
245240
active_development_team: true,
246241
languages_supported: ["en"],
247242
twitter: "https://twitter.com/0xFrame",
@@ -285,7 +280,6 @@ export const walletsData: WalletData[] = [
285280
image: MetaMaskImage,
286281
brand_color: "#ffffff",
287282
url: "https://metamask.io",
288-
wallet_live_date: "2016",
289283
active_development_team: true,
290284
languages_supported: [
291285
"en",
@@ -379,7 +373,6 @@ export const walletsData: WalletData[] = [
379373
image: SafeImage,
380374
brand_color: "#12ff80",
381375
url: "https://safe.global/",
382-
wallet_live_date: "2017",
383376
active_development_team: true,
384377
languages_supported: ["en"],
385378
twitter: "https://twitter.com/safe",
@@ -417,12 +410,11 @@ export const walletsData: WalletData[] = [
417410
documentation: "https://docs.safe.global/",
418411
},
419412
{
420-
last_updated: "August 23, 2023",
413+
last_updated: "2023-08-23",
421414
name: "Ambire",
422415
image: AmbireImage,
423416
brand_color: "#aa6aff",
424417
url: "https://www.ambire.com",
425-
wallet_live_date: "December 2021",
426418
active_development_team: true,
427419
languages_supported: ["en"],
428420
twitter: "https://twitter.com/AmbireWallet",
@@ -461,12 +453,11 @@ export const walletsData: WalletData[] = [
461453
documentation: "",
462454
},
463455
{
464-
last_updated: "June 24, 2022",
456+
last_updated: "2022-06-24",
465457
name: "imToken",
466458
image: imTokenImage,
467459
brand_color: "#098de6",
468460
url: "https://token.im/",
469-
wallet_live_date: "2016",
470461
active_development_team: true,
471462
languages_supported: [
472463
"en",
@@ -520,7 +511,6 @@ export const walletsData: WalletData[] = [
520511
image: OneInchWalletImage,
521512
brand_color: "#082D6E",
522513
url: "https://1inch.io/",
523-
wallet_live_date: "2022-04-27",
524514
active_development_team: true,
525515
languages_supported: [
526516
"en",
@@ -577,7 +567,6 @@ export const walletsData: WalletData[] = [
577567
image: FoxWalletImage,
578568
brand_color: "#ffffff",
579569
url: "https://foxwallet.com/en",
580-
wallet_live_date: "November, 2021",
581570
active_development_team: true,
582571
languages_supported: ["en", "zh", "uk", "ru", "es", "id"],
583572
twitter: "https://twitter.com/FoxWallet",
@@ -620,7 +609,6 @@ export const walletsData: WalletData[] = [
620609
image: PillarImage,
621610
brand_color: "#7501D9",
622611
url: "https://www.pillar.fi/",
623-
wallet_live_date: "December 18 2018 V1, June 2020 V2",
624612
active_development_team: true,
625613
languages_supported: ["en", "et", "bs", "zh"],
626614
twitter: "https://twitter.com/PillarWallet",
@@ -666,7 +654,6 @@ export const walletsData: WalletData[] = [
666654
image: MewImage,
667655
brand_color: "#05C0A5",
668656
url: "https://www.mewwallet.com",
669-
wallet_live_date: "13 March 2020",
670657
active_development_team: true,
671658
languages_supported: ["en", "ru", "zh"],
672659
twitter: "https://twitter.com/myetherwallet",
@@ -711,7 +698,6 @@ export const walletsData: WalletData[] = [
711698
image: UnstoppableWalletImage,
712699
brand_color: "#ffbe43",
713700
url: "https://unstoppable.money/",
714-
wallet_live_date: "2017",
715701
active_development_team: true,
716702
languages_supported: ["en", "fr", "de", "ko", "ru", "zh", "es", "tr"],
717703
twitter: "https://twitter.com/unstoppablebyhs",
@@ -755,7 +741,6 @@ export const walletsData: WalletData[] = [
755741
image: MyEtherWalletImage,
756742
brand_color: "#ffffff",
757743
url: "https://www.myetherwallet.com/",
758-
wallet_live_date: "August 2015",
759744
active_development_team: true,
760745
languages_supported: ["en"],
761746
twitter: "https://twitter.com/myetherwallet",
@@ -799,7 +784,6 @@ export const walletsData: WalletData[] = [
799784
image: AlphaWalletImage,
800785
brand_color: "#ffffff",
801786
url: "https://alphawallet.com/",
802-
wallet_live_date: "2018",
803787
active_development_team: true,
804788
languages_supported: ["en", "zh", "es", "fr", "vi"],
805789
twitter: "https://twitter.com/alphawallet",
@@ -838,12 +822,11 @@ export const walletsData: WalletData[] = [
838822
documentation: "",
839823
},
840824
{
841-
last_updated: "June 24, 2022",
825+
last_updated: "2022-06-24",
842826
name: "Bridge wallet",
843827
image: BridgeWalletImage,
844828
brand_color: "#ffffff",
845829
url: "https://www.mtpelerin.com/bridge-wallet",
846-
wallet_live_date: "April 2020",
847830
active_development_team: true,
848831
languages_supported: ["en", "fr", "de", "it", "es", "zh", "zh-tw"],
849832
twitter: "https://twitter.com/mtpelerin",
@@ -882,12 +865,11 @@ export const walletsData: WalletData[] = [
882865
documentation: "",
883866
},
884867
{
885-
last_updated: "2022-9-14",
868+
last_updated: "2022-09-14",
886869
name: "Torus Wallet",
887870
image: TorusImage,
888871
brand_color: "#0364ff",
889872
url: "https://app.tor.us",
890-
wallet_live_date: "May 2019",
891873
active_development_team: true,
892874
languages_supported: ["en", "de", "ja", "ko", "zh", "es"],
893875
twitter: "https://twitter.com/web3auth",
@@ -927,12 +909,11 @@ export const walletsData: WalletData[] = [
927909
mpc: true,
928910
},
929911
{
930-
last_updated: "2022-7-18",
912+
last_updated: "2022-07-18",
931913
name: "TokenPocket",
932914
image: TokenPocketImage,
933915
brand_color: "#2980fe",
934916
url: "https://www.tokenpocket.pro/",
935-
wallet_live_date: "April, 2018",
936917
active_development_team: true,
937918
languages_supported: [
938919
"en",
@@ -994,12 +975,11 @@ export const walletsData: WalletData[] = [
994975
documentation: "https://help.tokenpocket.pro/developer-en/",
995976
},
996977
{
997-
last_updated: "2022-6-30",
978+
last_updated: "2022-06-30",
998979
name: "Rainbow",
999980
image: RainbowImage,
1000981
brand_color: "#001A4D",
1001982
url: "https://rainbow.me",
1002-
wallet_live_date: "June 2019",
1003983
active_development_team: true,
1004984
languages_supported: [
1005985
"en",
@@ -1057,7 +1037,6 @@ export const walletsData: WalletData[] = [
10571037
image: TrezorImage,
10581038
brand_color: "#ffffff",
10591039
url: "https://trezor.io/",
1060-
wallet_live_date: "2012-12-31",
10611040
active_development_team: true,
10621041
languages_supported: ["en"],
10631042
twitter: "https://twitter.com/Trezor",
@@ -1101,7 +1080,6 @@ export const walletsData: WalletData[] = [
11011080
image: LedgerImage,
11021081
brand_color: "#fb5e01",
11031082
url: "https://www.ledger.com/",
1104-
wallet_live_date: "2014-12-31",
11051083
active_development_team: true,
11061084
languages_supported: [
11071085
"en",
@@ -1157,7 +1135,6 @@ export const walletsData: WalletData[] = [
11571135
image: InfinityWalletImage,
11581136
brand_color: "#137dc7",
11591137
url: "https://infinitywallet.io/",
1160-
wallet_live_date: "2019-11-01",
11611138
active_development_team: true,
11621139
languages_supported: ["en", "es"],
11631140
twitter: "https://twitter.com/InfinityWallet",
@@ -1201,7 +1178,6 @@ export const walletsData: WalletData[] = [
12011178
image: ExodusImage,
12021179
brand_color: "#1F2033",
12031180
url: "https://exodus.com",
1204-
wallet_live_date: "2015-12-31",
12051181
active_development_team: true,
12061182
languages_supported: ["en"],
12071183
twitter: "https://twitter.com/exodus_io",
@@ -1251,7 +1227,6 @@ export const walletsData: WalletData[] = [
12511227
image: RabbyWalletImage,
12521228
brand_color: "#FFFFFF",
12531229
url: "https://rabby.io",
1254-
wallet_live_date: "2021-07-27",
12551230
active_development_team: true,
12561231
languages_supported: ["en"],
12571232
twitter: "https://twitter.com/Rabby_io",
@@ -1297,7 +1272,6 @@ export const walletsData: WalletData[] = [
12971272
image: ZerionImage,
12981273
brand_color: "#2962EF",
12991274
url: "https://zerion.io/",
1300-
wallet_live_date: "2022-05-26",
13011275
active_development_team: true,
13021276
languages_supported: [
13031277
"en",
@@ -1357,7 +1331,6 @@ export const walletsData: WalletData[] = [
13571331
image: EnkryptImage,
13581332
brand_color: "#ffffff",
13591333
url: "https://www.enkrypt.com",
1360-
wallet_live_date: "2022-08-03",
13611334
active_development_team: true,
13621335
languages_supported: ["en"],
13631336
twitter: "https://twitter.com/enkrypt",
@@ -1401,7 +1374,6 @@ export const walletsData: WalletData[] = [
14011374
image: GridPlusImage,
14021375
brand_color: "#ffffff",
14031376
url: "https://gridplus.io/",
1404-
wallet_live_date: "2020-10-01",
14051377
active_development_team: true,
14061378
languages_supported: ["en"],
14071379
twitter: "https://twitter.com/gridplus",
@@ -1445,7 +1417,6 @@ export const walletsData: WalletData[] = [
14451417
image: BitkeepImage,
14461418
brand_color: "#ffffff",
14471419
url: "https://www.bitkeep.com/",
1448-
wallet_live_date: "2018-07-01",
14491420
active_development_team: true,
14501421
languages_supported: ["en"],
14511422
twitter: "https://twitter.com/BitKeepOS",
@@ -1489,7 +1460,6 @@ export const walletsData: WalletData[] = [
14891460
image: BlockWalletImage,
14901461
brand_color: "#52C200",
14911462
url: "https://blockwallet.io",
1492-
wallet_live_date: "2022-02-28",
14931463
active_development_team: true,
14941464
languages_supported: ["en"],
14951465
twitter: "https://x.com/GetBlockWallet",
@@ -1539,7 +1509,6 @@ export const walletsData: WalletData[] = [
15391509
image: OneKeyImage,
15401510
brand_color: "#00B812",
15411511
url: "https://onekey.so/",
1542-
wallet_live_date: "2022-07-31",
15431512
active_development_team: true,
15441513
languages_supported: [
15451514
"en",
@@ -1604,7 +1573,6 @@ export const walletsData: WalletData[] = [
16041573
image: ApexImage,
16051574
brand_color: "CF9500",
16061575
url: "https://apexwallet.xyz/",
1607-
wallet_live_date: "2022-08-31",
16081576
active_development_team: true,
16091577
languages_supported: ["en"],
16101578
twitter: "https://twitter.com/ApexWallet",
@@ -1648,7 +1616,6 @@ export const walletsData: WalletData[] = [
16481616
image: TahoImage,
16491617
brand_color: "#FDAE49",
16501618
url: "https://taho.xyz",
1651-
wallet_live_date: "2021-12-20",
16521619
active_development_team: true,
16531620
languages_supported: ["en"],
16541621
twitter: "https://twitter.com/taho_xyz",
@@ -1697,7 +1664,6 @@ export const walletsData: WalletData[] = [
16971664
image: PhantomImage,
16981665
brand_color: "#AB9FF2",
16991666
url: "https://phantom.app/",
1700-
wallet_live_date: "2021-05-17",
17011667
active_development_team: true,
17021668
languages_supported: [
17031669
"en",
@@ -1773,7 +1739,6 @@ export const walletsData: WalletData[] = [
17731739
image: XDEFIImage,
17741740
brand_color: "#2041E0",
17751741
url: "https://www.xdefi.io",
1776-
wallet_live_date: "2021-10-12",
17771742
active_development_team: true,
17781743
languages_supported: ["en", "fr", "de", "ru"],
17791744
twitter: "https://twitter.com/xdefi_wallet",
@@ -1820,7 +1785,6 @@ export const walletsData: WalletData[] = [
18201785
image: TrustWalletImage,
18211786
brand_color: "#0500FF",
18221787
url: "https://www.trustwallet.com/",
1823-
wallet_live_date: "2017-10-25",
18241788
active_development_team: true,
18251789
languages_supported: [
18261790
"en",
@@ -1884,7 +1848,6 @@ export const walletsData: WalletData[] = [
18841848
image: AuroxImage,
18851849
brand_color: "#1F47FF",
18861850
url: "https://getaurox.com/wallet",
1887-
wallet_live_date: "2022-12-06",
18881851
active_development_team: true,
18891852
languages_supported: ["en"],
18901853
twitter: "https://twitter.com/getaurox",

src/lib/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,6 @@ export interface WalletData {
503503
image: StaticImageData
504504
brand_color: string
505505
url: string
506-
wallet_live_date: string
507506
active_development_team: boolean
508507
languages_supported: string[]
509508
twitter: string

src/pages/wallets/find-wallet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ const FindWalletPage = () => {
134134
</BannerNotification>
135135

136136
<Flex
137-
direction={{ base: "column-reverse", sm: "row" }}
137+
direction={{ base: "column", sm: "row" }}
138138
position="relative"
139139
w="full"
140140
p={12}

0 commit comments

Comments
 (0)