diff options
Diffstat (limited to 'packages/taler-wallet-webextension/src/wallet')
-rw-r--r-- | packages/taler-wallet-webextension/src/wallet/Settings.stories.tsx | 18 | ||||
-rw-r--r-- | packages/taler-wallet-webextension/src/wallet/Settings.tsx | 76 |
2 files changed, 78 insertions, 16 deletions
diff --git a/packages/taler-wallet-webextension/src/wallet/Settings.stories.tsx b/packages/taler-wallet-webextension/src/wallet/Settings.stories.tsx index 5c01b1132..9e85a9bed 100644 --- a/packages/taler-wallet-webextension/src/wallet/Settings.stories.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Settings.stories.tsx @@ -30,16 +30,32 @@ export default { }, }; +const version = { + coreVersion: { + exchange: "12:0:0", + merchant: "2:0:1", + bank: "0:0:0", + hash: "d439c3e1bc743f2aa47de4457953dba6ecb0e20f", + version: "0.9.0-dev.1", + }, + webexVersion: { + version: "0.9.0.13", + hash: "d439c3e1bc743f2aa47de4457953dba6ecb0e20f", + }, +}; + export const AllOff = createExample(TestedComponent, { deviceName: "this-is-the-device-name", permissionToggle: { value: false, button: {} }, setDeviceName: () => Promise.resolve(), + ...version, }); export const OneChecked = createExample(TestedComponent, { deviceName: "this-is-the-device-name", permissionToggle: { value: false, button: {} }, setDeviceName: () => Promise.resolve(), + ...version, }); export const WithOneExchange = createExample(TestedComponent, { @@ -59,6 +75,7 @@ export const WithOneExchange = createExample(TestedComponent, { paytoUris: ["payto://x-taler-bank/bank.rpi.sebasjm.com/exchangeminator"], } as any, //TODO: complete with auditors, wireInfo and denominations ], + ...version, }); export const WithExchangeInDifferentState = createExample(TestedComponent, { @@ -99,4 +116,5 @@ export const WithExchangeInDifferentState = createExample(TestedComponent, { paytoUris: ["payto://x-taler-bank/bank.rpi.sebasjm.com/exchangeminator"], }, ], + ...version, }); diff --git a/packages/taler-wallet-webextension/src/wallet/Settings.tsx b/packages/taler-wallet-webextension/src/wallet/Settings.tsx index 1b75ee6c9..4a520c3bb 100644 --- a/packages/taler-wallet-webextension/src/wallet/Settings.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Settings.tsx @@ -14,7 +14,7 @@ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ -import { ExchangeListItem } from "@gnu-taler/taler-util"; +import { ExchangeListItem, WalletCoreVersion } from "@gnu-taler/taler-util"; import { Fragment, h, VNode } from "preact"; import { Checkbox } from "../components/Checkbox.js"; import { ErrorTalerOperation } from "../components/ErrorTalerOperation.js"; @@ -38,26 +38,39 @@ import { ToggleHandler } from "../mui/handlers.js"; import { Pages } from "../NavigationBar.js"; import { buildTermsOfServiceStatus } from "../utils/index.js"; import * as wxApi from "../wxApi.js"; +import { platform } from "../platform/api.js"; + +const GIT_HASH = typeof __GIT_HASH__ !== "undefined" ? __GIT_HASH__ : undefined; export function SettingsPage(): VNode { const permissionToggle = useExtendedPermissions(); const { devMode, toggleDevMode } = useDevContext(); const { name, update } = useBackupDeviceName(); + const webex = platform.getWalletWebExVersion(); - const exchangesHook = useAsyncAsHook(wxApi.listExchanges); + const exchangesHook = useAsyncAsHook(async () => { + const list = await wxApi.listExchanges(); + const version = await wxApi.getVersion(); + return { exchanges: list.exchanges, version }; + }); + const { exchanges, version } = + !exchangesHook || exchangesHook.hasError + ? { exchanges: [], version: undefined } + : exchangesHook.response; return ( <SettingsView - knownExchanges={ - !exchangesHook || exchangesHook.hasError - ? [] - : exchangesHook.response.exchanges - } + knownExchanges={exchanges} deviceName={name} setDeviceName={update} permissionToggle={permissionToggle} developerMode={devMode} toggleDeveloperMode={toggleDevMode} + webexVersion={{ + version: webex.version, + hash: GIT_HASH, + }} + coreVersion={version} /> ); } @@ -69,14 +82,19 @@ export interface ViewProps { developerMode: boolean; toggleDeveloperMode: () => Promise<void>; knownExchanges: Array<ExchangeListItem>; + coreVersion: WalletCoreVersion | undefined; + webexVersion: { + version: string; + hash: string | undefined; + }; } -const VERSION = typeof __VERSION__ !== "undefined" ? __VERSION__ : "dev"; -const GIT_HASH = typeof __GIT_HASH__ !== "undefined" ? __GIT_HASH__ : undefined; export function SettingsView({ knownExchanges, permissionToggle, developerMode, + coreVersion, + webexVersion, toggleDeveloperMode, }: ViewProps): VNode { const { i18n, lang, supportedLang, changeLanguage } = useTranslationContext(); @@ -216,16 +234,42 @@ export function SettingsView({ <SubTitle> <i18n.Translate>Version</i18n.Translate> </SubTitle> - <Part - title={<i18n.Translate>Release</i18n.Translate>} - text={<span>{VERSION}</span>} - /> - {GIT_HASH && ( + {coreVersion && ( <Part - title={<i18n.Translate>Hash</i18n.Translate>} - text={<span>{GIT_HASH}</span>} + title={<i18n.Translate>Wallet Core</i18n.Translate>} + text={ + <span> + {coreVersion.version}{" "} + <JustInDevMode>{coreVersion.hash}</JustInDevMode> + </span> + } /> )} + <Part + title={<i18n.Translate>Web Extension</i18n.Translate>} + text={ + <span> + {webexVersion.version}{" "} + <JustInDevMode>{webexVersion.hash}</JustInDevMode> + </span> + } + /> + {coreVersion && ( + <JustInDevMode> + <Part + title={<i18n.Translate>Exchange compatibility</i18n.Translate>} + text={<span>{coreVersion.exchange}</span>} + /> + <Part + title={<i18n.Translate>Merchant compatibility</i18n.Translate>} + text={<span>{coreVersion.merchant}</span>} + /> + <Part + title={<i18n.Translate>Bank compatibility</i18n.Translate>} + text={<span>{coreVersion.bank}</span>} + /> + </JustInDevMode> + )} </section> </Fragment> ); |