From 1017ef3bc6f92c5d1c9ed824b127ac7b56001891 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 13 Nov 2024 10:49:45 -0800 Subject: [PATCH 01/23] fix: remove comparison button --- packages/frontend/package.json | 2 +- .../src/components/landing/GuestLanding.js | 22 ------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/packages/frontend/package.json b/packages/frontend/package.json index c3e12a5ec6..26db4094c8 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -86,7 +86,7 @@ "scripts": { "predeploy": "yarn build", "update:static": "cp src/wasm/multisig.wasm dist/multisig.wasm && cp src/wasm/main.wasm dist/main.wasm && cp src/wasm/state_cleanup.wasm dist/state_cleanup.wasm", - "start": "yarn update:static; parcel src/index.html --https --cert devServerCertificates/primary.crt --key devServerCertificates/private.pem", + "start": "NEAR_WALLET_ENV=development yarn update:static; parcel src/index.html --https --cert devServerCertificates/primary.crt --key devServerCertificates/private.pem", "prebuild": "rm -rf dist/", "build": "yarn run bundle && yarn run sentry", "bundle": "NODE_ENV=production node ci/runBundler.js", diff --git a/packages/frontend/src/components/landing/GuestLanding.js b/packages/frontend/src/components/landing/GuestLanding.js index f87ceb966e..4a43e878c3 100644 --- a/packages/frontend/src/components/landing/GuestLanding.js +++ b/packages/frontend/src/components/landing/GuestLanding.js @@ -778,28 +778,6 @@ export function GuestLanding({ history, accountFound, onTransfer }) { )} - - { - recordWalletMigrationEvent('click', { - element: { - type: 'button', - description: 'Compare Wallets', - }, - }); - window.open( - 'https://docs.google.com/spreadsheets/d/1JeF9ZKmg1IHvTlgIv0ymGNMIeps6khcr3ElfIpEJHGs/edit#gid=0', - '_blank' - ); - }} - className="dark-gray-transparent" - color="dark-gray-transparent" - trackingId="Click create account button" - data-test-id="landingPageCreateAccount" - > - - - From 622fd3cceee6e4266fbddf0c39c2bb99baac831d Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 13 Nov 2024 11:18:12 -0800 Subject: [PATCH 02/23] fix: remove xfer wizard from guest landing --- .../src/components/landing/GuestLanding.js | 106 +----------------- 1 file changed, 5 insertions(+), 101 deletions(-) diff --git a/packages/frontend/src/components/landing/GuestLanding.js b/packages/frontend/src/components/landing/GuestLanding.js index 4a43e878c3..6e8b8d2ea8 100644 --- a/packages/frontend/src/components/landing/GuestLanding.js +++ b/packages/frontend/src/components/landing/GuestLanding.js @@ -156,7 +156,7 @@ const CustomButton = styled.button` &.rounded { border-radius: 50px; padding: ${({ swapButton }) => - swapButton ? '6px 12px' : '12px 15px'}; + swapButton ? '6px 12px' : '12px 15px'}; width: auto; } @@ -594,17 +594,6 @@ export function GuestLanding({ history, accountFound, onTransfer }) { recordWalletMigrationEvent('LANDING_PAGE'); }, []); - const scrollToWalletSection = () => { - ref.current?.scrollIntoView({ - behavior: 'smooth', - block: 'start', - }); - const elementTop = ref.current.getBoundingClientRect().top; - - const offset = 100; - window.scrollBy({ top: elementTop - offset, behavior: 'smooth' }); - }; - return ( <> @@ -651,27 +640,6 @@ export function GuestLanding({ history, accountFound, onTransfer }) { > - {accountFound ? ( - - - - ) : ( - - - - )} { window.open( @@ -699,7 +667,7 @@ export function GuestLanding({ history, accountFound, onTransfer }) { - +

@@ -729,33 +697,6 @@ export function GuestLanding({ history, accountFound, onTransfer }) {
- {accountFound && ( - -

- -

-

- -

- { - recordWalletMigrationEvent('click', { - element: { - type: 'button', - description: 'Transfer Guide', - }, - }); - history.push('/transfer-wizard'); - }} - className="dark-gray-transparent" - color="dark-gray-transparent" - trackingId="Click create account button" - data-test-id="landingPageCreateAccount" - > - - -
- )}
@@ -763,19 +704,9 @@ export function GuestLanding({ history, accountFound, onTransfer }) { - {accountFound ? ( - - {accountFound ? ( - - ) : ( - - )} - - ) : ( - - - - )} + + +
@@ -953,33 +884,6 @@ export function GuestLanding({ history, accountFound, onTransfer }) {
- {accountFound && ( - - - -
-

- -

-

- -

-
- - - - - -
-
-
- )} ); } From d57b46a139be80feb4d704701688fe75f9636ea6 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 13 Nov 2024 11:21:17 -0800 Subject: [PATCH 03/23] fix: remove unused elements --- .../src/components/landing/GuestLanding.js | 555 +----------------- 1 file changed, 1 insertion(+), 554 deletions(-) diff --git a/packages/frontend/src/components/landing/GuestLanding.js b/packages/frontend/src/components/landing/GuestLanding.js index 6e8b8d2ea8..6522505a6a 100644 --- a/packages/frontend/src/components/landing/GuestLanding.js +++ b/packages/frontend/src/components/landing/GuestLanding.js @@ -1,9 +1,6 @@ import React, { useEffect, useRef, useState } from 'react'; import { Translate } from 'react-localize-redux'; -import styled from 'styled-components'; -import ArrowGrnImage from '../../images/icon-arrow-grn.svg'; -import ArrowWhiteImage from '../../images/icon-arrow-white.svg'; import BitteWalletIcon from '../../images/wallet-icons/bitte-wallet-icon.png'; import HereWalletIcon from '../../images/wallet-icons/here-wallet-icon.png'; import MeteorWalletIcon from '../../images/wallet-icons/meteor-wallet-icon.png'; @@ -22,7 +19,6 @@ import { DefaultContainer, FlexBox, FlexItem, - FormButtonContainer, InfoSection, MainContainer, MainSection, @@ -33,558 +29,9 @@ import { Section, SingleCard, StyledContainer, - TransferSection, - TransferSectionWrapper, } from './GuestLanding.styles'; -const CustomButton = styled.button` - &&& { - color: #fff; - margin: ${({ swapButton }) => (swapButton ? 0 : '24px 0 0 0')}; - border: 2px solid; - font-weight: 600; - height: 56px; - border-radius: 30px; - transition: 100ms; - font-size: 14px; - word-break: keep-all; - - :disabled { - cursor: not-allowed; - } - - svg { - width: 16px; - height: 16px; - margin: 0 0 -4px 8px; - } - - &.small { - width: 110px; - height: 36px; - border-radius: 20px; - padding: 0px 0px; - - font-size: 14px; - } - - &.black { - background-color: black; - - :hover { - background-color: #1f1f1f; - } - } - - &.dark-gray { - background-color: #272729; - border-color: #272729; - - :hover { - background-color: black; - } - - :disabled { - background: #e6e6e6; - border-color: #e6e6e6; - opacity: 1 !important; - color: #a2a2a8; - } - } - - &.dark-gray-light-blue { - background-color: #37383c; - border-color: #37383c; - color: #8ebaf0; - - :hover { - background-color: black; - } - - :disabled { - background: #e6e6e6; - border-color: #e6e6e6; - opacity: 1 !important; - color: #a2a2a8; - } - } - - &.dark-gray-black { - background-color: #000000; - color: #ffffff; - padding: 0 20px; - margin: 0; - :hover { - background-color: #706f6c; - } - - :disabled { - background: #e6e6e6; - border-color: #e6e6e6; - opacity: 1 !important; - color: #a2a2a8; - } - } - - &.gray-gray { - background-color: #f0f0f1; - border-color: #f0f0f1; - color: #3f4045; - - :hover { - background-color: #ececec; - } - - :disabled { - opacity: 0.8; - } - } - - &.light-blue { - background-color: #d6edff; - border: 0; - color: #0072ce; - border-radius: 4px; - - &.small { - padding: 6px 12px; - height: auto; - font-weight: 400 !important; - font-size: 12px; - } - - &.rounded { - border-radius: 50px; - padding: ${({ swapButton }) => - swapButton ? '6px 12px' : '12px 15px'}; - width: auto; - } - - :hover { - color: white; - background-color: #0072ce; - } - - :disabled { - background-color: #f0f0f1; - color: #a2a2a8; - } - } - - &.red { - border-color: #e5484d; - background: #e5484d; - - :disabled { - background: #e6e6e6; - border-color: #e6e6e6; - opacity: 1 !important; - } - :active, - :hover, - :focus { - border-color: #e5484d; - background: #fff; - color: #e5484d; - } - &.dots { - color: #fff; - } - } - &.blue { - border-color: #0072ce; - background: #0072ce; - - :active, - :hover, - :focus { - border-color: #007fe6; - background: #007fe6; - } - :disabled { - background: #e6e6e6; - border-color: #e6e6e6; - opacity: 1 !important; - color: #a2a2a8; - } - } - &.seafoam-blue { - border-color: #6ad1e3; - background: #6ad1e3; - - :disabled { - background: #e6e6e6; - border-color: #e6e6e6; - opacity: 1 !important; - } - :active, - :hover, - :focus { - opacity: 0.8; - } - } - &.seafoam-blue-white { - border-color: #6ad1e3; - background: #fff; - color: #6ad1e3; - - :disabled { - background: #fff; - border-color: #e6e6e6; - opacity: 1 !important; - } - :active, - :hover, - :focus { - opacity: 0.8; - } - } - &.dark-gray-transparent { - background-color: transparent; - border-color: #000000; - color: #000000; - margin: 0; - padding: 10px 24px; - - :hover { - background-color: #000000; - color: #ffffff; - } - - :disabled { - background: #e6e6e6; - border-color: #e6e6e6; - opacity: 1 !important; - color: #a2a2a8; - } - } - &.dark-green-transparent { - background-color: transparent; - border-color: #00ec97; - color: #ffffff; - margin: 0; - padding: 10px 24px; - - :hover { - background-color: rgb(0, 236, 151); - color: #000000; - } - - :disabled { - background: #e6e6e6; - border-color: #e6e6e6; - opacity: 1 !important; - color: #a2a2a8; - } - } - &.light-green-transparent { - background-color: #00ec97; - border-color: #00ec97; - color: #000000; - margin: 0; - padding: 10px 24px; - - :hover { - background-color: #45e394; - } - - :disabled { - background: #e6e6e6; - border-color: #e6e6e6; - opacity: 1 !important; - color: #a2a2a8; - } - } - &.green { - border-color: #5ace84; - background: #5ace84; - - :disabled { - border-color: #e6e6e6; - background: #e6e6e6; - opacity: 1 !important; - } - :active, - :hover, - :focus { - border-color: #61de8d; - background: #61de8d; - } - } - &.green-dark { - background-color: #00c08b; - color: #00261c; - border: 0; - font-weight: 600 !important; - - :disabled { - opacity: 0.5; - } - - &.border { - color: #008d6a !important; - background-color: #c8f6e0 !important; - border: 2px solid #56bc8f !important; - } - } - &.green-white-arrow { - color: #5ace84; - border-color: #5ace84; - background-color: #fff; - background-image: url(${ArrowGrnImage}); - background-repeat: no-repeat; - background-position: 90% center; - background-size: 14px 20px; - - :disabled { - color: #e6e6e6; - border-color: #e6e6e6; - background: #fff; - opacity: 1 !important; - } - :active, - :hover, - :focus { - color: #fff; - border-color: #61de8d; - background-color: #61de8d; - background-image: url(${ArrowWhiteImage}); - } - } - &.green-pastel { - background-color: #4dd5a6; - color: #00261c; - border: 0; - - :hover { - background-color: #49cc9f; - } - } - &.gray-white { - color: #cccccc; - border-color: #cccccc; - background: #fff; - - :disabled { - border-color: #e6e6e6; - background: #e6e6e6; - opacity: 1 !important; - } - :active, - :hover, - :focus { - color: #fff; - border-color: #cccccc; - background: #cccccc; - } - } - &.gray-red { - color: #ff585d; - border: none; - background-color: #f0f0f1; - - :hover, - :active, - :focus { - color: #fff; - background-color: #ff585d; - } - } - &.gray-blue { - color: #0072ce; - border-color: #f0f0f1; - background: #f0f0f1; - - :disabled { - border-color: #e6e6e6; - background: #e6e6e6; - opacity: 1 !important; - } - :active, - :hover, - :focus { - color: #0072ce; - border-color: #f0f0f1; - background: #fff; - } - - &.dark { - border-color: #efefef; - background: #efefef; - } - - &.border { - background: none; - border-color: #e6e5e3; - :hover { - border-color: #0072ce; - } - } - } - &.white-blue { - background-color: white; - border: 0; - color: #0072ce; - - :active, - :hover, - :focus { - color: white; - background: #0072ce; - } - } - &.link { - width: auto !important; - height: auto; - min-height: 50px; - padding: 0; - margin: 0; - border-radius: 0px; - background: none; - border: none; - display: inline; - color: #0072ce; - - :hover, - :focus { - color: #0072ce; - background-color: transparent; - text-decoration: underline; - } - - &.gray { - color: #72727a; - - :hover, - :focus { - color: #72727a; - } - } - - &.light-gray { - color: #a2a2a8; - - :hover, - :focus { - color: #a2a2a8; - } - } - - &.red { - color: #ff585d; - - :disabled { - opacity: 0.8; - background: transparent !important; - } - } - - &.normal { - font-weight: 400; - font-size: 16px; - } - - &.underline { - font-weight: 400; - text-decoration: underline; - - :hover { - text-decoration: none; - } - } - } - - &.dots { - color: #fff; - border-color: #cccccc; - background-color: #cccccc; - cursor: default; - - :active, - :hover, - :focus, - :disabled { - background: #cccccc; - border-color: #cccccc; - } - :after { - content: "."; - animation: dots 1s steps(5, end) infinite; - - @keyframes dots { - 0%, - 20% { - color: rgba(0, 0, 0, 0); - text-shadow: 0.3em 0 0 rgba(0, 0, 0, 0), - 0.6em 0 0 rgba(0, 0, 0, 0); - } - 40% { - color: white; - text-shadow: 0.3em 0 0 rgba(0, 0, 0, 0), - 0.6em 0 0 rgba(0, 0, 0, 0); - } - 60% { - text-shadow: 0.3em 0 0 white, 0.6em 0 0 rgba(0, 0, 0, 0); - } - 80%, - 100% { - text-shadow: 0.3em 0 0 white, 0.6em 0 0 white; - } - } - } - } - - &.link.dots { - color: #24272a; - border: 0; - background-color: transparent; - text-transform: lowercase; - text-decoration: none; - - :active, - :hover, - :focus, - :disabled { - background: transparent; - border: 0; - } - :after { - content: "."; - animation: link 1s steps(5, end) infinite; - - @keyframes link { - 0%, - 20% { - color: rgba(0, 0, 0, 0); - text-shadow: 0.3em 0 0 rgba(0, 0, 0, 0), - 0.6em 0 0 rgba(0, 0, 0, 0); - } - 40% { - color: #24272a; - text-shadow: 0.3em 0 0 rgba(0, 0, 0, 0), - 0.6em 0 0 rgba(0, 0, 0, 0); - } - 60% { - text-shadow: 0.3em 0 0 #24272a, - 0.6em 0 0 rgba(0, 0, 0, 0); - } - 80%, - 100% { - text-shadow: 0.3em 0 0 #24272a, 0.6em 0 0 #24272a; - } - } - } - } - &.bold { - font-weight: 500; - } - @media screen and (max-width: 767px) { - width: 100%; - } - } -`; - -export function GuestLanding({ history, accountFound, onTransfer }) { +export function GuestLanding({ onTransfer }) { const [walletSelectorModal, setWalletSelectorModal] = useState(); const [showModal, setShowModal] = useState(); From 978d749b8b0aba602ea6ce90f6eae61c30813c12 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 13 Nov 2024 12:00:48 -0800 Subject: [PATCH 04/23] fix: promote wallets to top of page --- .../src/components/landing/GuestLanding.js | 202 +++++++++--------- 1 file changed, 103 insertions(+), 99 deletions(-) diff --git a/packages/frontend/src/components/landing/GuestLanding.js b/packages/frontend/src/components/landing/GuestLanding.js index 6522505a6a..384620d7d2 100644 --- a/packages/frontend/src/components/landing/GuestLanding.js +++ b/packages/frontend/src/components/landing/GuestLanding.js @@ -44,107 +44,8 @@ export function GuestLanding({ onTransfer }) { return ( <> - - - setWalletSelectorModal(modal) - } - setShowModal={(modal) => { - setShowModal(null); - if (modal === 'wallet-selector') { - walletSelectorModal.show(); - } - }} - showModal={showModal} - /> - - - -

- -

-

- -

- - { - recordWalletMigrationEvent('click', { - element: { - type: 'button', - description: 'Learn More', - }, - }); - window.open( - 'https://medium.com/nearprotocol/near-opens-the-door-to-more-wallets-255eee58eb97', - '_blank' - ); - }} - className="dark-gray-transparent" - color="dark-gray-transparent" - trackingId="Click create account button" - data-test-id="landingPageLearMore" - > - - - { - window.open( - 'https://near.org/', - '_blank' - ); - }} - className="dark-gray-transparent" - color="dark-gray-transparent" - data-test-id="landingPageNearOrg" - > - - - -
-
-
-
-

- -

-

- -

- - -

- -

-

- -

-
- { - recordWalletMigrationEvent('click', { - element: { - type: 'button', - description: 'Learn More', - }, - }); - window.open( - 'https://medium.com/nearprotocol/near-opens-the-door-to-more-wallets-255eee58eb97', - '_blank' - ); - }} - className="dark-gray-transparent" - color="dark-gray-transparent" - trackingId="Click create account button" - data-test-id="landingPageCreateAccount" - > - - -
-
-
@@ -331,6 +232,109 @@ export function GuestLanding({ onTransfer }) {
+ + + setWalletSelectorModal(modal) + } + setShowModal={(modal) => { + setShowModal(null); + if (modal === 'wallet-selector') { + walletSelectorModal.show(); + } + }} + showModal={showModal} + /> + + + +

+ +

+

+ +

+ + { + recordWalletMigrationEvent('click', { + element: { + type: 'button', + description: 'Learn More', + }, + }); + window.open( + 'https://medium.com/nearprotocol/near-opens-the-door-to-more-wallets-255eee58eb97', + '_blank' + ); + }} + className="dark-gray-transparent" + color="dark-gray-transparent" + trackingId="Click create account button" + data-test-id="landingPageLearMore" + > + + + { + window.open( + 'https://near.org/', + '_blank' + ); + }} + className="dark-gray-transparent" + color="dark-gray-transparent" + data-test-id="landingPageNearOrg" + > + + + +
+
+
+
+
+ +

+ +

+

+ +

+ + +

+ +

+

+ +

+
+ { + recordWalletMigrationEvent('click', { + element: { + type: 'button', + description: 'Learn More', + }, + }); + window.open( + 'https://medium.com/nearprotocol/near-opens-the-door-to-more-wallets-255eee58eb97', + '_blank' + ); + }} + className="dark-gray-transparent" + color="dark-gray-transparent" + trackingId="Click create account button" + data-test-id="landingPageCreateAccount" + > + + +
+
+
+
+
); } From c8d11066ed8603af5d20b4782e8f532218cb7223 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 13 Nov 2024 12:02:28 -0800 Subject: [PATCH 05/23] fix: update caniuse-lite --- yarn.lock | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index d875d92fc2..995d70c4d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5095,15 +5095,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001286: - version "1.0.30001287" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001287.tgz#5fab6a46ab9e47146d5dd35abfe47beaf8073c71" - integrity sha512-4udbs9bc0hfNrcje++AxBuc6PfLNHwh3PO9kbwnfCQWyqtlzg3py0YgFu8jyRTTo85VAz4U+VLxSlID09vNtWA== - -caniuse-lite@^1.0.30001332: - version "1.0.30001346" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001346.tgz#e895551b46b9cc9cc9de852facd42f04839a8fbe" - integrity sha512-q6ibZUO2t88QCIPayP/euuDREq+aMAxFE5S70PkrLh0iTDj/zEhgvJRKC2+CvXY6EWc6oQwUR48lL5vCW6jiXQ== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001332: + version "1.0.30001680" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz" + integrity sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA== capability@^0.2.5: version "0.2.5" From 887c4a7980688c53e58c19f72ec71cc0d7e1b496 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 13 Nov 2024 13:30:12 -0800 Subject: [PATCH 06/23] fix: remove explore --- .../frontend/src/components/landing/GuestLanding.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/packages/frontend/src/components/landing/GuestLanding.js b/packages/frontend/src/components/landing/GuestLanding.js index 384620d7d2..ca70acd61e 100644 --- a/packages/frontend/src/components/landing/GuestLanding.js +++ b/packages/frontend/src/components/landing/GuestLanding.js @@ -275,19 +275,6 @@ export function GuestLanding({ onTransfer }) { > - { - window.open( - 'https://near.org/', - '_blank' - ); - }} - className="dark-gray-transparent" - color="dark-gray-transparent" - data-test-id="landingPageNearOrg" - > - - From 95b36cd535d7eee88e205a4a8cf0243fa171d5b8 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 13 Nov 2024 13:32:35 -0800 Subject: [PATCH 07/23] fix: remove duplicate blogpost copy & button --- .../src/components/landing/GuestLanding.js | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/packages/frontend/src/components/landing/GuestLanding.js b/packages/frontend/src/components/landing/GuestLanding.js index ca70acd61e..28bedb4e1a 100644 --- a/packages/frontend/src/components/landing/GuestLanding.js +++ b/packages/frontend/src/components/landing/GuestLanding.js @@ -288,38 +288,6 @@ export function GuestLanding({ onTransfer }) {

- - -

- -

-

- -

-
- { - recordWalletMigrationEvent('click', { - element: { - type: 'button', - description: 'Learn More', - }, - }); - window.open( - 'https://medium.com/nearprotocol/near-opens-the-door-to-more-wallets-255eee58eb97', - '_blank' - ); - }} - className="dark-gray-transparent" - color="dark-gray-transparent" - trackingId="Click create account button" - data-test-id="landingPageCreateAccount" - > - - -
-
-
From fc9697dcd1435d0aabe6a47f7c8650acdbbe4452 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 13 Nov 2024 13:35:45 -0800 Subject: [PATCH 08/23] fix: remove bottom section --- .../frontend/src/components/landing/GuestLanding.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/packages/frontend/src/components/landing/GuestLanding.js b/packages/frontend/src/components/landing/GuestLanding.js index 28bedb4e1a..f0df748166 100644 --- a/packages/frontend/src/components/landing/GuestLanding.js +++ b/packages/frontend/src/components/landing/GuestLanding.js @@ -280,16 +280,6 @@ export function GuestLanding({ onTransfer }) { -
- -

- -

-

- -

-
-
); } From 31ff755f0d7e7b5a2c48d20f135d583ddf396acb Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 13 Nov 2024 13:39:33 -0800 Subject: [PATCH 09/23] fix: remove unused imports --- packages/frontend/src/components/landing/GuestLanding.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/frontend/src/components/landing/GuestLanding.js b/packages/frontend/src/components/landing/GuestLanding.js index f0df748166..66931be255 100644 --- a/packages/frontend/src/components/landing/GuestLanding.js +++ b/packages/frontend/src/components/landing/GuestLanding.js @@ -17,8 +17,6 @@ import { CardContainer, CardsSection, DefaultContainer, - FlexBox, - FlexItem, InfoSection, MainContainer, MainSection, From cc293f1c5c41b4b2897dfef3f767d70adc606d6b Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 13 Nov 2024 13:46:10 -0800 Subject: [PATCH 10/23] fix: reorder wallets per request --- .../src/components/landing/GuestLanding.js | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/packages/frontend/src/components/landing/GuestLanding.js b/packages/frontend/src/components/landing/GuestLanding.js index 66931be255..34e182665e 100644 --- a/packages/frontend/src/components/landing/GuestLanding.js +++ b/packages/frontend/src/components/landing/GuestLanding.js @@ -59,87 +59,87 @@ export function GuestLanding({ onTransfer }) { { recordWalletMigrationEvent('click', { element: { type: 'link', - description: 'MyNearWallet Wallet', + description: 'Meteor Wallet', }, }); }} > near-wallet-icon -

MyNearWallet

+

Meteor Wallet

- +

{ recordWalletMigrationEvent('click', { element: { type: 'link', - description: 'Meteor Wallet', + description: 'NEAR Mobile', }, }); }} > meteor-wallet-icon -

Meteor Wallet

+

NEAR Mobile

- +

{ recordWalletMigrationEvent('click', { element: { type: 'link', - description: 'Sender Wallet', + description: 'HERE Wallet', }, }); }} > sender-wallet-icon -

Sender Wallet

+

HERE Wallet

- +

{ recordWalletMigrationEvent('click', { element: { type: 'link', - description: 'HERE Wallet', + description: 'Bitte Wallet', }, }); }} > here-wallet-icon -

HERE Wallet

+

Bitte Wallet

- +

{ recordWalletMigrationEvent('click', { element: { type: 'link', - description: 'NEAR Mobile', + description: 'Sender Wallet', }, }); }} > near-mobile-icon -

NEAR Mobile

+

Sender Wallet

- +

{ recordWalletMigrationEvent('click', { element: { type: 'link', - description: 'Bitte Wallet', + description: 'MyNearWallet Wallet', }, }); }} > bitte-wallet-icon -

Bitte Wallet

+

MyNearWallet

- +

From 9bff31ee8d5b5a7c79307908befd27b76b02b5a2 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 13 Nov 2024 14:06:41 -0800 Subject: [PATCH 11/23] fix: remove nav wrapper and footer --- packages/frontend/src/components/Routing.js | 7 ++++--- packages/frontend/src/components/landing/GuestLanding.js | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/frontend/src/components/Routing.js b/packages/frontend/src/components/Routing.js index 34037a0b02..59c3c9f1f0 100644 --- a/packages/frontend/src/components/Routing.js +++ b/packages/frontend/src/components/Routing.js @@ -48,8 +48,9 @@ import { } from '../utils/wallet'; import LedgerConfirmActionModal from './accounts/ledger/LedgerConfirmActionModal'; import LedgerConnectModal from './accounts/ledger/LedgerConnectModal/LedgerConnectModalWrapper'; -import { DisableTwoFactor } from './accounts/two_factor/DisableTwoFactor'; -import Footer from './common/Footer'; +import { DisableTwoFactor } from './accounts/two_factor/DisableTwoFactor'; +// DISABLE FOOTER as we are using this for generic landing page +// import Footer from './common/Footer'; import GlobalAlert from './common/GlobalAlert'; import MigrationBanner from './common/MigrationBanner'; import NetworkBanner from './common/NetworkBanner'; @@ -428,7 +429,7 @@ class Routing extends Component { /> -