Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/uhk-web/src/app/pages/update-agent.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ import { PreviewUserConfigurationAction } from '../store/actions/user-config';
<uhk-agent-icon class="agent-logo"></uhk-agent-icon>
<div>
<h1>Update Agent</h1>
<ng-template #upgradeAgentTooltip>
<div [innerHTML]="upgradeAgentTooltip$ | async | safeHtml"></div>
</ng-template>
<p class="mb-2">
Your UHK contains a <span class="text-dotted" [ngbTooltip]="upgradeAgentTooltip$ | async">newer configuration version</span>
Your UHK contains a <span class="text-dotted" [ngbTooltip]="upgradeAgentTooltip" tooltipClass="tooltip-firmware-checksum">newer configuration version</span>
than this Agent version can handle, so you must update Agent.
</p>
<p>
Expand Down
5 changes: 3 additions & 2 deletions packages/uhk-web/src/app/store/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -764,12 +764,13 @@ export const getFirmwareUpgradeState = createSelector(runningInElectron, getStat
});
export const upgradeAgentTooltip = createSelector(
getNewerUserConfiguration,
(newUserConfiguration) => {
getHardwareModules,
(newUserConfiguration, hardwareModules) => {
if (!newUserConfiguration) {
return '';
}

return `rightModule.userConfigVersion ${newUserConfiguration.newUserConfigurationVersion} minor version is larger than agent.userConfigVersion ${VERSIONS.userConfigVersion}`;
return `rightHalf.firmware.userConfigVersion ${hardwareModules.rightModuleInfo.userConfigVersion} minor version is larger than agent.userConfigVersion ${VERSIONS.userConfigVersion}. <br /> <br /> rightHalf.flashedUserConfigVersion: ${newUserConfiguration.newUserConfigurationVersion}`;
});
export const upgradeFirmwareTooltip = createSelector(
getHardwareModules,
Expand Down
Loading