From 6d376f3dacc7521a566557ec7b0ef1b3127b1884 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 24 Oct 2022 11:12:28 -0300 Subject: wallet dev mode and backup into devmode --- .../src/wallet/Settings.stories.tsx | 5 +++++ .../src/wallet/Settings.tsx | 26 ++++++++++------------ 2 files changed, 17 insertions(+), 14 deletions(-) (limited to 'packages/taler-wallet-webextension/src/wallet') diff --git a/packages/taler-wallet-webextension/src/wallet/Settings.stories.tsx b/packages/taler-wallet-webextension/src/wallet/Settings.stories.tsx index d0707952f..4082ca29b 100644 --- a/packages/taler-wallet-webextension/src/wallet/Settings.stories.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Settings.stories.tsx @@ -37,6 +37,7 @@ const version = { bank: "0:0:0", hash: "d439c3e1bc743f2aa47de4457953dba6ecb0e20f", version: "0.9.0-dev.1", + devMode: false, }, webexVersion: { version: "0.9.0.13", @@ -46,6 +47,7 @@ const version = { export const AllOff = createExample(TestedComponent, { deviceName: "this-is-the-device-name", + devModeToggle: { value: false, button: {} }, autoOpenToggle: { value: false, button: {} }, clipboardToggle: { value: false, button: {} }, setDeviceName: () => Promise.resolve(), @@ -54,6 +56,7 @@ export const AllOff = createExample(TestedComponent, { export const OneChecked = createExample(TestedComponent, { deviceName: "this-is-the-device-name", + devModeToggle: { value: false, button: {} }, autoOpenToggle: { value: false, button: {} }, clipboardToggle: { value: false, button: {} }, setDeviceName: () => Promise.resolve(), @@ -62,6 +65,7 @@ export const OneChecked = createExample(TestedComponent, { export const WithOneExchange = createExample(TestedComponent, { deviceName: "this-is-the-device-name", + devModeToggle: { value: false, button: {} }, autoOpenToggle: { value: false, button: {} }, clipboardToggle: { value: false, button: {} }, setDeviceName: () => Promise.resolve(), @@ -83,6 +87,7 @@ export const WithOneExchange = createExample(TestedComponent, { export const WithExchangeInDifferentState = createExample(TestedComponent, { deviceName: "this-is-the-device-name", + devModeToggle: { value: false, button: {} }, autoOpenToggle: { value: false, button: {} }, clipboardToggle: { value: false, button: {} }, setDeviceName: () => Promise.resolve(), diff --git a/packages/taler-wallet-webextension/src/wallet/Settings.tsx b/packages/taler-wallet-webextension/src/wallet/Settings.tsx index 2ff9f15f5..8f6807d46 100644 --- a/packages/taler-wallet-webextension/src/wallet/Settings.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Settings.tsx @@ -19,6 +19,7 @@ import { ExchangeTosStatus, WalletCoreVersion, } from "@gnu-taler/taler-util"; +import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; import { Fragment, h, VNode } from "preact"; import { Checkbox } from "../components/Checkbox.js"; import { ErrorTalerOperation } from "../components/ErrorTalerOperation.js"; @@ -36,26 +37,26 @@ import { import { useDevContext } from "../context/devContext.js"; import { useTranslationContext } from "../context/translation.js"; import { useAsyncAsHook } from "../hooks/useAsyncAsHook.js"; -import { useBackupDeviceName } from "../hooks/useBackupDeviceName.js"; import { useAutoOpenPermissions } from "../hooks/useAutoOpenPermissions.js"; +import { useBackupDeviceName } from "../hooks/useBackupDeviceName.js"; +import { useClipboardPermissions } from "../hooks/useClipboardPermissions.js"; import { ToggleHandler } from "../mui/handlers.js"; import { Pages } from "../NavigationBar.js"; -import * as wxApi from "../wxApi.js"; import { platform } from "../platform/api.js"; -import { useClipboardPermissions } from "../hooks/useClipboardPermissions.js"; +import { wxClient } from "../wxApi.js"; const GIT_HASH = typeof __GIT_HASH__ !== "undefined" ? __GIT_HASH__ : undefined; export function SettingsPage(): VNode { const autoOpenToggle = useAutoOpenPermissions(); const clipboardToggle = useClipboardPermissions(); - const { devMode, toggleDevMode } = useDevContext(); + const { devModeToggle } = useDevContext(); const { name, update } = useBackupDeviceName(); const webex = platform.getWalletWebExVersion(); const exchangesHook = useAsyncAsHook(async () => { - const list = await wxApi.listExchanges(); - const version = await wxApi.getVersion(); + const list = await wxClient.call(WalletApiOperation.ListExchanges, {}); + const version = await wxClient.call(WalletApiOperation.GetVersion, {}); return { exchanges: list.exchanges, version }; }); const { exchanges, version } = @@ -70,8 +71,7 @@ export function SettingsPage(): VNode { setDeviceName={update} autoOpenToggle={autoOpenToggle} clipboardToggle={clipboardToggle} - developerMode={devMode} - toggleDeveloperMode={toggleDevMode} + devModeToggle={devModeToggle} webexVersion={{ version: webex.version, hash: GIT_HASH, @@ -86,8 +86,7 @@ export interface ViewProps { setDeviceName: (s: string) => Promise; autoOpenToggle: ToggleHandler; clipboardToggle: ToggleHandler; - developerMode: boolean; - toggleDeveloperMode: () => Promise; + devModeToggle: ToggleHandler; knownExchanges: Array; coreVersion: WalletCoreVersion | undefined; webexVersion: { @@ -100,10 +99,9 @@ export function SettingsView({ knownExchanges, autoOpenToggle, clipboardToggle, - developerMode, + devModeToggle, coreVersion, webexVersion, - toggleDeveloperMode, }: ViewProps): VNode { const { i18n, lang, supportedLang, changeLanguage } = useTranslationContext(); @@ -248,8 +246,8 @@ export function SettingsView({ More options and information useful for debugging } - enabled={developerMode} - onToggle={toggleDeveloperMode} + enabled={devModeToggle.value!} + onToggle={devModeToggle.button.onClick!} /> -- cgit v1.2.3