Bug fixes

Author: Jasonvdb

Diff for: package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@reduxjs/toolkit": "^1.6.1",
-    "@synonymdev/blocktank-client": "^0.0.44",
+    "@synonymdev/blocktank-client": "^0.0.45",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
@@ -57,7 +57,8 @@
     "build:testnet": "REACT_APP_MAINNET=false yarn build",
     "build:mainnet": "REACT_APP_MAINNET=true yarn build",
     "deploy:testnet": "yarn build:testnet && surge ./build http://cr-98375983893.surge.sh",
-    "deploy:mainnet": "yarn build:mainnet && surge ./build http://bt-mainnet.surge.sh"
+    "deploy:mainnet": "yarn build:mainnet && surge ./build http://bt-mainnet.surge.sh",
+    "deploy": "yarn deploy:testnet && yarn deploy:mainnet"
   },
   "eslintConfig": {
     "extends": [

Diff for: src/pages/public/configure/index.tsx

@@ -3,7 +3,13 @@ import { Button, Form } from 'react-bootstrap';
 import bt, { IBuyChannelRequest, IService } from '@synonymdev/blocktank-client';
 
 import { useAppDispatch, useAppSelector } from '../../../store/hooks';
-import { refreshInfo, selectInfo, selectInfoState, navigate } from '../../../store/public-store';
+import {
+	refreshInfo,
+	selectInfo,
+	selectInfoState,
+	navigate,
+	refreshOrder
+} from '../../../store/public-store';
 import Spinner from '../../../components/spinner';
 import FormCard from '../../../components/form-card';
 import './index.scss';
@@ -94,7 +100,11 @@ function ConfigurePage(): JSX.Element {
 			const buyRes = await bt.buyChannel(req);
 			const { order_id } = buyRes;
 
-			dispatch(navigate({ page: 'confirm', orderId: order_id }));
+			dispatch(refreshOrder(order_id))
+				.then(() => {
+					dispatch(navigate({ page: 'confirm', orderId: order_id }));
+				})
+				.catch((refreshError) => alert(refreshError));
 		} catch (error) {
 			setIsSubmitting(false);
 			console.log(error);

Diff for: src/pages/public/confirm/index.tsx

@@ -99,7 +99,7 @@ function ConfirmationPage(): JSX.Element {
 				>
 					<span>I accept the </span>
 					<a target={'_blank'} className={'link'} href={'/terms-and-conditions'}>
-						terms and conditions
+						terms of service
 					</a>
 				</Checkbox>
 			</div>

Diff for: src/pages/public/payment/index.scss

@@ -9,5 +9,4 @@
   font-weight: 600;
   font-size: 15px;
   color: #F75C1A;
-  margin-top: 20px;
 }

Diff for: src/utils/helpers.ts

@@ -30,6 +30,10 @@ const orderExpiryLabels = {
 TimeAgo.addLabels('en', 'long', orderExpiryLabels);
 
 export const clipCenter = (str: string, maxLength: number): string => {
+	if (!str) {
+		return '';
+	}
+
 	if (str.length > maxLength) {
 		const center = Math.round(maxLength / 2);
 		return `${str.substr(0, center)}...${str.substr(str.length - center, str.length)}`;

Diff for: yarn.lock

@@ -1768,10 +1768,10 @@
     "@svgr/plugin-svgo" "^5.5.0"
     loader-utils "^2.0.0"
 
-"@synonymdev/blocktank-client@^0.0.44":
-  version "0.0.44"
-  resolved "https://registry.yarnpkg.com/@synonymdev/blocktank-client/-/blocktank-client-0.0.44.tgz#7ec49846751a31382c7033c1cf36548487022438"
-  integrity sha512-eehJaOzIhILqv/zbj8ImKbqQD+tEnbgHQeYeQrtGNnwMUDLXDb9zTA/9MzC/CTyJ32C9iNaS1LHmUHKu4GkTeQ==
+"@synonymdev/blocktank-client@^0.0.45":
+  version "0.0.45"
+  resolved "https://registry.yarnpkg.com/@synonymdev/blocktank-client/-/blocktank-client-0.0.45.tgz#4369d4463d5831d701bd98cfa070ccf670d5713a"
+  integrity sha512-cASzVmT9HQA0y4+yI2Kaz24dLXk1uDjDPY2+g+cVRqOK9ZinljKtHHFUNyMwPQUpf9mi4Xo21twbGHvu3eQdAg==
   dependencies:
     cross-fetch "^3.1.4"
     node-fetch "3.1.1"