Merge branch 'frontend-type-post-calls'

Author: thisconnect

frontends/web/src/api/account.ts

@@ -374,10 +374,6 @@ export const addAccount = (coinCode: string, name: string): Promise<TAddAccount>
   });
 };
 
-export const testRegister = (pin: string): Promise<null> => {
-  return apiPost('test/register', { pin });
-};
-
 export const connectKeystore = (code: AccountCode): Promise<{ success: boolean; }> => {
   return apiPost(`account/${code}/connect-keystore`);
 };
@@ -394,7 +390,6 @@ export type TSignWalletConnectTx = {
   rawTx: string;
 }
 
-
 export const ethSignMessage = (code: AccountCode, message: string): Promise<TSignMessage> => {
   return apiPost(`account/${code}/eth-sign-msg`, message);
 };
@@ -420,4 +415,3 @@ export type AddressSignResponse = {
 export const signAddress = (format: ScriptType | '', msg: string, code: AccountCode): Promise<AddressSignResponse> => {
   return apiPost(`account/${code}/sign-address`, { format, msg, code });
 };
-

frontends/web/src/api/bitbox02.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2023 Shift Crypto AG
+ * Copyright 2023-2024 Shift Crypto AG
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -181,3 +181,7 @@ export const getRootFingerprint = (
 export const invokeBIP85 = (deviceID: string): Promise<SuccessResponse | FailResponse> => {
   return apiPost(`devices/bitbox02/${deviceID}/invoke-bip85`);
 };
+
+export const gotoStartupSettings = (deviceID: string) => {
+  return apiPost(`devices/bitbox02/${deviceID}/goto-startup-settings`);
+};

frontends/web/src/api/keystores.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2023 Shift Crypto AG
+ * Copyright 2023-2024 Shift Crypto AG
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 import { subscribeEndpoint, TUnsubscribe } from './subscribe';
-import { apiGet } from '../utils/request';
+import { apiGet, apiPost } from '../utils/request';
 
 export type { TUnsubscribe };
 
@@ -31,3 +31,11 @@ export const subscribeKeystores = (
 export const getKeystores = (): Promise<TKeystores> => {
   return apiGet('keystores');
 };
+
+export const registerTest = (pin: string): Promise<null> => {
+  return apiPost('test/register', { pin });
+};
+
+export const deregisterTest = (): Promise<null> => {
+  return apiPost('test/deregister');
+};

frontends/web/src/api/node.ts

@@ -0,0 +1,45 @@
+/**
+ * Copyright 2024 Shift Crypto AG
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { apiPost } from '../utils/request';
+import { SuccessResponse } from './response';
+
+type TCertResponse = {
+  success: true;
+  pemCert: string;
+} | {
+  success: false;
+  errorMessage: string;
+};
+
+export const downloadCert = (electrumServer: string): Promise<TCertResponse> => {
+  return apiPost('certs/download', electrumServer);
+};
+
+export type TElectrumServer = {
+  server: string;
+  tls: boolean;
+  pemCert: string;
+};
+
+type TCheckElectrumResponse = SuccessResponse | {
+  success: false;
+  errorMessage: string;
+};
+
+export const checkElectrum = (server: TElectrumServer): Promise<TCheckElectrumResponse> => {
+  return apiPost('electrum/check', server);
+};

frontends/web/src/components/sidebar/sidebar.tsx

@@ -1,6 +1,6 @@
 /**
  * Copyright 2018 Shift Devices AG
- * Copyright 2021 Shift Crypto AG
+ * Copyright 2021-2024 Shift Crypto AG
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +16,20 @@
  */
 
 import React, { useContext, useEffect } from 'react';
+import { useLocation } from 'react-router';
 import { Link, NavLink } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { useKeystores } from '../../hooks/backend';
 import { IAccount } from '../../api/account';
+import { deregisterTest } from '../../api/keystores';
 import coins from '../../assets/icons/coins.svg';
 import ejectIcon from '../../assets/icons/eject.svg';
 import shieldIcon from '../../assets/icons/shield_grey.svg';
 import linechart from '../../assets/icons/linechart.svg';
 import settings from '../../assets/icons/settings-alt.svg';
 import settingsGrey from '../../assets/icons/settings-alt_disabled.svg';
 import { debug } from '../../utils/env';
-import { apiPost } from '../../utils/request';
 import Logo, { AppLogoInverted } from '../icon/logo';
-import { useLocation } from 'react-router';
 import { CloseXWhite, USBSuccess } from '../icon';
 import { getAccountsByKeystore, isAmbiguiousName, isBitcoinOnly } from '../../routes/account/utils';
 import { SkipForTesting } from '../../routes/device/components/skipfortesting';
@@ -67,7 +67,7 @@ const GetAccountLink = ({
 };
 
 const eject = (e: React.SyntheticEvent): void => {
-  apiPost('test/deregister');
+  deregisterTest();
   e.preventDefault();
 };
 

frontends/web/src/routes/device/components/skipfortesting.tsx

@@ -15,7 +15,7 @@
  */
 
 import React, { useState } from 'react';
-import { testRegister } from '../../../api/account';
+import { registerTest } from '../../../api/keystores';
 import { getTesting } from '../../../api/backend';
 import { Button } from '../../../components/forms';
 import { PasswordSingleInput } from '../../../components/password';
@@ -29,7 +29,7 @@ export const SkipForTesting = () => {
   const [testPIN, setTestPIN] = useState('');
   const registerTestingDevice = async (e: React.SyntheticEvent) => {
     e.preventDefault();
-    await testRegister(testPIN);
+    await registerTest(testPIN);
     setDialog(false);
   };
 

frontends/web/src/routes/settings/components/device-settings/go-to-startup-settings.tsx

@@ -1,5 +1,5 @@
 /**
- * Copyright 2023 Shift Crypto AG
+ * Copyright 2023-2024 Shift Crypto AG
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@
 
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { gotoStartupSettings } from '../../../../api/bitbox02';
 import { ChevronRightDark } from '../../../../components/icon';
 import { SettingsItem } from '../settingsItem/settingsItem';
 import { WaitDialog } from '../../../../components/wait-dialog/wait-dialog';
-import { apiPost } from '../../../../utils/request';
 
 type TGoToStartupSettingsProps = {
     deviceID: string;
@@ -49,7 +49,7 @@ const GoToStartupSettings = ({ deviceID }: TGoToStartupSettingsProps) => {
   const [show, setShow] = useState(false);
   const handleGoToStartupSettings = async () => {
     setShow(true);
-    await apiPost(`devices/bitbox02/${deviceID}/goto-startup-settings`).catch(console.error);
+    await gotoStartupSettings(deviceID).catch(console.error);
     setShow(false);
   };
   return (

frontends/web/src/routes/settings/electrum-add-server.tsx

@@ -16,10 +16,9 @@
 
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { checkElectrum, downloadCert, TElectrumServer } from '../../api/node';
 import { Button, Input } from '../../components/forms';
-import { apiPost } from '../../utils/request';
 import { alertUser } from '../../components/alert/Alert';
-import { TElectrumServer } from './types';
 import style from './electrum.module.css';
 
 type Props = {
@@ -50,9 +49,9 @@ export const ElectrumAddServer = ({
     setElectrumCert('');
   };
 
-  const downloadCert = async () => {
+  const downloadCertificate = async () => {
     setLoadingCert(true);
-    const data = await apiPost('certs/download', electrumServer.trim());
+    const data = await downloadCert(electrumServer.trim());
     if (data.success) {
       setElectrumCert(data.pemCert);
     } else {
@@ -63,13 +62,13 @@ export const ElectrumAddServer = ({
 
   const check = async () => {
     setLoadingCheck(true);
-    const { success, errorMessage } = await apiPost('electrum/check', getServer());
-    if (success) {
+    const response = await checkElectrum(getServer());
+    if (response.success) {
       alertUser(t('settings.electrum.checkSuccess', { host: electrumServer }));
     } else {
-      alertUser(t('settings.electrum.checkFailed') + ':\n' + errorMessage);
+      alertUser(t('settings.electrum.checkFailed') + ':\n' + response.errorMessage);
     }
-    setValid(success);
+    setValid(response.success);
     setLoadingCheck(false);
   };
 
@@ -108,7 +107,7 @@ export const ElectrumAddServer = ({
         placeholder={'-----BEGIN CERTIFICATE-----\n...\n-----END CERTIFICATE-----'}
       />
       <div className={[style.block, 'flex flex-row flex-end'].join(' ')}>
-        <Button primary disabled={downloadCertButtonDisabled} onClick={downloadCert}>
+        <Button primary disabled={downloadCertButtonDisabled} onClick={downloadCertificate}>
           {
             loadingCert && (
               <div className={style.miniSpinnerContainer}>

frontends/web/src/routes/settings/electrum-server.tsx

@@ -16,9 +16,8 @@
 
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { apiPost } from '../../utils/request';
+import { TElectrumServer, checkElectrum } from '../../api/node';
 import { alertUser } from '../../components/alert/Alert';
-import { TElectrumServer } from './types';
 import style from './electrum.module.css';
 
 type Props = {
@@ -35,15 +34,15 @@ export const ElectrumServer = ({
 
   const check = async () => {
     setLoadingCheck(true);
-    const { success, errorMessage } = await apiPost('electrum/check', {
+    const response = await checkElectrum({
       server: server.server.trim(),
       pemCert: server.pemCert,
       tls: server.tls,
     });
-    if (success) {
+    if (response.success) {
       alertUser(t('settings.electrum.checkSuccess', { host: server.server }));
     } else {
-      alertUser(t('settings.electrum.checkFailed') + ':\n' + errorMessage);
+      alertUser(t('settings.electrum.checkFailed') + ':\n' + response.errorMessage);
     }
     setLoadingCheck(false);
   };

frontends/web/src/routes/settings/electrum-servers.tsx

@@ -16,9 +16,9 @@
 
 import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import type { TElectrumServer } from '../../api/node';
 import { ElectrumAddServer } from './electrum-add-server';
 import { ElectrumServer } from './electrum-server';
-import { TElectrumServer } from './types';
 import { getDefaultConfig } from '../../api/backend';
 import { getConfig, setConfig } from '../../utils/config';
 import { confirmation } from '../../components/confirm/Confirm';

frontends/web/src/routes/settings/types.ts

@@ -14,13 +14,7 @@
  * limitations under the License.
  */
 
-export type TElectrumServer = {
-  server: string;
-  tls: boolean;
-  pemCert: string;
-};
-
 export type TPagePropsWithSettingsTabs = {
   deviceIDs: string[];
   hasAccounts: boolean;
-};
+};