Skip to content

Commit c1a23ce

Browse files
authored
Merge pull request #3117 from near/landing-page-update
Landing page UX update
2 parents cca6bf5 + 3128c70 commit c1a23ce

File tree

6 files changed

+42
-25
lines changed

6 files changed

+42
-25
lines changed

packages/frontend/src/components/common/Footer.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ const InnerContainer = styled.div`
9393
margin: 0 auto;
9494
justify-content: space-between;
9595
align-items: center;
96+
97+
@media(max-width: 1352px) {
98+
padding: 0 64px;
99+
}
100+
101+
@media(max-width: 991px) {
102+
padding: 0 24px;
103+
}
96104
`;
97105

98106
const Footer = () => {

packages/frontend/src/components/landing/GuestLanding.js

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import React, { useEffect, useState } from 'react';
22
import { Translate } from 'react-localize-redux';
3-
import {useSelector} from 'react-redux';
43

54
import HereWalletIcon from '../../images/wallet-icons/here-wallet-icon.png';
65
import MeteorWalletIcon from '../../images/wallet-icons/meteor-wallet-icon.png';
76
import NearWalletIcon from '../../images/wallet-icons/near-wallet-icon.png';
87
import NightlyWalletIcon from '../../images/wallet-icons/nightly-wallet-icon.png';
98
import SenderWalletIcon from '../../images/wallet-icons/sender-wallet-icon.png';
109
import WellDoneWalletIcon from '../../images/wallet-icons/welldone-wallet-icon.png';
11-
import {selectAvailableAccounts} from '../../redux/slices/availableAccounts';
1210
import FormButton from '../common/FormButton';
1311
import { WalletSelectorGetAWallet } from '../common/wallet_selector/WalletSelectorGetAWallet';
1412
import NavigationWrapperV2 from '../navigation/NavigationWrapperV2';
@@ -25,7 +23,6 @@ import {
2523
} from './GuestLanding.styles';
2624

2725
export function GuestLanding({ history, accountFound, onTransfer }) {
28-
const availableAccounts = useSelector(selectAvailableAccounts);
2926

3027
const [walletSelectorModal, setWalletSelectorModal] = useState();
3128
const [showModal, setShowModal] = useState();
@@ -158,7 +155,7 @@ export function GuestLanding({ history, accountFound, onTransfer }) {
158155
</InfoSection>
159156
<CardsSection>
160157
<CardContainer>
161-
<SingleCard href='https://app.mynearwallet.com' target='_blank' onClick={() => {
158+
<SingleCard href='https://mynearwallet.com' target='_blank' onClick={() => {
162159
recordWalletMigrationEvent('click', { element: { type: 'link', description: 'MyNearWallet Wallet' }});
163160
}}>
164161
<img src={NearWalletIcon} alt="near-wallet-icon" />
@@ -193,7 +190,9 @@ export function GuestLanding({ history, accountFound, onTransfer }) {
193190
<h3>Nightly Wallet</h3>
194191
<p><Translate id="landing.wallet.nightly" /></p>
195192
</SingleCard>
196-
<SingleCard href="https://welldonestudio.io/">
193+
<SingleCard href="https://welldonestudio.io/" target="_blank" onClick={() => {
194+
recordWalletMigrationEvent('click', { element: { type: 'link', description: 'WELLDONE Wallet' }});
195+
}}>
197196
<img src={WellDoneWalletIcon} alt="wellDone-wallet-icon" />
198197
<h3>WELLDONE Wallet</h3>
199198
<p><Translate id="landing.wallet.wellDone" /></p>
@@ -208,16 +207,7 @@ export function GuestLanding({ history, accountFound, onTransfer }) {
208207
<TransferSectionWrapper>
209208
<div>
210209
<h4>
211-
{availableAccounts.length === 1 ? (
212-
<Translate id="landing.transfer.titleSingular"
213-
data={{ accountCount: availableAccounts.length }}
214-
/>
215-
) : (
216-
<Translate
217-
id="landing.transfer.titlePlural"
218-
data={{ accountCount: availableAccounts.length }}
219-
/>
220-
)}
210+
<Translate id="landing.transfer.title" />
221211
</h4>
222212
<p><Translate id="landing.transfer.description" /></p>
223213
</div>

packages/frontend/src/components/landing/GuestLanding.styles.js

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ export const StyledContainer = styled.div`
99
max-width: 1224px;
1010
position: relative;
1111
12+
@media (max-width: 1352px) {
13+
padding: 0 64px;
14+
}
15+
16+
@media (max-width: 991px) {
17+
padding: 0 24px;
18+
}
19+
1220
@media (max-width: 767px) {
1321
margin: 0;
1422
overflow: hidden;
@@ -229,6 +237,13 @@ export const DefaultContainer = styled.div`
229237
max-width: 1224px;
230238
margin: 0 auto;
231239
position: relative;
240+
@media (max-width: 1352px) {
241+
padding: 0 64px;
242+
}
243+
244+
@media (max-width: 991px) {
245+
padding: 0 24px;
246+
}
232247
`;
233248

234249
export const FlexBox = styled.div`
@@ -300,8 +315,13 @@ export const SecondaryText = styled.p`
300315
`;
301316

302317
export const FormButtonContainer = styled.div`
303-
min-width: 500px;
304318
text-align: right;
319+
min-width: 500px;
320+
321+
@media(max-width: 1352px) {
322+
min-width: 300px;
323+
}
324+
305325
@media(max-width: 768px) {
306326
min-width: 100%;
307327
}

packages/frontend/src/components/navigation/DesktopContainer.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ const Container = styled.div`
1212
color: white;
1313
position: relative;
1414
font-size: 14px;
15-
padding: 0 15px;
1615
1716
@media (min-width: 992px) {
1817
display: flex;

packages/frontend/src/components/navigation/NavigationV2.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ const Container = styled.div`
1515
border-bottom: 1px solid #F0F0F1;
1616
background-color: #FFFFFF;
1717
margin: auto;
18+
padding: 0 64px;
19+
1820
@media (max-width: 991px) {
19-
bottom: ${(props) => props.open ? '0' : 'unset'};
20-
border: none;
21+
padding: 0 24px;
2122
}
2223
2324
h6 {

packages/frontend/src/translations/en.global.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -673,29 +673,28 @@
673673
},
674674
"landing": {
675675
"banner": "NEAR Wallet is in Private Beta",
676-
"desc": "The NEAR wallet has been discontinued. Explore a range of user-friendly wallets designed to meet your needs.",
676+
"desc": "wallet.near.org has been discontinued. Explore a range of user-friendly wallets designed to meet your needs.",
677677
"or": "or",
678678
"title": "A new era for NEAR wallets",
679679
"decentralize": "Decentralization means strength in numbers.",
680680
"decentralizeSubtitle": "Signifying the substantial growth of the ecosystem, NEAR now supports a diverse list of high-quality wallets.",
681-
"landingSectionTitle": "What happened to NEAR Wallet?",
681+
"landingSectionTitle": "What happened to wallet.near.org?",
682682
"landingSectionSubTitle": "Transfer your accounts with ease.",
683683
"landingSectionSubDescription": "To make the transition easier, you can securely migrate your accounts to a new wallet using the Transfer Wizard. Review the transfer-compatible wallet options below or move your accounts manually with your recovery phrase.",
684-
"landingSectionDescription": "As we embrace a more decentralized future, the NEAR Wallet will be discontinued. This change invites you to discover a variety of new and secure wallet options within our ecosystem. Don’t worry, no changes will be made to your account or assets.",
684+
"landingSectionDescription": "As we embrace a more decentralized future, wallet.near.org will be discontinued. This change invites you to discover a variety of new and secure wallet options within our ecosystem. Don’t worry, no changes will be made to your account or assets.",
685685
"wallet": {
686686
"title": "Find the right wallet for you.",
687687
"secondaryDescription": "Check out our diverse list of community-built wallet options.",
688688
"description": "You can transfer your accounts to any of the wallets below or manually import them to the wallet of your choice using your recovery phrase.",
689-
"near": "A browser based wallet that offers the same UI and features of the Near wallet.",
689+
"near": "A browser based wallet that offers the same UI and features of wallet.near.org",
690690
"meteor": "Both a browser and extension wallet, with advanced NFT features.",
691691
"sender": "Security-audited mobile & extension wallet with 1M+ users, supporting NEAR & Aurora.",
692692
"here": "Non-custodial mobile wallet with a friendly user interface and advanced features.",
693693
"nightly": "A mobile and extension wallet, with support for multiple ecosystems.",
694694
"wellDone": "A multi-chain extension wallet that gives you control over all your assets from a single platform."
695695
},
696696
"transfer": {
697-
"titleSingular": "You have ${accountCount} account ready to transfer.",
698-
"titlePlural": "You have ${accountCount} accounts ready to transfer.",
697+
"title": "You have accounts that need to be transferred",
699698
"description": "To continue using NEAR apps and managing your assets you need to migrate your accounts to a different wallet."
700699
}
701700

0 commit comments

Comments
 (0)