Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion backend/handlers/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ func NewHandlers(
WriteBufferSize: 1024,
CheckOrigin: func(r *http.Request) bool { return true },
},
log: logging.Get().WithGroup("handlers"),
log: log,
}

getAPIRouter := func(subrouter *mux.Router) func(string, func(*http.Request) (interface{}, error)) *mux.Route {
Expand Down Expand Up @@ -552,9 +552,11 @@ func (handlers *Handlers) postAppConfig(r *http.Request) interface{} {

appConfig := config.AppConfig{}
if err := json.NewDecoder(r.Body).Decode(&appConfig); err != nil {
handlers.log.WithField("handler", "postAppConfig").WithError(err).Error("handler failed")
return response{Success: false, ErrorMessage: err.Error()}
}
if err := handlers.backend.Config().SetAppConfig(appConfig); err != nil {
handlers.log.WithField("handler", "postAppConfig").WithError(err).Error("handler failed")
return response{Success: false, ErrorMessage: err.Error()}
}
return response{Success: true}
Expand Down Expand Up @@ -591,9 +593,11 @@ func (handlers *Handlers) postOpen(r *http.Request) interface{} {

var url string
if err := json.NewDecoder(r.Body).Decode(&url); err != nil {
handlers.log.WithField("handler", "postOpen").WithError(err).Error("handler failed")
return response{Success: false, ErrorMessage: err.Error()}
}
if err := handlers.backend.SystemOpen(url); err != nil {
handlers.log.WithField("handler", "postOpen").WithError(err).Error("handler failed")
return response{Success: false, ErrorMessage: err.Error()}
}
return response{Success: true}
Expand Down Expand Up @@ -907,6 +911,7 @@ func (handlers *Handlers) getAccountsBalanceSummary(*http.Request) interface{} {

totalBalance, err := handlers.backend.AccountsBalanceSummary()
if err != nil {
handlers.log.WithField("handler", "getAccountsBalanceSummary").WithError(err).Error("handler failed")
return response{Success: false}
}
return response{Success: true, TotalBalance: totalBalance}
Expand Down Expand Up @@ -1517,6 +1522,7 @@ func (handlers *Handlers) getMarketMoonpayBuyInfo(r *http.Request) interface{} {

acct, err := handlers.backend.GetAccountFromCode(accountsTypes.Code(mux.Vars(r)["code"]))
if err != nil {
handlers.log.WithField("handler", "getMarketMoonpayBuyInfo").WithError(err).Error("handler failed")
return result{Success: false, ErrorMessage: err.Error()}
}

Expand All @@ -1532,6 +1538,7 @@ func (handlers *Handlers) getMarketMoonpayBuyInfo(r *http.Request) interface{} {
}
buy, err := market.MoonpayInfo(acct, params)
if err != nil {
handlers.log.WithField("handler", "getMarketMoonpayBuyInfo").WithError(err).Error("handler failed")
return result{Success: false, ErrorMessage: err.Error()}
}
return result{
Expand Down
14 changes: 13 additions & 1 deletion frontends/web/src/components/anchor/anchor.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: Apache-2.0

import { ReactNode, SyntheticEvent } from 'react';
import { useTranslation } from 'react-i18next';
import { open } from '@/api/system';
import { alertUser } from '@/components/alert/Alert';
import { runningInIOS } from '@/utils/env';
import style from './anchor.module.css';

Expand Down Expand Up @@ -32,6 +34,8 @@ export const A = ({
children,
...props
}: TProps) => {
const { t } = useTranslation();

return (
<span
className={`
Expand All @@ -41,7 +45,15 @@ export const A = ({
title={props.title || href}
onClick={(e: SyntheticEvent) => {
e.preventDefault();
open(href).catch(console.error);
open(href)
.then(response => {
if (!response.success) {
alertUser(response.errorMessage
Comment thread
thisconnect marked this conversation as resolved.
? t('unknownError', { errorMessage: response.errorMessage })
: t('genericError'));
}
})
.catch(console.error);
Comment thread
benma marked this conversation as resolved.
}}
tabIndex={0}
{...props}>
Expand Down
121 changes: 121 additions & 0 deletions frontends/web/src/routes/market/moonpay.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
// SPDX-License-Identifier: Apache-2.0

import '../../../__mocks__/i18n';
import type { ReactNode } from 'react';
import { beforeEach, describe, expect, it, vi } from 'vitest';

vi.mock('@/components/layout', () => ({
Header: ({ title }: { title: ReactNode }) => <div>{title}</div>,
}));
vi.mock('@/components/spinner/Spinner', () => ({
Spinner: ({ text }: { text?: string }) => <div>{text}</div>,
}));
vi.mock('@/hooks/backbutton', () => ({
UseBackButton: () => null,
UseDisableBackButton: () => null,
}));
vi.mock('@/hooks/darkmode', () => ({
useDarkmode: () => ({ isDarkMode: false, toggleDarkmode: vi.fn() }),
}));
vi.mock('@/hooks/vendor-iframe', () => ({
useVendorIframeResizeHeight: () => ({
containerRef: { current: null },
height: 480,
iframeLoaded: false,
onIframeLoad: vi.fn(),
}),
useVendorTerms: () => ({
agreedTerms: true,
setAgreedTerms: vi.fn(),
}),
}));
vi.mock('./guide', () => ({
MarketGuide: () => null,
}));
vi.mock('@/api/market', async (importOriginal) => {
const actual = await importOriginal<typeof import('@/api/market')>();
return {
...actual,
getMoonpayBuyInfo: vi.fn(),
};
});
vi.mock('@/contexts/ConfigProvider', () => ({
useConfig: vi.fn(() => ({
config: { frontend: { skipMoonpayDisclaimer: true }, backend: {} } as TConfig,
setConfig: vi.fn(),
})),
}));

import { render, screen } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
import type { TAccount } from '@/api/account';
import type { TConfig } from '@/api/config';
import * as marketApi from '@/api/market';
import { useConfig } from '@/contexts/ConfigProvider';
import { Moonpay } from './moonpay';

const account: TAccount = {
keystore: {
connected: true,
lastConnected: '',
name: 'BitBox02',
rootFingerprint: 'f23ab988',
watchonly: false,
},
active: true,
blockExplorerTxPrefix: '',
code: 'btc-account',
coinCode: 'btc',
coinName: 'Bitcoin',
coinUnit: 'BTC',
isToken: false,
name: 'Bitcoin Account',
};

const mockUseConfig = vi.mocked(useConfig);

describe('routes/market/moonpay', () => {
beforeEach(() => {
vi.clearAllMocks();
mockUseConfig.mockReturnValue({
config: { frontend: { skipMoonpayDisclaimer: true }, backend: {} } as TConfig,
setConfig: vi.fn(),
});
});

it('renders the MoonPay iframe on success', async () => {
vi.mocked(marketApi.getMoonpayBuyInfo).mockReturnValue(() => Promise.resolve({
success: true,
url: 'https://buy.moonpay.com?walletAddress=bc1qexample',
address: 'bc1qexample',
}));

render(
<MemoryRouter>
<Moonpay accounts={[account]} code={account.code} />
</MemoryRouter>
);

const iframe = await screen.findByTitle('Moonpay');
expect(iframe).toHaveAttribute(
'src',
'https://buy.moonpay.com?walletAddress=bc1qexample&colorCode=%235E94BF&theme=light',
);
});

it('renders an error message on failure', async () => {
vi.mocked(marketApi.getMoonpayBuyInfo).mockReturnValue(() => Promise.resolve({
success: false,
errorMessage: 'Account is not valid.',
}));

render(
<MemoryRouter>
<Moonpay accounts={[account]} code={account.code} />
</MemoryRouter>
);

expect(await screen.findByText('Account is not valid.')).toBeInTheDocument();
expect(screen.queryByTitle('Moonpay')).not.toBeInTheDocument();
});
});
2 changes: 1 addition & 1 deletion frontends/web/src/routes/market/moonpay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import { getMoonpayBuyInfo } from '@/api/market';
import { MarketGuide } from './guide';
import { Header } from '@/components/layout';
import { MobileHeader } from '../settings/components/mobile-header';
import { Message } from '@/components/message/message';
import { Spinner } from '@/components/spinner/Spinner';
import { findAccount, isBitcoinOnly } from '@/routes/account/utils';
import { MoonpayTerms } from '@/components/terms/moonpay-terms';
import { useVendorIframeResizeHeight, useVendorTerms } from '@/hooks/vendor-iframe';
import { Message } from '@/components/message/message';
import style from './iframe.module.css';

type TProps = {
Expand Down