Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Install MetaMask page and don't require signature on dydx #519

Merged
merged 9 commits into from
Oct 18, 2024
Merged

Add Install MetaMask page and don't require signature on dydx #519

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7deb6f4
Add Install MetaMask page
adamiak Oct 8, 2024
eff84f3
redesign
torztomasz Oct 16, 2024
edbd570
redirect on connect
torztomasz Oct 16, 2024
67cb4cc
add user not associated page
torztomasz Oct 16, 2024
452737d
Fix upcoming FAQ link
adamiak Oct 17, 2024
bcce631
Merge branch 'master' into add-install-metamask-page
adamiak Oct 17, 2024
0bc21fa
Fix formatting
adamiak Oct 17, 2024
94ac06a
Fix wording
adamiak Oct 18, 2024
f63db02
FIx router errors
adamiak Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions packages/backend/src/api/routers/FrontendRouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,18 +524,6 @@ export function createFrontendRouter(
)
)

router.get('/tos', async (ctx) => {
const givenUser = getGivenUser(ctx)
const result = await staticPageController.getTermsOfServicePage(givenUser)
applyControllerResult(ctx, result)
})

router.get('/metamask-required', async (ctx) => {
const givenUser = getGivenUser(ctx)
const result = await staticPageController.getInstallMetaMaskPage(givenUser)
applyControllerResult(ctx, result)
})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why removed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge error, fixed.


if (config.starkex.tradingMode === 'perpetual') {
if (!forcedTradeOfferController) {
throw new Error(
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/view/components/TermsOfServiceAck.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export function TermsOfServiceAck({
return instanceName === 'dYdX' ? (
<div className="text-center">
{prefix ?? 'By accessing this website, you agree to our '}{' '}
<Link href="https://dydx.exchange/terms">Terms of Service</Link>
<Link href="https://dydx.exchange/terms">Terms of Use</Link>
</div>
) : null
}
5 changes: 4 additions & 1 deletion packages/frontend/src/view/pages/InstallMetaMaskPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ function InstallMetaMaskPage(props: Props) {
Even if you haven't used MetaMask to create your account on the
exchange, you can trigger Escape Hatch operations for your
positions using a different Ethereum account. See our{' '}
<Link href="/faqescapehatch">FAQ</Link> for more details.
<Link href="/faqescapehatch#what-if-i-don-t-have-a-metamask-compatible-wallet">
FAQ
</Link>{' '}
for more details.
</span>
)}
</div>
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/src/view/pages/user/UserNotAssociatedPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ function UserNotAssociatedPage(props: UserNotAssociatedPageProps) {
The wallet is not associated with any active position
</div>
<div className="mt-6 font-medium leading-5">
It looks like this wallet isn’t associated to any active positions at
the moment. Ensure you're connected to the correct wallet. If you're a
new user, please allow some time for the blockchain to update -
Ethereum transactions may take a few moments to settle.
It seems this wallet isn't associated with any active positions at the
moment. Please make sure you're connected to the correct wallet. If
you're a new user and have recently deposited funds to the exchange,
please allow some time for the blockchain to update.
</div>
</ContentWrapper>
</Page>
Expand Down
Loading