2 files changed, 20 insertions, 20 deletions

diff --git a/packages/demobank-ui/src/hooks/account.ts b/packages/demobank-ui/src/hooks/account.ts
index 61a11b1a5..aa0745253 100644
--- a/packages/demobank-ui/src/hooks/account.ts
+++ b/packages/demobank-ui/src/hooks/account.ts
@@ -44,7 +44,7 @@ export function revalidateAccountDetails() {
 
 export function useAccountDetails(account: string) {
   const { state: credentials } = useSessionState();
-  const { api } = useBankCoreApiContext();
+  const { bank: api } = useBankCoreApiContext();
 
   async function fetcher([username, token]: [string, AccessToken]) {
     return await api.getAccount({ username, token });
@@ -66,7 +66,7 @@ export function revalidateWithdrawalDetails() {
 }
 
 export function useWithdrawalDetails(wid: string) {
-  const { api } = useBankCoreApiContext();
+  const { bank: api } = useBankCoreApiContext();
   const [latestStatus, setLatestStatus] = useState<WithdrawalOperationStatus>();
 
   async function fetcher([wid, old_state]: [
@@ -117,7 +117,7 @@ export function useTransactionDetails(account: string, tid: number) {
   const { state: credentials } = useSessionState();
   const token =
     credentials.status !== "loggedIn" ? undefined : credentials.token;
-  const { api } = useBankCoreApiContext();
+  const { bank: api } = useBankCoreApiContext();
 
   async function fetcher([username, token, txid]: [
     string,
@@ -147,7 +147,7 @@ export function useTransactionDetails(account: string, tid: number) {
   return undefined;
 }
 
-export function revalidatePublicAccounts() {
+export async function revalidatePublicAccounts() {
   return mutate(
     (key) => Array.isArray(key) && key[key.length - 1] === "getPublicAccounts", undefined, { revalidate: true }
   );
@@ -158,7 +158,7 @@ export function usePublicAccounts(
 ) {
   const [offset, setOffset] = useState<number | undefined>(initial);
 
-  const { api } = useBankCoreApiContext();
+  const { bank: api } = useBankCoreApiContext();
 
   async function fetcher([account, txid]: [
     string | undefined,
@@ -233,7 +233,7 @@ export function useTransactions(account: string, initial?: number) {
     credentials.status !== "loggedIn" ? undefined : credentials.token;
 
   const [offset, setOffset] = useState<number | undefined>(initial);
-  const { api } = useBankCoreApiContext();
+  const { bank: api } = useBankCoreApiContext();
 
   async function fetcher([username, token, txid]: [
     string,
diff --git a/packages/demobank-ui/src/hooks/regional.ts b/packages/demobank-ui/src/hooks/regional.ts
index 3469bf501..bf948d293 100644
--- a/packages/demobank-ui/src/hooks/regional.ts
+++ b/packages/demobank-ui/src/hooks/regional.ts
@@ -60,10 +60,10 @@ export function revalidateConversionInfo() {
   );
 }
 export function useConversionInfo() {
-  const { api, config } = useBankCoreApiContext();
+  const { conversion, config } = useBankCoreApiContext();
 
   async function fetcher() {
-    return await api.getConversionInfoAPI().getConfig();
+    return await conversion.getConfig();
   }
   const { data, error } = useSWR<
     TalerBankConversionResultByMethod<"getConfig">,
@@ -86,10 +86,10 @@ export function useConversionInfo() {
 }
 
 export function useCashinEstimator(): ConversionEstimators {
-  const { api } = useBankCoreApiContext();
+  const { conversion } = useBankCoreApiContext();
   return {
     estimateByCredit: async (fiatAmount, fee) => {
-      const resp = await api.getConversionInfoAPI().getCashinRate({
+      const resp = await conversion.getCashinRate({
         credit: fiatAmount,
       });
       if (resp.type === "fail") {
@@ -114,7 +114,7 @@ export function useCashinEstimator(): ConversionEstimators {
       };
     },
     estimateByDebit: async (regionalAmount, fee) => {
-      const resp = await api.getConversionInfoAPI().getCashinRate({
+      const resp = await conversion.getCashinRate({
         debit: regionalAmount,
       });
       if (resp.type === "fail") {
@@ -142,10 +142,10 @@ export function useCashinEstimator(): ConversionEstimators {
 }
 
 export function useCashoutEstimator(): ConversionEstimators {
-  const { api } = useBankCoreApiContext();
+  const { bank, conversion } = useBankCoreApiContext();
   return {
     estimateByCredit: async (fiatAmount, fee) => {
-      const resp = await api.getConversionInfoAPI().getCashoutRate({
+      const resp = await conversion.getCashoutRate({
         credit: fiatAmount,
       });
       if (resp.type === "fail") {
@@ -170,7 +170,7 @@ export function useCashoutEstimator(): ConversionEstimators {
       };
     },
     estimateByDebit: async (regionalAmount, fee) => {
-      const resp = await api.getConversionInfoAPI().getCashoutRate({
+      const resp = await conversion.getCashoutRate({
         debit: regionalAmount,
       });
       if (resp.type === "fail") {
@@ -204,14 +204,14 @@ export function useEstimator(): ConversionEstimators {
   return useCashoutEstimator()
 }
 
-export function revalidateBusinessAccounts() {
+export async function revalidateBusinessAccounts() {
   return mutate((key) => Array.isArray(key) && key[key.length - 1] === "getAccounts", undefined, { revalidate: true });
 }
 export function useBusinessAccounts() {
   const { state: credentials } = useSessionState();
   const token =
     credentials.status !== "loggedIn" ? undefined : credentials.token;
-  const { api } = useBankCoreApiContext();
+  const { bank: api } = useBankCoreApiContext();
 
   const [offset, setOffset] = useState<number | undefined>();
 
@@ -281,7 +281,7 @@ export function revalidateOnePendingCashouts() {
 }
 export function useOnePendingCashouts(account: string) {
   const { state: credentials } = useSessionState();
-  const { api, config } = useBankCoreApiContext();
+  const { bank: api, config } = useBankCoreApiContext();
   const token =
     credentials.status !== "loggedIn" ? undefined : credentials.token;
 
@@ -338,7 +338,7 @@ export function revalidateCashouts() {
 }
 export function useCashouts(account: string) {
   const { state: credentials } = useSessionState();
-  const { api, config } = useBankCoreApiContext();
+  const { bank: api, config } = useBankCoreApiContext();
   const token =
     credentials.status !== "loggedIn" ? undefined : credentials.token;
 
@@ -392,7 +392,7 @@ export function revalidateCashoutDetails() {
 export function useCashoutDetails(cashoutId: number | undefined) {
   const { state: credentials } = useSessionState();
   const creds = credentials.status !== "loggedIn" ? undefined : credentials;
-  const { api } = useBankCoreApiContext();
+  const { bank: api } = useBankCoreApiContext();
 
   async function fetcher([username, token, id]: [string, AccessToken, number]) {
     return api.getCashoutById({ username, token }, id);
@@ -443,7 +443,7 @@ export function useLastMonitorInfo(
   previousMoment: number,
   timeframe: TalerCorebankApi.MonitorTimeframeParam,
 ) {
-  const { api } = useBankCoreApiContext();
+  const { bank: api } = useBankCoreApiContext();
   const { state: credentials } = useSessionState();
   const token =
     credentials.status !== "loggedIn" ? undefined : credentials.token;