Skip to content

Commit

Permalink
fix: after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
peter-sanderson committed Nov 27, 2024
1 parent 34cd68f commit 553daa4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useEffect, useState, useCallback } from 'react';

import { desktopApi, ElectronBluetoothDevice } from '@trezor/suite-desktop-api';
import TrezorConnect, { DeviceModelInternal } from '@trezor/connect';
import TrezorConnect from '@trezor/connect';
import { Card, ElevationUp, Column } from '@trezor/components';
import { spacings } from '@trezor/theme';
import { notificationsActions } from '@suite-common/toast-notifications';
Expand All @@ -14,6 +14,7 @@ import { BluetoothPairingPin } from './BluetoothPairingPin';
import { BluetoothScanHeader } from './BluetoothScanHeader';
import { BluetoothScanFooter } from './BluetoothScanFooter';
import { FakeScanStatus } from './types';
import { useDispatch } from '../../../hooks/suite';

const FAKE_SCAN_TIMEOUT = 30_000;

Expand Down Expand Up @@ -53,21 +54,23 @@ export const BluetoothConnect = ({ onClose }: BluetoothConnectProps) => {
uuid: '6ab9d595-c4d3-4d2e-9b91-8a7d5a15fc28',
name: 'HardcodedDevice',
paired: false,
pairing_mode: false,
connected: false,
timestamp: 1732533276,
rssi: 0,
model: DeviceModelInternal.T3B1,
color: '1',
internal_model: 1,
model_variant: 1,
},
{
uuid: '6ab9d595-c4d3-4d2e-9b91-8a7d5a15fc29',
name: 'AlsoHardcodedDevice',
paired: false,
pairing_mode: false,
connected: false,
timestamp: 1732534276,
rssi: 0,
model: DeviceModelInternal.T3B1,
color: '2',
internal_model: 1,
model_variant: 2,
},
...list,
]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ export const BluetoothDevice = ({ device, flex, margin }: BluetoothDeviceProps)

return (
<Row gap={spacings.md} alignItems="stretch" flex={flex} margin={margin}>
{/* Todo: finalise if we will provide model name before pairing */}

<RotateDeviceImage
deviceModel={model}
deviceColor={color}
Expand All @@ -42,9 +40,13 @@ export const BluetoothDevice = ({ device, flex, margin }: BluetoothDeviceProps)
<Text typographyStyle="body">Trezor Safe 7</Text>

<Row>
<Text typographyStyle="hint">{colorName}</Text>
<Text typographyStyle="hint" variant="tertiary">
{colorName}
</Text>
<Icon name="dot" />
<Text typographyStyle="hint">{device.name}</Text>
<Text typographyStyle="hint" variant="tertiary">
{device.name}
</Text>
</Row>
</Column>
</Row>
Expand Down

0 comments on commit 553daa4

Please sign in to comment.