diff --git a/README.md b/README.md
index e9a1d5c2..6cbded1f 100644
--- a/README.md
+++ b/README.md
@@ -45,12 +45,22 @@ const ssoConnector = zksyncSsoConnector({
       // Allow up to 0.1 ETH to be spend in gas fees
       feeLimit: parseEther("0.1"),
 
-      // Allow ETH transfers to a specific address:
       transfers: [
+         // Allow ETH transfers of up to 0.1 ETH to specific address
          {
             to: "0x188bd99cd7D4d78d4E605Aeea12C17B32CC3135A",
             valueLimit: parseEther("0.1"),
          },
+
+         // Allow ETH transfers to specific address with a limit of 0.1 ETH per hour
+         // until the session expires
+         {
+            to: "0x188bd99cd7D4d78d4E605Aeea12C17B32CC3135A",
+            valueLimit: {
+               limit: parseEther("0.1"),
+               period: BigInt(60 * 60), // 1 hour in seconds
+            },
+         },
       ],
 
       // Allow calling specific smart contracts (e.g. ERC20 transfer):
@@ -61,21 +71,21 @@ const ssoConnector = zksyncSsoConnector({
 
             // Optional call constraints (unconstrained otherwise):
             constraints: [
+
                // Only allow transfers to this address
                {
                   index: 0,
                   condition: "Equal",
-                  refValue: "0x6cC8cf7f6b488C58AA909B77E6e65c631c204784",
+                  refValue: pad("0x6cC8cf7f6b488C58AA909B77E6e65c631c204784", { size: 32 }),
                },
 
-               // Limit the transfer amount to 0.1 tokens
+               // Transfer up to 0.2 tokens
                {
                   index: 1,
-                  condition: "LessEqual",
-                  refValue: toHex(parseUnits("0.1", TOKEN.decimals), { size: 32 }),
+                  limit: parseUnits("0.2", TOKEN.decimals), // Unlimited if omitted
                },
             ],
-         }
+         },
       ],
    },
 });
diff --git a/cspell-config/cspell-packages.txt b/cspell-config/cspell-packages.txt
index fffbaff2..202acb85 100644
--- a/cspell-config/cspell-packages.txt
+++ b/cspell-config/cspell-packages.txt
@@ -4,3 +4,4 @@ viem
 wagmi
 cbor
 levischuck
+ofetch
diff --git a/examples/bank-demo/nuxt.config.ts b/examples/bank-demo/nuxt.config.ts
index acc99afa..e7fe5267 100644
--- a/examples/bank-demo/nuxt.config.ts
+++ b/examples/bank-demo/nuxt.config.ts
@@ -49,5 +49,15 @@ export default defineNuxtConfig({
         explorerUrl: "http://34.121.229.57:3010/",
       }
     }
-  }
+  },
+  vite: {
+    css: {
+      preprocessorOptions: {
+        scss: {
+          // Fix deprecation warnings with modern API
+          api: "modern",
+        },
+      },
+    },
+  },
 });
diff --git a/examples/demo-app/nuxt.config.ts b/examples/demo-app/nuxt.config.ts
index b836c1ab..1bf5d31f 100644
--- a/examples/demo-app/nuxt.config.ts
+++ b/examples/demo-app/nuxt.config.ts
@@ -7,7 +7,7 @@ export default defineNuxtConfig({
   modules: ["@nuxt/eslint", "@pinia/nuxt", "@nuxtjs/tailwindcss", "@nuxtjs/google-fonts"],
   app: {
     head: {
-      title: "ZKsync SSO Demo App",
+      title: "ZKsync SSO Demo",
       link: [{ rel: "icon", type: "image/x-icon", href: "/favicon.ico" }],
     },
   },
@@ -34,4 +34,14 @@ export default defineNuxtConfig({
       },
     },
   },
+  vite: {
+    css: {
+      preprocessorOptions: {
+        scss: {
+          // Fix deprecation warnings with modern API
+          api: "modern",
+        },
+      },
+    },
+  },
 });
diff --git a/examples/demo-app/pages/index.vue b/examples/demo-app/pages/index.vue
index 7a16c725..5e98fca0 100644
--- a/examples/demo-app/pages/index.vue
+++ b/examples/demo-app/pages/index.vue
@@ -16,14 +16,14 @@
       <p>Connected Address: {{ address }}</p>
     </div>
     <div
-      v-if="address && balance"
+      v-if="address"
       class="mt-4"
     >
-      <p>Balance: {{ balance.formatted }} {{ balance.symbol }}</p>
+      <p>Balance: {{ balance ? `${balance.formatted} ${balance.symbol}` : '...' }}</p>
     </div>
     <button
       v-if="address"
-      class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded"
+      class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded mt-3"
       :disabled="isSendingEth"
       @click="sendTokens()"
     >
@@ -46,6 +46,8 @@ import { zksyncInMemoryNode } from "@wagmi/core/chains";
 import { createWalletClient, http, parseEther, type Address } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 
+const chain = zksyncInMemoryNode;
+
 const testTransferTarget = "0x55bE1B079b53962746B2e86d12f158a41DF294A6";
 const zksyncConnector = zksyncSsoConnector({
   authServerUrl: "http://localhost:3002/confirm",
@@ -60,10 +62,10 @@ const zksyncConnector = zksyncSsoConnector({
   },
 });
 const wagmiConfig = createConfig({
-  chains: [zksyncInMemoryNode],
+  chains: [chain],
   connectors: [zksyncConnector],
   transports: {
-    [zksyncInMemoryNode.id]: http(),
+    [chain.id]: http(),
   },
 });
 reconnect(wagmiConfig);
@@ -78,7 +80,7 @@ const fundAccount = async () => {
 
   const richClient = createWalletClient({
     account: privateKeyToAccount("0x3eb15da85647edd9a1159a4a13b9e7c56877c4eb33f614546d4db06a51868b1c"),
-    chain: zksyncInMemoryNode,
+    chain: chain,
     transport: http(),
   });
 
@@ -104,7 +106,10 @@ watch(address, async () => {
     address: address.value,
   });
   if (currentBalance && currentBalance.value < parseEther("0.2")) {
-    await fundAccount();
+    await fundAccount().catch((error) => {
+      // eslint-disable-next-line no-console
+      console.error("Funding failed:", error);
+    });
     currentBalance = await getBalance(wagmiConfig, {
       address: address.value,
     });
@@ -118,7 +123,7 @@ const connectWallet = async () => {
     errorMessage.value = "";
     connect(wagmiConfig, {
       connector: zksyncConnector,
-      chainId: zksyncInMemoryNode.id,
+      chainId: chain.id,
     });
   } catch (error) {
     errorMessage.value = "Connect failed, see console for more info.";
diff --git a/examples/nft-quest/assets/style.scss b/examples/nft-quest/assets/style.scss
index cc2ec207..f787bf91 100644
--- a/examples/nft-quest/assets/style.scss
+++ b/examples/nft-quest/assets/style.scss
@@ -1,3 +1,3 @@
 body {
-  @apply min-h-screen bg-white dark:bg-black dark:text-white;
+  @apply min-h-[100dvh] bg-white dark:bg-black dark:text-white;
 }
diff --git a/packages/auth-server/assets/css/style.scss b/packages/auth-server/assets/css/style.scss
index cc2ec207..f787bf91 100644
--- a/packages/auth-server/assets/css/style.scss
+++ b/packages/auth-server/assets/css/style.scss
@@ -1,3 +1,3 @@
 body {
-  @apply min-h-screen bg-white dark:bg-black dark:text-white;
+  @apply min-h-[100dvh] bg-white dark:bg-black dark:text-white;
 }
diff --git a/packages/auth-server/components/common/Alert.vue b/packages/auth-server/components/common/Alert.vue
new file mode 100644
index 00000000..76b14f68
--- /dev/null
+++ b/packages/auth-server/components/common/Alert.vue
@@ -0,0 +1,19 @@
+<template>
+  <div class="rounded-xl bg-primary-500/20 p-2">
+    <div class="flex">
+      <div
+        v-if="$slots.icon"
+        class="shrink-0 text-blue-400 size-5"
+      >
+        <slot name="icon" />
+      </div>
+      <div class="ml-3 text-primary-100">
+        <slot />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+
+</script>
diff --git a/packages/auth-server/components/session/AdvancedInfo.vue b/packages/auth-server/components/session/AdvancedInfo.vue
index 4fb3c123..a45eac7f 100644
--- a/packages/auth-server/components/session/AdvancedInfo.vue
+++ b/packages/auth-server/components/session/AdvancedInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <button
-      class="mx-auto text-center w-max px-4 py-2 flex items-center gap-1 text-sm text-neutral-700 hover:text-neutral-300 transition-colors"
+      class="mx-auto text-center w-max px-4 py-2 flex items-center gap-1 text-sm text-neutral-800 hover:text-neutral-400 transition-colors"
       @click="advancedInfoOpened = !advancedInfoOpened"
     >
       <span>{{ advancedInfoOpened ? 'Hide' : 'Show' }} advanced session info</span>
diff --git a/packages/auth-server/components/session/Metadata.vue b/packages/auth-server/components/session/Metadata.vue
index e333c13e..385de0de 100644
--- a/packages/auth-server/components/session/Metadata.vue
+++ b/packages/auth-server/components/session/Metadata.vue
@@ -1,12 +1,15 @@
 <template>
-  <div>
-    <div class="flex justify-center items-center isolate mt-6 mb-8">
+  <div
+    class="session-metadata"
+    :class="`size-${size}`"
+  >
+    <div class="flex justify-center items-center isolate my-4">
       <Web3Avatar
         v-if="address"
         :address="address!"
-        class="w-20 h-20 rounded-full -z-[1] -mr-4"
+        class="avatar-img rounded-full -z-[1] -mr-4"
       />
-      <div class="w-20 h-20 rounded-md bg-neutral-800">
+      <div class="app-icon-container rounded-md bg-neutral-800">
         <img
           v-if="appMeta.icon"
           :src="appMeta.icon"
@@ -20,7 +23,7 @@
     </h1>
     <p
       v-if="domain"
-      class="text-center border border-neutral-800 bg-neutral-800/50 mt-2 mx-auto w-max px-4 py-1 rounded-3xl"
+      class="text-center border border-neutral-800 bg-neutral-800/50 mt-3 mx-auto w-max px-4 py-1 rounded-3xl"
     >
       {{ domain }}
     </p>
@@ -31,12 +34,15 @@
 import Web3Avatar from "web3-avatar-vue";
 import type { AppMetadata } from "zksync-sso";
 
-const props = defineProps<{
+const props = withDefaults(defineProps<{
   appMeta: AppMetadata;
   address?: string | null;
   domain?: string;
   connect?: boolean;
-}>();
+  size?: "sm" | "md";
+}>(), {
+  size: "md",
+});
 
 const message = computed(() => {
   if (props.address || props.connect) {
@@ -46,3 +52,18 @@ const message = computed(() => {
   }
 });
 </script>
+
+<style lang="scss" scoped>
+.session-metadata {
+  &.size-sm {
+    .avatar-img, .app-icon-container {
+      @apply w-16 h-16;
+    }
+  }
+  &.size-md {
+    .avatar-img, .app-icon-container {
+      @apply w-20 h-20;
+    }
+  }
+}
+</style>
diff --git a/packages/auth-server/components/session/template.vue b/packages/auth-server/components/session/template.vue
index b53f1b73..2d3dc28f 100644
--- a/packages/auth-server/components/session/template.vue
+++ b/packages/auth-server/components/session/template.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="h-screen w-full flex flex-col">
+  <div class="h-[100dvh] w-full flex flex-col">
     <div
       v-if="$slots.header"
       class="bg-neutral-900/70 border-b border-neutral-800 p-2"
diff --git a/packages/auth-server/components/session/tokens.vue b/packages/auth-server/components/session/tokens.vue
index 1eec5d24..e1ecd489 100644
--- a/packages/auth-server/components/session/tokens.vue
+++ b/packages/auth-server/components/session/tokens.vue
@@ -1,13 +1,19 @@
 <template>
   <div
-    v-if="tokensLoading || spendLimitTokens?.length"
+    v-if="tokensLoading || spendLimitTokens.length || onchainActionsCount"
     class="bg-neutral-975 rounded-[28px] text-neutral-100"
   >
-    <div class="px-5 py-2 text-neutral-400">
+    <div class="pl-5 pr-3 py-2 text-neutral-400">
       <div class="flex justify-between">
         <div>Allowed spending</div>
-        <div v-if="totalUsd">
-          {{ formatPricePretty(totalUsd) }}
+        <div v-if="!hasUnlimitedSpend">
+          <CommonContentLoader
+            v-if="tokensLoading"
+            :length="12"
+          />
+          <span v-else>
+            {{ totalUsd ? formatPricePretty(totalUsd) : formatPricePretty(0) }}
+          </span>
         </div>
       </div>
     </div>
@@ -15,8 +21,9 @@
       <div class="divide-y divide-neutral-900">
         <template v-if="tokensLoading">
           <TokenAmountLoader
-            v-for="item in []"
+            v-for="item in 1"
             :key="item"
+            size="sm"
             variant="headless"
           />
         </template>
@@ -35,67 +42,185 @@
             :amount="item.amount.toString()"
           />
         </template>
+        <div class="py-2.5 text-center text-sm text-neutral-400">
+          <span v-if="spendLimitTokens.length">And</span>
+          {{ onchainActionsCount }} onchain action{{ onchainActionsCount > 1 ? 's' : '' }}...
+        </div>
       </div>
     </CommonLine>
   </div>
 </template>
 
 <script setup lang="ts">
-import { formatUnits } from "viem";
+import { useNow } from "@vueuse/core";
+import { FetchError } from "ofetch";
+import { erc20Abi, formatUnits, toFunctionSelector } from "viem";
 import type { Address } from "viem/accounts";
-import type { SessionConfig } from "zksync-sso/utils";
+import { type Limit, LimitType, LimitUnlimited, type SessionConfig } from "zksync-sso/utils";
 
 const { requestChain } = storeToRefs(useRequestsStore());
-const { fetchTokenInfo } = useTokenUtilities(computed(() => requestChain.value!.id));
+const { fetchTokenFromBlockExplorerApi } = useTokenUtilities(computed(() => requestChain.value!.id));
 
-interface Props {
+const props = defineProps<{
   session: Omit<SessionConfig, "signer">;
-}
+}>();
+
+const now = useNow({ interval: 5000 });
 
-const props = defineProps<Props>();
+const onchainActionsCount = computed(() => {
+  return props.session.callPolicies.length + props.session.transferPolicies.length;
+});
 
 const { result: tokensList, inProgress: tokensLoading, execute: fetchTokens } = useAsync(async () => {
-  const fetchSingleToken = async (tokenAddress: Address): Promise<Token> => {
-    try {
-      return fetchTokenInfo(tokenAddress);
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error(`Failed to fetch token info for ${tokenAddress}`, error);
-      return {
-        address: tokenAddress,
-        name: "Unknown",
-        symbol: "unknown",
-        decimals: 0,
-      };
+  const contracts: Address[] = [BASE_TOKEN_ADDRESS, ...props.session.callPolicies.map((policy) => policy.target)];
+  const tokens: Token[] = (await Promise.all(contracts.map(async (contract) => {
+    return await fetchTokenFromBlockExplorerApi(contract)
+      .catch((error) => {
+        if (contract === BASE_TOKEN_ADDRESS) {
+          return {
+            address: BASE_TOKEN_ADDRESS,
+            name: requestChain.value!.nativeCurrency.name,
+            symbol: requestChain.value!.nativeCurrency.symbol,
+            decimals: requestChain.value!.nativeCurrency.decimals,
+          };
+        }
+        if (error instanceof FetchError && error.statusCode === 404) return undefined;
+        // eslint-disable-next-line no-console
+        console.error(`Failed to fetch token info for ${contract}`, error);
+        return undefined;
+      });
+  }))).filter((e) => !!e);
+  return tokens;
+});
+
+const calculateMaxPeriodSpend = (args: { sessionStartsAt: Date; sessionExpiresAt: bigint; limitPerPeriod: bigint; period: bigint }) => {
+  // `limitPerPeriod` has cumulative effect, and every `period` seconds it resets
+  const startDate = args.sessionStartsAt;
+  const expiryDate = new Date(Number(args.sessionExpiresAt) * 1000);
+  const period = Number(args.period) * 1000;
+  // 1n means initial limit
+  const limitResetsCount = 1n + BigInt(Math.floor((expiryDate.getTime() - startDate.getTime()) / period));
+  return limitResetsCount * args.limitPerPeriod;
+};
+
+const limitsByToken = computed(() => {
+  const limits: { [tokenAddress: Address ]: bigint | "unlimited" } = {};
+
+  const createTokenEntry = (token: Address) => {
+    if (!limits[token]) {
+      limits[token] = 0n;
+    }
+  };
+  const addLifetimeLimit = (token: Address, limit: bigint | "unlimited") => {
+    createTokenEntry(token);
+    if (limits[token] === "unlimited") return;
+    if (limit === "unlimited") {
+      limits[token] = "unlimited";
+    } else {
+      limits[token] += limit;
+    }
+  };
+  const addPeriodLimit = (token: Address, limit: bigint, period: bigint) => {
+    createTokenEntry(token);
+    const maxSpend = calculateMaxPeriodSpend({
+      sessionStartsAt: now.value,
+      sessionExpiresAt: props.session.expiresAt,
+      limitPerPeriod: limit,
+      period,
+    });
+    addLifetimeLimit(token, maxSpend);
+  };
+  const addLimit = (token: Address, limit: Limit) => {
+    if (limit.limitType === LimitType.Lifetime) {
+      addLifetimeLimit(token, limit.limit);
+    } else if (limit.limitType === LimitType.Allowance) {
+      addPeriodLimit(token, limit.limit, limit.period);
+    } else if (limit.limitType === LimitType.Unlimited) {
+      addLifetimeLimit(token, "unlimited");
     }
   };
-  /* const promises = (props.session.transferPolicies || []).map(async (tokenAddress) => fetchSingleToken(tokenAddress as Address));
-  if (!Object.keys(props.session.spendLimit).includes(BASE_TOKEN_ADDRESS)) { // Fetch base token info if not present
-    promises.push(fetchSingleToken(BASE_TOKEN_ADDRESS));
-  } */
-  const promises = [fetchSingleToken(BASE_TOKEN_ADDRESS)];
-  return Object.fromEntries((await Promise.all(promises)).map((e) => [e.address, e]));
+
+  addLimit(BASE_TOKEN_ADDRESS, props.session.feeLimit);
+
+  for (const policy of props.session.transferPolicies) {
+    addLimit(BASE_TOKEN_ADDRESS, policy.valueLimit);
+  }
+  for (const policy of props.session.callPolicies) {
+    addLimit(BASE_TOKEN_ADDRESS, policy.valueLimit);
+    const token = tokensList.value?.find((token) => token.address === policy.target);
+    if (!token) continue;
+
+    const transferAbi = erc20Abi.find((e) => e.type === "function" && e.name === "transfer")!;
+    const approveAbi = erc20Abi.find((e) => e.type === "function" && e.name === "approve")!;
+    const isTransferSelector = policy.selector === toFunctionSelector(transferAbi);
+    const isApproveSelector = policy.selector === toFunctionSelector(approveAbi);
+    if (!isTransferSelector && !isApproveSelector) continue;
+
+    const amountConstraints = policy.constraints.filter((constraint) => {
+      const functionAbi = isTransferSelector ? transferAbi : approveAbi;
+      if (constraint.index === BigInt(functionAbi.inputs.findIndex((e) => e.name === "amount"))) return true;
+    });
+    if (!amountConstraints.length) {
+      addLimit(policy.target, LimitUnlimited);
+      continue;
+    }
+
+    // The goal is to find max amount that could be spent within that call policy
+    // To find max amount, we need to find the minimum of all constraints, since all of them should be satisfied
+    const maxAmount: bigint | "unlimited" = amountConstraints.reduce((acc, constraint) => {
+      switch (constraint.limit.limitType) {
+        case LimitType.Unlimited: {
+          if (acc === "unlimited") return "unlimited";
+          return acc;
+        }
+        case LimitType.Allowance: {
+          const periodLimit = calculateMaxPeriodSpend({
+            sessionStartsAt: now.value,
+            sessionExpiresAt: props.session.expiresAt,
+            limitPerPeriod: constraint.limit.limit,
+            period: constraint.limit.period,
+          });
+
+          if (acc === "unlimited") return periodLimit;
+          if (acc < periodLimit) return acc;
+          return periodLimit;
+        }
+        case LimitType.Lifetime: {
+          const lifetimeLimit = constraint.limit.limit;
+
+          if (acc === "unlimited") return lifetimeLimit;
+          if (acc < lifetimeLimit) return acc;
+          return lifetimeLimit;
+        }
+      }
+    }, "unlimited" as bigint | "unlimited");
+
+    if (maxAmount === "unlimited") {
+      addLimit(policy.target, LimitUnlimited);
+    } else {
+      addLifetimeLimit(policy.target, maxAmount);
+    }
+  }
+
+  return limits;
 });
 
 const spendLimitTokens = computed(() => {
-  if (!props.session || !tokensList.value) return;
-  let spendLimits: { [tokenAddress: string]: bigint } = {
-    [BASE_TOKEN_ADDRESS]: props.session.feeLimit?.limit,
-  };
-  spendLimits = (props.session.transferPolicies || []).reduce((acc, transferPolicy) => {
-    return {
-      ...acc,
-      [BASE_TOKEN_ADDRESS]: (acc[BASE_TOKEN_ADDRESS] || BigInt(0)) + BigInt(transferPolicy.valueLimit.limit),
-    };
-  }, spendLimits);
-  return Object.entries(spendLimits)
-    .filter(([,amount]) => amount > 0n)
-    .map(([tokenAddress, amount]) => ({
-      token: tokensList.value![tokenAddress],
-      amount,
-    }));
+  return Object.entries(limitsByToken.value)
+    .filter(([, amount]) => amount !== 0n)
+    .map(([tokenAddress, amount]) => {
+      const token = tokensList.value?.find((token) => token.address === tokenAddress);
+      if (!token) return null;
+      return {
+        token,
+        amount,
+      };
+    })
+    .filter((e) => !!e);
 });
 
+const hasUnlimitedSpend = computed(() => spendLimitTokens.value.some((item) => item.amount === "unlimited"));
+
 const totalUsd = computed(() => (spendLimitTokens.value || []).reduce((acc, item) => {
   if (!item.token.price) return acc;
   const formattedTokenAmount = formatUnits(BigInt(item.amount), item.token.decimals);
diff --git a/packages/auth-server/components/token/TokenAmount.vue b/packages/auth-server/components/token/TokenAmount.vue
index f9401485..70cee9f3 100644
--- a/packages/auth-server/components/token/TokenAmount.vue
+++ b/packages/auth-server/components/token/TokenAmount.vue
@@ -15,7 +15,7 @@
         <template #secondary>
           <div
             class="token-balance-amount"
-            :title="formattedAmount"
+            :title="unformattedAmount"
           >
             {{ formattedAmount }}
           </div>
@@ -33,6 +33,8 @@
 </template>
 
 <script lang="ts" setup>
+import { formatUnits } from "viem";
+
 const props = defineProps({
   as: {
     type: [String, Object] as PropType<string | Component>,
@@ -56,7 +58,7 @@ const props = defineProps({
     type: String,
   },
   amount: {
-    type: String,
+    type: String as PropType<string | "unlimited">,
     required: true,
   },
   price: {
@@ -68,9 +70,17 @@ const props = defineProps({
 });
 
 const isZeroAmount = computed(() => !props.amount);
-const formattedAmount = computed(() => formatAmount(BigInt(props.amount), props.decimals));
+const isUnlimitedAmount = computed(() => props.amount === "unlimited");
+const unformattedAmount = computed(() => {
+  if (isUnlimitedAmount.value) return undefined;
+  return formatUnits(BigInt(props.amount), props.decimals);
+});
+const formattedAmount = computed(() => {
+  if (isUnlimitedAmount.value) return "Unlimited";
+  return formatAmount(BigInt(props.amount), props.decimals);
+});
 const tokenPrice = computed(() => {
-  if (!props.price) return;
+  if (!props.price || isUnlimitedAmount.value) return;
   return formatTokenPrice(BigInt(props.amount), props.decimals, props.price);
 });
 </script>
diff --git a/packages/auth-server/components/views/confirmation/RequestSession.vue b/packages/auth-server/components/views/confirmation/RequestSession.vue
index d336a314..a7cb3829 100644
--- a/packages/auth-server/components/views/confirmation/RequestSession.vue
+++ b/packages/auth-server/components/views/confirmation/RequestSession.vue
@@ -4,18 +4,16 @@
       v-if="isLoggedIn"
       #header
     >
-      <SessionAccountHeader
-
-        message="Connecting with"
-      />
+      <SessionAccountHeader message="Connecting with" />
     </template>
 
     <SessionMetadata
       :app-meta="appMeta"
       :domain="domain"
+      size="sm"
     />
 
-    <div class="space-y-2 mt-4">
+    <div class="space-y-2 mt-2">
       <div class="bg-neutral-975 rounded-[28px]">
         <div class="px-5 py-2 text-neutral-400">
           Permissions
@@ -28,7 +26,7 @@
             </div>
             <div class="flex items-center gap-2 py-3 px-3">
               <IconsClock class="w-7 h-7" />
-              <div>Expires {{ sessionExpiresIn }}</div>
+              <div>{{ sessionExpiry }}</div>
             </div>
           </div>
         </CommonLine>
@@ -73,7 +71,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useTimeAgo } from "@vueuse/core";
+import { useNow } from "@vueuse/core";
 import { parseEther } from "viem";
 import { generatePrivateKey, privateKeyToAddress } from "viem/accounts";
 import type { SessionPreferences } from "zksync-sso";
@@ -102,10 +100,34 @@ const defaults = {
     period: 0n,
   },
 };
+
 const sessionConfig = computed(() => formatSessionPreferences(props.sessionPreferences, defaults));
 
 const domain = computed(() => new URL(appOrigin.value).host);
-const sessionExpiresIn = useTimeAgo(Number(sessionConfig.value.expiresAt) * 1000);
+const now = useNow({ interval: 5000 });
+const sessionExpiry = computed(() => {
+  const expiresAt = Number(sessionConfig.value.expiresAt) * 1000; // Convert to milliseconds
+  const expiresDate = new Date(expiresAt);
+  const nowDate = new Date(now.value);
+
+  const isToday = expiresDate.toDateString() === nowDate.toDateString();
+
+  const tomorrowDate = new Date(
+    nowDate.getFullYear(),
+    nowDate.getMonth(),
+    nowDate.getDate() + 1,
+  );
+  const isTomorrow = expiresDate.toDateString() === tomorrowDate.toDateString();
+
+  const formatTime = (date: Date) => date.toLocaleTimeString(undefined, { hour: "2-digit", minute: "2-digit" });
+  const formatDate = (date: Date) => date.toLocaleDateString(undefined, { year: "numeric", month: "short", day: "numeric" });
+  const formatDateTime = (date: Date) => `${formatDate(date)} at ${formatTime(date)}`;
+
+  if (isToday) return `Expires today at ${formatTime(expiresDate)}`;
+  if (isTomorrow) return `Expires tomorrow at ${formatTime(expiresDate)}`;
+
+  return `Expires on ${formatDateTime(expiresDate)}`;
+});
 
 const sessionError = ref("");
 
diff --git a/packages/auth-server/components/views/confirmation/Send.vue b/packages/auth-server/components/views/confirmation/Send.vue
index 7bbf9459..78a40322 100644
--- a/packages/auth-server/components/views/confirmation/Send.vue
+++ b/packages/auth-server/components/views/confirmation/Send.vue
@@ -6,6 +6,17 @@
       />
     </template>
 
+    <CommonAlert>
+      <template #icon>
+        <InformationCircleIcon aria-hidden="true" />
+      </template>
+      <template #default>
+        <p class="text-sm">
+          UI for non-session transactions is currently in an early development stage and remains a work-in-progress.
+        </p>
+      </template>
+    </CommonAlert>
+
     <h2 class="flex items-center justify-center text-white text-center text-3xl mt-6 font-semibold">
       <span v-if="preparingTransaction">
         <CommonContentLoader :length="15" />
@@ -144,6 +155,7 @@
 </template>
 
 <script lang="ts" setup>
+import { InformationCircleIcon } from "@heroicons/vue/20/solid";
 import { ChevronDownIcon } from "@heroicons/vue/24/outline";
 import { useIntervalFn } from "@vueuse/core";
 import { type Address, formatUnits, type SendTransactionRequest } from "viem";
diff --git a/packages/auth-server/composables/useTokenUtilities.ts b/packages/auth-server/composables/useTokenUtilities.ts
index 49c10436..171498b4 100644
--- a/packages/auth-server/composables/useTokenUtilities.ts
+++ b/packages/auth-server/composables/useTokenUtilities.ts
@@ -1,3 +1,4 @@
+import { FetchError } from "ofetch";
 import { type Address, erc20Abi } from "viem";
 
 export const useTokenUtilities = (_chainId: MaybeRef<SupportedChainId>) => {
@@ -15,6 +16,11 @@ export const useTokenUtilities = (_chainId: MaybeRef<SupportedChainId>) => {
       }[];
     }>(`${blockExplorerApiByChain[chainId.value]}?module=token&action=tokeninfo&contractaddress=${tokenAddress}`);
     const tokenInfo = result[0];
+    if (!tokenInfo) {
+      const error = new FetchError("Token not found");
+      error.statusCode = 404;
+      throw error;
+    }
     return {
       address: tokenAddress,
       name: tokenInfo.tokenName,
diff --git a/packages/auth-server/layouts/popup.vue b/packages/auth-server/layouts/popup.vue
index b4f45862..8474cc23 100644
--- a/packages/auth-server/layouts/popup.vue
+++ b/packages/auth-server/layouts/popup.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="h-screen">
+  <div class="h-[100dvh]">
     <slot />
   </div>
 </template>
diff --git a/packages/auth-server/pages/confirm.vue b/packages/auth-server/pages/confirm.vue
index b419c044..2c9ce54e 100644
--- a/packages/auth-server/pages/confirm.vue
+++ b/packages/auth-server/pages/confirm.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="h-screen">
+  <div class="h-[100dvh]">
     <ViewsLoading
       v-if="!hasRequests && !appMeta"
       key="loading"
diff --git a/packages/auth-server/pages/confirm/connect.vue b/packages/auth-server/pages/confirm/connect.vue
index 41ecf45d..56c0cc5d 100644
--- a/packages/auth-server/pages/confirm/connect.vue
+++ b/packages/auth-server/pages/confirm/connect.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="h-screen">
+  <div class="h-[100dvh]">
     <ViewsLoading
       v-if="loading"
       key="loading"
diff --git a/packages/auth-server/stores/token.ts b/packages/auth-server/stores/token.ts
index 18ccbdf4..b983900d 100644
--- a/packages/auth-server/stores/token.ts
+++ b/packages/auth-server/stores/token.ts
@@ -1,5 +1,7 @@
+import type { Address } from "viem";
+
 export type Token = {
-  address: string;
+  address: Address;
   name?: string;
   symbol: string;
   decimals: number;
diff --git a/packages/auth-server/utils/constants.ts b/packages/auth-server/utils/constants.ts
index d18c2aac..ed106fd1 100644
--- a/packages/auth-server/utils/constants.ts
+++ b/packages/auth-server/utils/constants.ts
@@ -1 +1,3 @@
-export const BASE_TOKEN_ADDRESS = "0x000000000000000000000000000000000000800A";
+import type { Address } from "viem";
+
+export const BASE_TOKEN_ADDRESS: Address = "0x000000000000000000000000000000000000800A";
diff --git a/packages/auth-server/utils/formatters.ts b/packages/auth-server/utils/formatters.ts
index 1a102272..8a7d8a22 100644
--- a/packages/auth-server/utils/formatters.ts
+++ b/packages/auth-server/utils/formatters.ts
@@ -50,7 +50,7 @@ export const formatAmount = (
 
 export const formatPricePretty = (price: number): string => {
   if (!price) {
-    return "$0.00";
+    return "$0";
   } else if (price < 0.01) {
     return "<$0.01";
   }
diff --git a/packages/sdk/src/client-auth-server/session.ts b/packages/sdk/src/client-auth-server/session.ts
index 03fa5cb2..56ddb745 100644
--- a/packages/sdk/src/client-auth-server/session.ts
+++ b/packages/sdk/src/client-auth-server/session.ts
@@ -1,4 +1,4 @@
-import { type AbiFunction, type Address, type Hash, toFunctionSelector, toHex } from "viem";
+import { type AbiFunction, type Address, getAddress, type Hash, toFunctionSelector, toHex } from "viem";
 
 import { ConstraintCondition, type Limit, LimitType, LimitUnlimited, LimitZero, type SessionConfig } from "../utils/session.js";
 
@@ -115,13 +115,13 @@ export function formatSessionPreferences(
       const selector = policy.function ? toFunctionSelector(policy.function) : policy.selector;
       if (!selector) throw new Error("Missing function or selector in contract call policy");
       return {
-        target: policy.address,
+        target: getAddress(policy.address.toLowerCase()),
         maxValuePerUse: policy.maxValuePerUse ?? valueLimit.limit,
         valueLimit,
         selector: selector,
         constraints: policy.constraints?.map((constraint) => ({
           index: BigInt(constraint.index),
-          condition: typeof constraint.condition == "string" ? ConstraintCondition[constraint.condition] : (constraint.condition ?? 0),
+          condition: typeof constraint.condition == "string" ? ConstraintCondition[constraint.condition] : (constraint.condition ?? ConstraintCondition.Unconstrained),
           refValue: constraint.refValue ?? toHex("", { size: 32 }),
           limit: constraint.limit ? formatLimitPreferences(constraint.limit) : LimitUnlimited,
         })) ?? [],
@@ -130,7 +130,7 @@ export function formatSessionPreferences(
     transferPolicies: preferences.transfers?.map((policy) => {
       const valueLimit = policy.valueLimit ? formatLimitPreferences(policy.valueLimit) : LimitZero;
       return {
-        target: policy.to,
+        target: getAddress(policy.to.toLowerCase()),
         maxValuePerUse: policy.maxValuePerUse ?? valueLimit.limit,
         valueLimit,
       };