Skip to content

Commit e5205c3

Browse files
JasonvdbJasonvdb
committed
client version bump
1 parent 177f015 commit e5205c3

File tree

8 files changed

+85
-23
lines changed

8 files changed

+85
-23
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"dependencies": {
66
"@reduxjs/toolkit": "^1.6.1",
7-
"@synonymdev/blocktank-client": "^0.0.30",
7+
"@synonymdev/blocktank-client": "^0.0.34",
88
"@testing-library/jest-dom": "^5.11.4",
99
"@testing-library/react": "^11.1.0",
1010
"@testing-library/user-event": "^12.1.10",

‎src/App.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function App(): JSX.Element {
2828
</Route>
2929

3030
<Route path={['/terms-and-conditions', '/blocktank/terms-and-conditions']}>
31-
<TermsPage />
31+
<TermsPage showFullPage />
3232
</Route>
3333

3434
<Route exact path={['/*']}>

‎src/components/payment-request/index.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
}
1818

1919
.payment-request-qr {
20-
margin-bottom: 20px;
20+
@media (max-width:480px) {
21+
margin-bottom: 10px;
22+
}
2123
}
2224

2325
.payment-request-details {

‎src/components/payment-request/index.tsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React from 'react';
22
import bip21 from 'bip21';
33
import QRCode from '../qr';
44
import ActionButton from '../action-button';
5+
import Divider from '../divider';
56
import './index.scss';
67
import { clipCenter, orderExpiryFormat } from '../../utils/helpers';
78
import Tooltip from '../tooltip';
@@ -86,11 +87,13 @@ export default ({
8687
}}
8788
/>
8889
</div>
89-
<p className={'payment-request-address'}>{clipCenter(text, 45)}</p>
90+
<p className={'payment-request-address'}>{clipCenter(text, 42)}</p>
9091
<ActionButton copyText={text}>{copyButtonTitle}</ActionButton>
9192
</div>
9293
</div>
9394

95+
<Divider />
96+
9497
<div className={'payment-request-middle'}>
9598
<div>
9699
<h4 className={'payment-request-title'}>Total amount to pay</h4>

‎src/pages/public/index.tsx

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import OrdersPage from './orders';
66
import ConfirmationPage from './confirm';
77
import PaymentPage from './payment';
88
import ClaimPage from './claim';
9+
import TermsPage from './terms';
910
import MenuPage from './menu';
1011
import FullWebpageContainer from '../../components/full-webpage-container';
1112
import { useAppSelector } from '../../store/hooks';
@@ -36,6 +37,9 @@ export const Widget = (): JSX.Element => {
3637
case 'order': {
3738
return <OrderPage />;
3839
}
40+
case 'terms': {
41+
return <TermsPage />;
42+
}
3943
default: {
4044
return <OrdersPage />;
4145
}

‎src/pages/public/terms/index.tsx

+27-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { useEffect, useState } from 'react';
22
import Spinner from '../../../components/spinner';
3+
import FormCard from '../../../components/form-card';
34
import { Col, Container, Row } from 'react-bootstrap';
45

56
import './index.scss';
@@ -19,28 +20,40 @@ const format = (rawHtml: string): string => {
1920
.replaceAll('c5', ''); // Removes white highlighted text
2021
};
2122

22-
function TermsPage(): JSX.Element {
23+
function TermsPage({ showFullPage }: { showFullPage?: boolean }): JSX.Element {
2324
const [content, setContent] = useState('');
2425
useEffect(() => {
2526
fetchContent()
2627
.then((c) => setContent(format(c)))
2728
.catch((e) => alert('Failed to load terms and conditions'));
2829
}, []);
2930

31+
const contents = (
32+
<>
33+
{content ? (
34+
<Col lg={10} md={11} sm={11}>
35+
<div className={'terms-container'} dangerouslySetInnerHTML={{ __html: content }}></div>
36+
</Col>
37+
) : (
38+
<div className={'terms-spinner-container'}>
39+
<Spinner centered />
40+
</div>
41+
)}
42+
</>
43+
);
44+
45+
if (showFullPage) {
46+
return (
47+
<Container>
48+
<Row className='justify-content-md-center'>{contents}</Row>
49+
</Container>
50+
);
51+
}
52+
3053
return (
31-
<Container>
32-
<Row className='justify-content-md-center'>
33-
{content ? (
34-
<Col lg={10} md={11} sm={11}>
35-
<div className={'terms-container'} dangerouslySetInnerHTML={{ __html: content }}></div>
36-
</Col>
37-
) : (
38-
<div className={'terms-spinner-container'}>
39-
<Spinner centered />
40-
</div>
41-
)}
42-
</Row>
43-
</Container>
54+
<FormCard title={'Terms of service'} backPage={'confirm'}>
55+
{contents}
56+
</FormCard>
4457
);
4558
}
4659

‎src/store/public-store.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import bt, {
88

99
type RequestState = 'idle' | 'loading' | 'error' | 'geoblocked';
1010

11-
export type TPublicPage = 'configure' | 'confirm' | 'payment' | 'claim' | 'order' | 'orders';
11+
export type TPublicPage = 'configure' | 'confirm' | 'payment' | 'claim' | 'order' | 'orders' | 'terms';
1212
export type TNavigationState = {
1313
page: TPublicPage;
1414
orderId?: string;

‎yarn.lock

+44-4
Original file line numberDiff line numberDiff line change
@@ -1768,12 +1768,13 @@
17681768
"@svgr/plugin-svgo" "^5.5.0"
17691769
loader-utils "^2.0.0"
17701770

1771-
"@synonymdev/blocktank-client@^0.0.30":
1772-
version "0.0.30"
1773-
resolved "https://registry.yarnpkg.com/@synonymdev/blocktank-client/-/blocktank-client-0.0.30.tgz#3ffd7a0b8a4976f9e4f4f656353c7bcdc9f910e5"
1774-
integrity sha512-ckXEUkUt7A0H7X1lxVXN5hnqFQmcOKtRdQsv9Zw9s+XEukiu3ONTL7+QBlCdfDKcij2cj+EBcuIEUUUmFtyx2A==
1771+
"@synonymdev/blocktank-client@^0.0.34":
1772+
version "0.0.34"
1773+
resolved "https://registry.yarnpkg.com/@synonymdev/blocktank-client/-/blocktank-client-0.0.34.tgz#724cbdfd8011554ace6cec45cafe66a3eecde738"
1774+
integrity sha512-LxqvAPuQlE+8oQkg1Y9XWWM9kq4SM8DN9nAN4yl6W2f/TYU+rqRVVG6OCSz6c33uAY8zhy2qIS5z3cdw1gp9dQ==
17751775
dependencies:
17761776
cross-fetch "^3.1.4"
1777+
node-fetch "3.1.1"
17771778

17781779
"@testing-library/dom@^7.28.1":
17791780
version "7.31.2"
@@ -4336,6 +4337,11 @@ dashdash@^1.12.0:
43364337
dependencies:
43374338
assert-plus "^1.0.0"
43384339

4340+
data-uri-to-buffer@^4.0.0:
4341+
version "4.0.0"
4342+
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b"
4343+
integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==
4344+
43394345
data-urls@^2.0.0:
43404346
version "2.0.0"
43414347
resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -5737,6 +5743,14 @@ fb-watchman@^2.0.0:
57375743
dependencies:
57385744
bser "2.1.1"
57395745

5746+
fetch-blob@^3.1.2, fetch-blob@^3.1.3:
5747+
version "3.1.4"
5748+
resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.1.4.tgz#e8c6567f80ad7fc22fd302e7dcb72bafde9c1717"
5749+
integrity sha512-Eq5Xv5+VlSrYWEqKrusxY1C3Hm/hjeAsCGVG3ft7pZahlUAChpGZT/Ms1WmSLnEAisEXszjzu/s+ce6HZB2VHA==
5750+
dependencies:
5751+
node-domexception "^1.0.0"
5752+
web-streams-polyfill "^3.0.3"
5753+
57405754
figgy-pudding@^3.5.1:
57415755
version "3.5.2"
57425756
resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
@@ -5936,6 +5950,13 @@ form-data@~2.3.2:
59365950
combined-stream "^1.0.6"
59375951
mime-types "^2.1.12"
59385952

5953+
formdata-polyfill@^4.0.10:
5954+
version "4.0.10"
5955+
resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
5956+
integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==
5957+
dependencies:
5958+
fetch-blob "^3.1.2"
5959+
59395960
forwarded@~0.1.2:
59405961
version "0.1.2"
59415962
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@@ -8574,11 +8595,25 @@ no-case@^3.0.4:
85748595
lower-case "^2.0.2"
85758596
tslib "^2.0.3"
85768597

8598+
node-domexception@^1.0.0:
8599+
version "1.0.0"
8600+
resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
8601+
integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
8602+
85778603
[email protected]:
85788604
version "2.6.1"
85798605
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
85808606
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
85818607

8608+
[email protected]:
8609+
version "3.1.1"
8610+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.1.1.tgz#d0d9607e455b3087e3092b821b5b1f1ebf4c2147"
8611+
integrity sha512-SMk+vKgU77PYotRdWzqZGTZeuFKlsJ0hu4KPviQKkfY+N3vn2MIzr0rvpnYpR8MtB3IEuhlEcuOLbGvLRlA+yg==
8612+
dependencies:
8613+
data-uri-to-buffer "^4.0.0"
8614+
fetch-blob "^3.1.3"
8615+
formdata-polyfill "^4.0.10"
8616+
85828617
node-forge@^0.10.0:
85838618
version "0.10.0"
85848619
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
@@ -12818,6 +12853,11 @@ wbuf@^1.1.0, wbuf@^1.7.3:
1281812853
dependencies:
1281912854
minimalistic-assert "^1.0.0"
1282012855

12856+
web-streams-polyfill@^3.0.3:
12857+
version "3.2.0"
12858+
resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz#a6b74026b38e4885869fb5c589e90b95ccfc7965"
12859+
integrity sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA==
12860+
1282112861
web-vitals@^1.0.1:
1282212862
version "1.1.2"
1282312863
resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-1.1.2.tgz#06535308168986096239aa84716e68b4c6ae6d1c"

0 commit comments

Comments
 (0)