Merge branch 'frontend-bb01-remove-receive'

Author: thisconnect

frontends/web/src/locales/en/app.json

@@ -1957,7 +1957,6 @@
     "coincontrol": "One or more UTXOs have a reused address. Be aware the receiver will see all UTXOs associated with those addresses.",
     "receivePairing": "Please pair the BitBox to enable secure address verification. Go to 'Manage device' in the sidebar.",
     "sdcard": "Keep the microSD card stored separate from the BitBox, unless you want to manage backups.",
-    "sendPairing": "Please pair the BitBox to securely verify transaction details. Go to 'Manage device' in the sidebar.",
     "testnet": "Warning: You are currently using the wallet in Testnet mode. Transactions and balances here are not real and will not appear on the mainnet. Testnet is intended for testing and development purposes only."
   },
   "welcome": {

frontends/web/src/routes/account/send/components/confirm/confirm.tsx

@@ -15,31 +15,36 @@
  */
 
 import { useTranslation } from 'react-i18next';
+import { CoinCode, ConversionUnit, FeeTargetCode, Fiat, IAmount } from '@/api/account';
 import { Amount } from '@/components/amount/amount';
 import { customFeeUnit } from '@/routes/account/utils';
 import { View, ViewContent, ViewHeader } from '@/components/view/view';
 import { Message } from '@/components/message/message';
 import { PointToBitBox02 } from '@/components/icon';
-import { TConfirmSendProps } from '@/routes/account/send/components/confirm/types';
-import { ConfirmingWaitDialog } from '@/routes/account/send/components/confirm/dialogs/confirm-wait-dialog';
 import { FiatValue } from '../fiat-value';
 import style from './confirm.module.css';
 
-type TConfirmSend = { bb01Paired: boolean | undefined } & TConfirmSendProps;
-
-export const ConfirmSend = (props: TConfirmSend) => {
-  return (props.bb01Paired !== undefined ? (
-    <ConfirmingWaitDialog
-      {...props}
-    />
-  ) : (
-    <BB02ConfirmSend
-      {...props}
-    />
-  ));
+type TransactionDetails = {
+  proposedAmount?: IAmount;
+  proposedFee?: IAmount;
+  proposedTotal?: IAmount;
+  feeTarget?: FeeTargetCode;
+  customFee: string;
+  recipientAddress: string;
+  activeCurrency: Fiat;
 };
 
-const BB02ConfirmSend = ({
+type TConfirmSendProps = {
+  baseCurrencyUnit: ConversionUnit;
+  note: string;
+  hasSelectedUTXOs: boolean;
+  isConfirming: boolean;
+  selectedUTXOs: string[];
+  coinCode: CoinCode;
+  transactionDetails: TransactionDetails;
+}
+
+export const ConfirmSend = ({
   baseCurrencyUnit,
   note,
   hasSelectedUTXOs,

frontends/web/src/routes/account/send/components/confirm/dialogs/confirm-wait-dialog.module.css

@@ -14,59 +14,26 @@
  * limitations under the License.
  */
 
-import { useContext, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
+import { useContext } from 'react';
 import { AccountCode, IAccount } from '@/api/account';
-import { hasMobileChannel, TDevices } from '@/api/devices';
-import { getDeviceInfo } from '@/api/bitbox01';
 import { RatesContext } from '@/contexts/RatesContext';
-import { findAccount, isBitcoinBased } from '@/routes/account/utils';
-import { alertUser } from '@/components/alert/Alert';
+import { findAccount } from '@/routes/account/utils';
 import { Send } from './send';
 
 type TSendProps = {
-    accounts: IAccount[];
-    code: AccountCode;
-    devices: TDevices;
-    deviceIDs: string[];
+  accounts: IAccount[];
+  code: AccountCode;
 }
 
-export const SendWrapper = ({ accounts, code, deviceIDs, devices }: TSendProps) => {
-  const { t } = useTranslation();
+export const SendWrapper = ({ accounts, code }: TSendProps) => {
   const { defaultCurrency } = useContext(RatesContext);
 
-  const [bb01Paired, setBB01Paired] = useState<boolean>();
-  const [noMobileChannelError, setNoMobileChannelError] = useState<boolean>();
-
   const account = findAccount(accounts, code);
 
-  useEffect(() => {
-    const product = deviceIDs.length > 0 ? devices[deviceIDs[0]] : undefined;
-    if (account && product === 'bitbox') {
-      const fetchData = async () => {
-        try {
-          const mobileChannel = await hasMobileChannel(deviceIDs[0])();
-          const deviceInfo = await getDeviceInfo(deviceIDs[0]);
-          if (deviceInfo) {
-            setBB01Paired(mobileChannel && deviceInfo.pairing);
-            setNoMobileChannelError(deviceInfo.pairing && !mobileChannel && isBitcoinBased(account.coinCode));
-          }
-        } catch (error) {
-          console.error(error);
-        }
-      };
-      fetchData();
-    }
-  }, [account, deviceIDs, devices]);
-
-  if (noMobileChannelError) {
-    alertUser(t('warning.sendPairing'));
-  }
   return (
     account ? (
       <Send
         account={account}
-        bb01Paired={bb01Paired}
         activeCurrency={defaultCurrency}
       />
     ) : (null)

frontends/web/src/routes/account/send/components/confirm/dialogs/confirm-wait-dialog.tsx

@@ -43,11 +43,9 @@ import { TProposalError, txProposalErrorHandling } from './services';
 import { CoinControl } from './coin-control';
 import style from './send.module.css';
 
-interface SendProps {
-    account: accountApi.IAccount;
-    // undefined if bb02 is connected.
-    bb01Paired: boolean | undefined;
-    activeCurrency: accountApi.Fiat;
+type SendProps = {
+  account: accountApi.IAccount;
+  activeCurrency: accountApi.Fiat;
 }
 
 type Props = SendProps & TranslateProps;
@@ -370,7 +368,6 @@ class Send extends Component<Props, State> {
   public render() {
     const {
       account,
-      bb01Paired,
       activeCurrency,
       t,
     } = this.props;
@@ -501,7 +498,6 @@ class Send extends Component<Props, State> {
                 </Grid>
               </ViewContent>
               <ConfirmSend
-                bb01Paired={bb01Paired}
                 baseCurrencyUnit={activeCurrency}
                 note={note}
                 hasSelectedUTXOs={this.hasSelectedUTXOs()}

frontends/web/src/routes/account/send/components/confirm/types.ts

@@ -21,6 +21,7 @@ import { route } from '../../../../utils/route';
 import { getDeviceInfo } from '../../../../api/bitbox01';
 import { apiGet } from '../../../../utils/request';
 import { apiWebsocket } from '../../../../utils/websocket';
+import { hasMobileChannel } from '@/api/devices';
 import { Guide } from '../../../../components/guide/guide';
 import { Entry } from '../../../../components/guide/entry';
 import { Header } from '../../../../components/layout';
@@ -79,7 +80,7 @@ class Settings extends Component {
         }
       });
 
-    apiGet('devices/' + this.props.deviceID + '/has-mobile-channel').then(mobileChannel => {
+    hasMobileChannel(this.props.deviceID).then(mobileChannel => {
       this.setState({ mobileChannel });
     });
 

frontends/web/src/routes/account/send/send-wrapper.tsx

@@ -112,8 +112,6 @@ export const AppRouter = ({ devices, deviceIDs, devicesKey, accounts, activeAcco
   const AccSend = (<InjectParams>
     <SendWrapper
       code={'' /* dummy to satisfy TS */}
-      devices={devices}
-      deviceIDs={deviceIDs}
       accounts={activeAccounts} />
   </InjectParams>);