From 36d05724c00015e7c655d6afbd66d9c8904f74cc Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Fri, 11 Dec 2020 19:33:00 +0100 Subject: [PATCH] Improve hover message when the drive is too small Changelog-entry: Improve hover message when the drive is too small Change-type: patch --- lib/gui/app/components/drive-selector/drive-selector.tsx | 4 ++-- lib/shared/messages.ts | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/gui/app/components/drive-selector/drive-selector.tsx b/lib/gui/app/components/drive-selector/drive-selector.tsx index f3575989..cd5951ca 100644 --- a/lib/gui/app/components/drive-selector/drive-selector.tsx +++ b/lib/gui/app/components/drive-selector/drive-selector.tsx @@ -305,9 +305,9 @@ export class DriveSelector extends React.Component< case compatibility.system(): return warning.systemDrive(); case compatibility.tooSmall(): - const recommendedDriveSize = + const size = this.state.image?.recommendedDriveSize || this.state.image?.size || 0; - return warning.unrecommendedDriveSize({ recommendedDriveSize }, drive); + return warning.tooSmall({ size }, drive); } } diff --git a/lib/shared/messages.ts b/lib/shared/messages.ts index c0c1e81c..7a28cb7f 100644 --- a/lib/shared/messages.ts +++ b/lib/shared/messages.ts @@ -81,13 +81,10 @@ export const compatibility = { } as const; export const warning = { - unrecommendedDriveSize: ( - image: { recommendedDriveSize: number }, - drive: { device: string; size: number }, - ) => { + tooSmall: (source: { size: number }, target: { size: number }) => { return outdent({ newline: ' ' })` - This image recommends a ${prettyBytes(image.recommendedDriveSize)} - drive, however ${drive.device} is only ${prettyBytes(drive.size)}. + The selected source is ${prettyBytes(source.size - target.size)} + larger than this drive. `; },