diff options
| author | Sebastian <sebasjm@gmail.com> | 2022-03-21 12:49:41 -0300 |
|---|---|---|
| committer | Sebastian <sebasjm@gmail.com> | 2022-03-21 12:49:41 -0300 |
| commit | 32cd54e11d80bde0274b3c0238f8f5bd00ff83cb (patch) | |
| tree | fb38117e25476aff1848ed74e98cf653ba7e94e2 /packages/taler-wallet-webextension/src/wallet | |
| parent | f7cabbf479c9703e4565ae610a68e652ba9e95b5 (diff) | |
| download | wallet-core-32cd54e11d80bde0274b3c0238f8f5bd00ff83cb.tar.gz wallet-core-32cd54e11d80bde0274b3c0238f8f5bd00ff83cb.tar.bz2 wallet-core-32cd54e11d80bde0274b3c0238f8f5bd00ff83cb.zip | |
fix: handle new optional parameter for settings_exchange_add page
Diffstat (limited to 'packages/taler-wallet-webextension/src/wallet')
3 files changed, 9 insertions, 8 deletions
diff --git a/packages/taler-wallet-webextension/src/wallet/CreateManualWithdraw.tsx b/packages/taler-wallet-webextension/src/wallet/CreateManualWithdraw.tsx index 1996687ba..068135ae0 100644 --- a/packages/taler-wallet-webextension/src/wallet/CreateManualWithdraw.tsx +++ b/packages/taler-wallet-webextension/src/wallet/CreateManualWithdraw.tsx @@ -67,9 +67,9 @@ export function useComponentState( const initialExchange = foundExchangeForCurrency !== -1 ? exchangeSelectList[foundExchangeForCurrency] - : // : exchangeSelectList.length > 0 - // ? exchangeSelectList[0] - undefined; + : !initialCurrency && exchangeSelectList.length > 0 + ? exchangeSelectList[0] + : undefined; const [exchange, setExchange] = useState(initialExchange || ""); const [currency, setCurrency] = useState( @@ -188,7 +188,7 @@ export function CreateManualWithdraw({ <i18n.Translate>No exchange configured</i18n.Translate> </BoldLight> <LinkPrimary - href={Pages.settings_exchange_add} + href={Pages.settings_exchange_add.replace(":currency?", "")} style={{ marginLeft: "auto" }} > <i18n.Translate>Add Exchange</i18n.Translate> @@ -234,7 +234,7 @@ export function CreateManualWithdraw({ </Input> <div style={{ display: "flex", justifyContent: "space-between" }}> <LinkPrimary - href={Pages.settings_exchange_add} + href={Pages.settings_exchange_add.replace(":currency?", "")} style={{ marginLeft: "auto" }} > <i18n.Translate>Add Exchange</i18n.Translate> diff --git a/packages/taler-wallet-webextension/src/wallet/ExchangeSetUrl.tsx b/packages/taler-wallet-webextension/src/wallet/ExchangeSetUrl.tsx index 62d7e15b8..fae309ba7 100644 --- a/packages/taler-wallet-webextension/src/wallet/ExchangeSetUrl.tsx +++ b/packages/taler-wallet-webextension/src/wallet/ExchangeSetUrl.tsx @@ -177,8 +177,7 @@ export function ExchangeSetUrlPage({ disabled={ !result || !!error || - (expectedCurrency !== undefined && - expectedCurrency !== result.currency) + (!!expectedCurrency && expectedCurrency !== result.currency) } onClick={() => { const url = canonicalizeBaseUrl(endpoint); diff --git a/packages/taler-wallet-webextension/src/wallet/Settings.tsx b/packages/taler-wallet-webextension/src/wallet/Settings.tsx index f806da6a7..840e95651 100644 --- a/packages/taler-wallet-webextension/src/wallet/Settings.tsx +++ b/packages/taler-wallet-webextension/src/wallet/Settings.tsx @@ -177,7 +177,9 @@ export function SettingsView({ )} <div style={{ display: "flex", justifyContent: "space-between" }}> <div /> - <LinkPrimary href={Pages.settings_exchange_add}> + <LinkPrimary + href={Pages.settings_exchange_add.replace(":currency?", "")} + > <i18n.Translate>Add an exchange</i18n.Translate> </LinkPrimary> </div> |