fix #8498

7 files changed, 27 insertions, 2 deletions

diff --git a/packages/demobank-ui/src/Routing.tsx b/packages/demobank-ui/src/Routing.tsx
index 880a8135b..a8ed58db1 100644
--- a/packages/demobank-ui/src/Routing.tsx
+++ b/packages/demobank-ui/src/Routing.tsx
@@ -493,6 +493,7 @@ function PrivateRouting({
           routeChargeWallet={privatePages.homeChargeWallet}
           routeWireTransfer={privatePages.homeWireTransfer}
           routeSolveSecondFactor={privatePages.solveSecondFactor}
+          routeCashout={privatePages.myAccountCashouts}
           routeClose={privatePages.home}
           onClose={() => navigateTo(privatePages.home.url({}))}
           onAuthorizationRequired={() =>
@@ -549,6 +550,7 @@ function PrivateRouting({
           routeCreateWireTransfer={privatePages.wireTranserCreate}
           routePublicAccounts={privatePages.publicAccountList}
           routeOperationDetails={privatePages.startOperation}
+          routeCashout={privatePages.myAccountCashouts}
           routeSolveSecondFactor={privatePages.solveSecondFactor}
           routeClose={privatePages.home}
           onClose={() => navigateTo(privatePages.home.url({}))}
@@ -585,6 +587,7 @@ function PrivateRouting({
           routePublicAccounts={privatePages.publicAccountList}
           routeOperationDetails={privatePages.startOperation}
           routeSolveSecondFactor={privatePages.solveSecondFactor}
+          routeCashout={privatePages.myAccountCashouts}
           routeClose={privatePages.home}
           onClose={() => navigateTo(privatePages.home.url({}))}
           onAuthorizationRequired={() =>
diff --git a/packages/demobank-ui/src/pages/AccountPage/index.ts b/packages/demobank-ui/src/pages/AccountPage/index.ts
index 7a85f59fe..0223b12db 100644
--- a/packages/demobank-ui/src/pages/AccountPage/index.ts
+++ b/packages/demobank-ui/src/pages/AccountPage/index.ts
@@ -34,6 +34,7 @@ export interface Props {
   onClose: () => void;
   tab: "charge-wallet" | "wire-transfer" | undefined;
   routeClose: RouteDefinition;
+  routeCashout: RouteDefinition;
   routeChargeWallet: RouteDefinition;
   routeWireTransfer: RouteDefinition<{
     account?: string;
@@ -82,6 +83,7 @@ export namespace State {
     onOperationCreated: (wopid: string) => void;
     onClose: () => void;
     routeClose: RouteDefinition;
+    routeCashout: RouteDefinition;
     routeChargeWallet: RouteDefinition;
     routePublicAccounts: RouteDefinition;
     routeWireTransfer: RouteDefinition<{
diff --git a/packages/demobank-ui/src/pages/AccountPage/state.ts b/packages/demobank-ui/src/pages/AccountPage/state.ts
index 58da82f80..b531ac757 100644
--- a/packages/demobank-ui/src/pages/AccountPage/state.ts
+++ b/packages/demobank-ui/src/pages/AccountPage/state.ts
@@ -33,6 +33,7 @@ export function useComponentState({
   routeSolveSecondFactor,
   routeOperationDetails,
   routeWireTransfer,
+  routeCashout,
   onOperationCreated,
   onClose,
   routeClose,
@@ -100,6 +101,7 @@ export function useComponentState({
     onOperationCreated,
     error: undefined,
     tab,
+    routeCashout,
     routeOperationDetails,
     routeCreateWireTransfer,
     routePublicAccounts,
diff --git a/packages/demobank-ui/src/pages/AccountPage/views.tsx b/packages/demobank-ui/src/pages/AccountPage/views.tsx
index cb98c5f2a..7165c28b6 100644
--- a/packages/demobank-ui/src/pages/AccountPage/views.tsx
+++ b/packages/demobank-ui/src/pages/AccountPage/views.tsx
@@ -112,6 +112,7 @@ export function ReadyView({
   routeChargeWallet,
   routeWireTransfer,
   limit,
+  routeCashout,
   routeCreateWireTransfer,
   routePublicAccounts,
   routeOperationDetails,
@@ -128,6 +129,7 @@ export function ReadyView({
       <PaymentOptions
         tab={tab}
         routeOperationDetails={routeOperationDetails}
+        routeCashout={routeCashout}
         routeChargeWallet={routeChargeWallet}
         routeWireTransfer={routeWireTransfer}
         limit={limit}
diff --git a/packages/demobank-ui/src/pages/PaymentOptions.tsx b/packages/demobank-ui/src/pages/PaymentOptions.tsx
index 095958afb..ac7118697 100644
--- a/packages/demobank-ui/src/pages/PaymentOptions.tsx
+++ b/packages/demobank-ui/src/pages/PaymentOptions.tsx
@@ -73,6 +73,7 @@ function ShowOperationPendingTag({
  */
 export function PaymentOptions({
   routeClose,
+  routeCashout,
   routeChargeWallet,
   routeWireTransfer,
   tab,
@@ -90,6 +91,7 @@ export function PaymentOptions({
 
   routeOperationDetails: RouteDefinition<{ wopid: string }>;
   routeClose: RouteDefinition;
+  routeCashout: RouteDefinition;
   routeChargeWallet: RouteDefinition;
   routeWireTransfer: RouteDefinition<{
     account?: string,
@@ -225,6 +227,7 @@ export function PaymentOptions({
             limit={limit}
             onAuthorizationRequired={onAuthorizationRequired}
             onSuccess={onClose}
+            routeCashout={routeCashout}
             routeCancel={routeClose}
           />
         )}
diff --git a/packages/demobank-ui/src/pages/PaytoWireTransferForm.tsx b/packages/demobank-ui/src/pages/PaytoWireTransferForm.tsx
index 177bf3c20..f3feed578 100644
--- a/packages/demobank-ui/src/pages/PaytoWireTransferForm.tsx
+++ b/packages/demobank-ui/src/pages/PaytoWireTransferForm.tsx
@@ -57,6 +57,7 @@ interface Props {
   onSuccess: () => void;
   onAuthorizationRequired: () => void;
   routeCancel?: RouteDefinition;
+  routeCashout?: RouteDefinition;
   routeHere: RouteDefinition<{
     account?: string,
     subject?: string,
@@ -73,6 +74,7 @@ export function PaytoWireTransferForm({
   withAmount,
   onSuccess,
   routeCancel,
+  routeCashout,
   routeHere,
   onAuthorizationRequired,
   limit,
@@ -354,6 +356,17 @@ export function PaytoWireTransferForm({
               </span>
             </label>
           )}
+          {routeCashout ? (
+            <a
+              name="do cashout"
+              href={routeCashout.url({})}
+              class="bg-white p-4 rounded-lg text-sm font-semibold leading-6 text-gray-900"
+            >
+              <i18n.Translate>Cashout</i18n.Translate>
+            </a>
+          ) : (
+            undefined
+          )}
         </div>
       </div>
 
diff --git a/packages/demobank-ui/src/pages/admin/AccountList.tsx b/packages/demobank-ui/src/pages/admin/AccountList.tsx
index 811c3e37a..ee0cdb383 100644
--- a/packages/demobank-ui/src/pages/admin/AccountList.tsx
+++ b/packages/demobank-ui/src/pages/admin/AccountList.tsx
@@ -178,7 +178,7 @@ export function AccountList({
                               <i18n.Translate>Change password</i18n.Translate>
                             </a>
                             <br />
-                            {config.allow_conversion ?
+                            {/* {config.allow_conversion ?
                               <Fragment>
 
                                 <a
@@ -192,7 +192,7 @@ export function AccountList({
                                 </a>
                                 <br />
                               </Fragment>
-                              : undefined}
+                              : undefined} */}
                             {noBalance ? (
                               <a
                                 name={`remove account ${item.username}`}