Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 78e2fb5

Browse files
author
Kerry Archibald
committed
move ownbeaconstatus to write dir
Signed-off-by: Kerry Archibald <[email protected]>
1 parent 3415715 commit 78e2fb5

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/components/views/location/OwnBeaconStatus.tsx renamed to src/components/views/beacon/OwnBeaconStatus.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import React, { HTMLProps } from 'react';
1919

2020
import { _t } from '../../../languageHandler';
2121
import { useOwnLiveBeacons } from '../../../utils/beacon';
22-
import BeaconStatus from '../beacon/BeaconStatus';
23-
import { BeaconDisplayStatus } from '../beacon/displayStatus';
22+
import BeaconStatus from './BeaconStatus';
23+
import { BeaconDisplayStatus } from './displayStatus';
2424
import AccessibleButton from '../elements/AccessibleButton';
2525

2626
interface Props {
@@ -56,33 +56,33 @@ const OwnBeaconStatus: React.FC<Props & HTMLProps<HTMLDivElement>> = ({
5656
displayLiveTimeRemaining
5757
{...rest}
5858
>
59-
{ ownDisplayStatus === BeaconDisplayStatus.Active && <AccessibleButton
59+
{ownDisplayStatus === BeaconDisplayStatus.Active && <AccessibleButton
6060
data-test-id='beacon-status-stop-beacon'
6161
kind='link'
6262
onClick={onStopSharing}
6363
className='mx_BeaconStatus_destructiveButton'
6464
disabled={stoppingInProgress}
6565
>
66-
{ _t('Stop') }
66+
{_t('Stop')}
6767
</AccessibleButton>
6868
}
69-
{ hasWireError && <AccessibleButton
69+
{hasWireError && <AccessibleButton
7070
data-test-id='beacon-status-reset-wire-error'
7171
kind='link'
7272
onClick={onResetWireError}
7373
className='mx_BeaconStatus_destructiveButton'
7474
>
75-
{ _t('Retry') }
75+
{_t('Retry')}
7676
</AccessibleButton>
7777
}
78-
{ hasStopSharingError && <AccessibleButton
78+
{hasStopSharingError && <AccessibleButton
7979
data-test-id='beacon-status-stop-beacon-retry'
8080
kind='link'
8181
onClick={onStopSharing}
8282
className='mx_BeaconStatus_destructiveButton'
8383
>
84-
{ _t('Retry') }
85-
</AccessibleButton> }
84+
{_t('Retry')}
85+
</AccessibleButton>}
8686
</BeaconStatus>;
8787
};
8888

src/components/views/messages/MBeaconBody.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import BeaconStatus from '../beacon/BeaconStatus';
3030
import Spinner from '../elements/Spinner';
3131
import Map from '../location/Map';
3232
import SmartMarker from '../location/SmartMarker';
33-
import OwnBeaconStatus from '../location/OwnBeaconStatus';
33+
import OwnBeaconStatus from '../beacon/OwnBeaconStatus';
3434
import { IBodyProps } from "./IBodyProps";
3535

3636
const useBeaconState = (beaconInfoEvent: MatrixEvent): {

test/components/views/location/OwnBeaconStatus-test.tsx renamed to test/components/views/beacon/OwnBeaconStatus-test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { act } from 'react-dom/test-utils';
2020
import { mocked } from 'jest-mock';
2121
import { Beacon } from 'matrix-js-sdk/src/matrix';
2222

23-
import OwnBeaconStatus from '../../../../src/components/views/location/OwnBeaconStatus';
23+
import OwnBeaconStatus from '../../../../src/components/views/beacon/OwnBeaconStatus';
2424
import { BeaconDisplayStatus } from '../../../../src/components/views/beacon/displayStatus';
2525
import { useOwnLiveBeacons } from '../../../../src/utils/beacon';
2626
import { findByTestId, makeBeaconInfoEvent } from '../../../test-utils';

0 commit comments

Comments
 (0)