diff --git a/src/components/ConnectDK.tsx b/src/components/ConnectDK.tsx index a637b8cc..0222a071 100644 --- a/src/components/ConnectDK.tsx +++ b/src/components/ConnectDK.tsx @@ -1,6 +1,6 @@ import { useFingerprint } from '#context/Fingerprint.js' import { WaitingForData } from '#flows/WaitingForData.js' -import { HelpCircle, PlugZap, Sun, ToggleRight } from 'lucide-preact' +import { BatteryFull, HelpCircle, Sun, ToggleRight } from 'lucide-preact' import { styled } from 'styled-components' import { Secondary } from './buttons/Button.js' import { WarningLink } from './buttons/ButtonlikeLink.js' @@ -36,12 +36,12 @@ export const ConnectDK = () => { Insert the SIM card
  • - - Plug into a USB power source + + Make sure the battery is charged
  • - - Turn on + + Turn the kit on
  • @@ -51,10 +51,10 @@ export const ConnectDK = () => {
  • - + No success?
    - + { diff --git a/src/flows/SolarThingyFlow.tsx b/src/flows/SolarThingyFlow.tsx index 53c9c5fc..cfdaa64f 100644 --- a/src/flows/SolarThingyFlow.tsx +++ b/src/flows/SolarThingyFlow.tsx @@ -1,6 +1,7 @@ import { HistoryChart } from '#chart/HistoryChart.js' import type { ChartData } from '#chart/chartMath.js' import { Ago } from '#components/Ago.js' +import { ConnectDK } from '#components/ConnectDK.js' import { useDevice, type MessageListenerFn } from '#context/Device.js' import { WaitingForData } from '#flows/WaitingForData.js' import { Context, HelloMessage } from '@hello.nrfcloud.com/proto/hello' @@ -115,52 +116,68 @@ export const SolarThingyFlow = () => { } return ( -
    -
    -
    - <> -
    - Gain -
    -
    - {currentGain === undefined && } - {currentGain !== undefined && ( - <> - {currentGain.mA} mA{' '} - - () - - - )} -
    - - <> -
    - Voltage -
    -
    - {currentVoltage === undefined && } - {currentVoltage !== undefined && ( - <> - {currentVoltage.v} V{' '} - - () - - - )} -
    - -
    - {(voltage.length > 0 || gain.length > 0) && ( -
    - + <> + {currentGain === undefined && currentVoltage === undefined && ( +
    +
    +
    +
    + +
    +
    - )} +
    + )} +
    +
    +
    + <> +
    + Gain +
    +
    + {currentGain === undefined && } + {currentGain !== undefined && ( + <> + {currentGain.mA} mA{' '} + + () + + + )} +
    + + <> +
    + Voltage +
    +
    + {currentVoltage === undefined && } + {currentVoltage !== undefined && ( + <> + {currentVoltage.v} V{' '} + + () + + + )} +
    + +
    + {(voltage.length > 0 || gain.length > 0) && ( +
    + +
    + )} +
    -
    + ) } diff --git a/src/page/RecognizingFingerprint.tsx b/src/page/RecognizingFingerprint.tsx index e6b9c1b8..e60bc15c 100644 --- a/src/page/RecognizingFingerprint.tsx +++ b/src/page/RecognizingFingerprint.tsx @@ -22,7 +22,7 @@ export const RecognizingFingerprint = () => { return (
    -
    +

    Fingerprint: {fingerprint}