1 files changed, 11 insertions, 9 deletions

diff --git a/packages/bank-ui/src/pages/WalletWithdrawForm.tsx b/packages/bank-ui/src/pages/WalletWithdrawForm.tsx
index 39dea018f..7cf2c7881 100644
--- a/packages/bank-ui/src/pages/WalletWithdrawForm.tsx
+++ b/packages/bank-ui/src/pages/WalletWithdrawForm.tsx
@@ -46,6 +46,7 @@ import {
   RenderAmount,
   doAutoFocus,
 } from "./PaytoWireTransferForm.js";
+import { useSettingsContext } from "../context/settings.js";
 
 const RefAmount = forwardRef(InputAmount);
 
@@ -65,7 +66,7 @@ function OldWithdrawalForm({
   routeCancel: RouteDefinition;
 }): VNode {
   const { i18n } = useTranslationContext();
-  const [settings] = usePreferences();
+  const settings = useSettingsContext();
 
   // const walletInegrationApi = useTalerWalletIntegrationAPI()
   // const { navigateTo } = useNavigationContext();
@@ -80,7 +81,7 @@ function OldWithdrawalForm({
   const creds = credentials.status !== "loggedIn" ? undefined : credentials;
 
   const [amountStr, setAmountStr] = useState<string | undefined>(
-    `${settings.maxWithdrawalAmount}`,
+    `${settings.defaultSuggestedAmount ?? 1}`,
   );
   const [notification, notify, handleError] = useLocalNotification();
 
@@ -143,7 +144,7 @@ function OldWithdrawalForm({
     if (!parsedAmount || !creds) return;
     await handleError(async () => {
       const params: TalerCorebankApi.BankAccountCreateWithdrawalRequest =
-        settings.fastWithdrawal
+        settings.fastWithdrawalForm
           ? {
               suggested_amount: Amounts.stringify(parsedAmount),
             }
@@ -241,9 +242,9 @@ function OldWithdrawalForm({
           </i18n.Translate>
         </p>
         {Amounts.cmp(limit, balance) > 0 ? (
-          <p class="mt-2 text-sm text-gray-500">
+          <p class="mt-2 text-sm text-gray-900">
             <i18n.Translate>
-              Your account allows you to withdraw{" "}
+              You can withdraw{" "}
               <RenderAmount
                 value={limit}
                 spec={config.currency_specification}
@@ -347,7 +348,8 @@ export function WalletWithdrawForm({
   routeCancel: RouteDefinition;
 }): VNode {
   const { i18n } = useTranslationContext();
-  const [settings, updateSettings] = usePreferences();
+  const [pref, updatePref] = usePreferences();
+  const settings = useSettingsContext();
 
   return (
     <div class="grid grid-cols-1 gap-x-8 gap-y-8 pt-6 md:grid-cols-3 bg-gray-100 my-4 px-4 pb-4 rounded-lg">
@@ -364,11 +366,11 @@ export function WalletWithdrawForm({
       </div>
 
       <div class="col-span-2">
-        {settings.showInstallWallet && (
+        {pref.showInstallWallet && (
           <Attention
             title={i18n.str`You need a Taler wallet`}
             onClose={() => {
-              updateSettings("showInstallWallet", false);
+              updatePref("showInstallWallet", false);
             }}
           >
             <i18n.Translate>
@@ -386,7 +388,7 @@ export function WalletWithdrawForm({
           </Attention>
         )}
 
-        {!settings.fastWithdrawal ? (
+        {!settings.fastWithdrawalForm ? (
           <OldWithdrawalForm
             focus={focus}
             routeOperationDetails={routeOperationDetails}