This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 833
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update „new device“ toast texts and buttons (#10200)
- Loading branch information
1 parent
e6fe7b7
commit 880428a
Showing
9 changed files
with
335 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| Copyright 2023 The Matrix.org Foundation C.I.C. | ||
| 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 React, { Fragment } from "react"; | ||
|
|
||
| import { Icon as InactiveIcon } from "../../../../../res/img/element-icons/settings/inactive.svg"; | ||
| import { INACTIVE_DEVICE_AGE_DAYS, isDeviceInactive } from "../../../../components/views/settings/devices/filter"; | ||
| import { ExtendedDevice } from "../../../../components/views/settings/devices/types"; | ||
| import { formatDate, formatRelativeTime } from "../../../../DateUtils"; | ||
| import { _t } from "../../../../languageHandler"; | ||
|
|
||
| interface Props { | ||
| device: ExtendedDevice; | ||
| } | ||
|
|
||
| const MS_DAY = 24 * 60 * 60 * 1000; | ||
| const MS_6_DAYS = 6 * MS_DAY; | ||
| const formatLastActivity = (timestamp: number, now = new Date().getTime()): string => { | ||
| // less than a week ago | ||
| if (timestamp + MS_6_DAYS >= now) { | ||
| const date = new Date(timestamp); | ||
| // Tue 20:15 | ||
| return formatDate(date); | ||
| } | ||
| return formatRelativeTime(new Date(timestamp)); | ||
| }; | ||
|
|
||
| const getInactiveMetadata = (device: ExtendedDevice): { id: string; value: React.ReactNode } | undefined => { | ||
| const isInactive = isDeviceInactive(device); | ||
|
|
||
| if (!isInactive || !device.last_seen_ts) { | ||
| return undefined; | ||
| } | ||
|
|
||
| return { | ||
| id: "inactive", | ||
| value: ( | ||
| <> | ||
| <InactiveIcon className="mx_DeviceTile_inactiveIcon" /> | ||
| {_t("Inactive for %(inactiveAgeDays)s+ days", { inactiveAgeDays: INACTIVE_DEVICE_AGE_DAYS }) + | ||
| ` (${formatLastActivity(device.last_seen_ts)})`} | ||
| </> | ||
| ), | ||
| }; | ||
| }; | ||
|
|
||
| const DeviceMetaDatum: React.FC<{ value: string | React.ReactNode; id: string }> = ({ value, id }) => | ||
| value ? <span data-testid={`device-metadata-${id}`}>{value}</span> : null; | ||
|
|
||
| export const DeviceMetaData: React.FC<Props> = ({ device }) => { | ||
| const inactive = getInactiveMetadata(device); | ||
| const lastActivity = device.last_seen_ts && `${_t("Last activity")} ${formatLastActivity(device.last_seen_ts)}`; | ||
| const verificationStatus = device.isVerified ? _t("Verified") : _t("Unverified"); | ||
| // if device is inactive, don't display last activity or verificationStatus | ||
| const metadata = inactive | ||
| ? [inactive, { id: "lastSeenIp", value: device.last_seen_ip }] | ||
| : [ | ||
| { id: "isVerified", value: verificationStatus }, | ||
| { id: "lastActivity", value: lastActivity }, | ||
| { id: "lastSeenIp", value: device.last_seen_ip }, | ||
| { id: "deviceId", value: device.device_id }, | ||
| ]; | ||
|
|
||
| return ( | ||
| <> | ||
| {metadata.map(({ id, value }, index) => | ||
| !!value ? ( | ||
| <Fragment key={id}> | ||
| {!!index && " · "} | ||
| <DeviceMetaDatum id={id} value={value} /> | ||
| </Fragment> | ||
| ) : null, | ||
| )} | ||
| </> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| Copyright 2023 The Matrix.org Foundation C.I.C. | ||
| 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 { IMyDevice, MatrixClient } from "matrix-js-sdk/src/matrix"; | ||
|
|
||
| export const isDeviceVerified = (device: IMyDevice, client: MatrixClient): boolean | null => { | ||
| try { | ||
| const crossSigningInfo = client.getStoredCrossSigningForUser(client.getSafeUserId()); | ||
| const deviceInfo = client.getStoredDevice(client.getSafeUserId(), device.device_id); | ||
|
|
||
| // no cross-signing or device info available | ||
| if (!crossSigningInfo || !deviceInfo) return false; | ||
|
|
||
| return crossSigningInfo.checkDeviceTrust(crossSigningInfo, deviceInfo, false, true).isCrossSigningVerified(); | ||
| } catch (e) { | ||
| console.error("Error getting device cross-signing info", e); | ||
| return null; | ||
| } | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.