diff --git a/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/siwe_risk_warning_box.module.scss b/embed/oko_attached/src/components/modal_variants/common/risk_warning/risk_warning.module.scss
similarity index 70%
rename from embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/siwe_risk_warning_box.module.scss
rename to embed/oko_attached/src/components/modal_variants/common/risk_warning/risk_warning.module.scss
index 410605751..fe30aaa09 100644
--- a/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/siwe_risk_warning_box.module.scss
+++ b/embed/oko_attached/src/components/modal_variants/common/risk_warning/risk_warning.module.scss
@@ -1,10 +1,10 @@
-.siweRiskWarningContainer {
+.riskWarningContainer {
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
-.siweRiskWarningBox {
+.riskWarningBox {
   display: flex;
   padding: 6px 8px;
   justify-content: center;
@@ -19,10 +19,10 @@
   background-color: var(--bg-warning-primary);
 }
 
-.siweRiskWarningCheckBoxContainer {
+.riskWarningCheckBoxContainer {
   gap: 6px;
 }
 
-.siweRiskWarningCheckBoxInputContainerClassName {
+.riskWarningCheckBoxInputContainerClassName {
   padding-top: 0px;
 }
diff --git a/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/siwe_risk_warning_box.tsx b/embed/oko_attached/src/components/modal_variants/common/risk_warning/risk_warning.tsx
similarity index 59%
rename from embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/siwe_risk_warning_box.tsx
rename to embed/oko_attached/src/components/modal_variants/common/risk_warning/risk_warning.tsx
index 4180841a0..f5bf58ff6 100644
--- a/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/siwe_risk_warning_box.tsx
+++ b/embed/oko_attached/src/components/modal_variants/common/risk_warning/risk_warning.tsx
@@ -2,20 +2,21 @@ import type { FC } from "react";
 import { Checkbox } from "@oko-wallet/oko-common-ui/checkbox";
 import { Typography } from "@oko-wallet/oko-common-ui/typography";
 
-import styles from "./siwe_risk_warning_box.module.scss";
+import styles from "./risk_warning.module.scss";
 
-interface SiweRiskWarningCheckBoxProps {
+interface RiskWarningCheckBoxProps {
   checked: boolean;
-  onChange: (isValidSiweMessage: boolean) => void;
+  onChange: (checked: boolean) => void;
 }
-export const SiweRiskWarningCheckBox: FC<SiweRiskWarningCheckBoxProps> = ({
+
+export const RiskWarningCheckBox: FC<RiskWarningCheckBoxProps> = ({
   checked,
   onChange,
 }) => {
   return (
-    <div className={styles.siweRiskWarningContainer}>
+    <div className={styles.riskWarningContainer}>
       <Checkbox
-        id="siwe-message-checkbox"
+        id="sign-in-message-checkbox"
         checked={checked}
         onChange={onChange}
         label="I understand the risk and would like to proceed."
@@ -24,18 +25,18 @@ export const SiweRiskWarningCheckBox: FC<SiweRiskWarningCheckBoxProps> = ({
           size: "xs",
           weight: "medium",
         }}
-        checkboxContainerClassName={styles.siweRiskWarningCheckBoxContainer}
+        checkboxContainerClassName={styles.riskWarningCheckBoxContainer}
         checkBoxInputContainerClassName={
-          styles.siweRiskWarningCheckBoxInputContainerClassName
+          styles.riskWarningCheckBoxInputContainerClassName
         }
       />
     </div>
   );
 };
 
-export const SiweRiskWarningBox = () => {
+export const RiskWarningBox: FC = () => {
   return (
-    <div className={styles.siweRiskWarningBox}>
+    <div className={styles.riskWarningBox}>
       <Typography size="xs" color="warning-primary" weight="medium">
         The URL requesting your signature differs from the current website. This
         may indicate a potential security risk.
diff --git a/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/ethereum_siwe_signature_content.module.scss b/embed/oko_attached/src/components/modal_variants/common/sign_in_content/sign_in_content.module.scss
similarity index 100%
rename from embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/ethereum_siwe_signature_content.module.scss
rename to embed/oko_attached/src/components/modal_variants/common/sign_in_content/sign_in_content.module.scss
diff --git a/embed/oko_attached/src/components/modal_variants/common/sign_in_message.ts b/embed/oko_attached/src/components/modal_variants/common/sign_in_message.ts
new file mode 100644
index 000000000..f7936ce1e
--- /dev/null
+++ b/embed/oko_attached/src/components/modal_variants/common/sign_in_message.ts
@@ -0,0 +1,59 @@
+/**
+ * Common utilities for Sign In With X (SIWE/SIWS) message verification
+ */
+
+export const ALLOW_PROTOCOLS = ["https:"];
+export const BYPASS_HOSTS = ["localhost"];
+
+/**
+ * Verify that the sign-in message origin matches the request origin
+ */
+export function verifySignInOrigin(
+  domain: string,
+  uri: string | undefined,
+  origin: string,
+): boolean {
+  try {
+    const {
+      origin: originByPayload,
+      protocol: protocolByPayload,
+      host: hostByPayload,
+    } = new URL(origin);
+
+    // Check domain matches
+    if (hostByPayload !== domain) {
+      return false;
+    }
+
+    // Check URI if provided
+    if (uri) {
+      const { origin: originByUri, protocol: protocolByUri } = new URL(uri);
+
+      if (originByPayload !== originByUri) {
+        return false;
+      }
+
+      // If scheme is not HTTPS, return false (when hostname is not localhost)
+      if (
+        !BYPASS_HOSTS.includes(hostByPayload.split(":")[0]) &&
+        (!ALLOW_PROTOCOLS.includes(protocolByPayload) ||
+          !ALLOW_PROTOCOLS.includes(protocolByUri))
+      ) {
+        return false;
+      }
+    } else {
+      // No URI, just check protocol
+      if (
+        !BYPASS_HOSTS.includes(hostByPayload.split(":")[0]) &&
+        !ALLOW_PROTOCOLS.includes(protocolByPayload)
+      ) {
+        return false;
+      }
+    }
+  } catch (error) {
+    console.error(error);
+    return false;
+  }
+
+  return true;
+}
diff --git a/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/signer_address_or_email_for_siwe/index.tsx b/embed/oko_attached/src/components/modal_variants/common/signer_info/index.tsx
similarity index 92%
rename from embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/signer_address_or_email_for_siwe/index.tsx
rename to embed/oko_attached/src/components/modal_variants/common/signer_info/index.tsx
index 263b2cd6f..a3fad69b0 100644
--- a/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/signer_address_or_email_for_siwe/index.tsx
+++ b/embed/oko_attached/src/components/modal_variants/common/signer_info/index.tsx
@@ -6,13 +6,13 @@ import {
   SignerAddressOrEmailView,
 } from "@oko-wallet-attached/components/modal_variants/common/metadata_content/signer_address_or_email/signer_address_or_email";
 
-interface SignerAddressOrEmailProps {
+interface SignerInfoProps {
   signer: string;
   origin: string;
   initialViewType?: "View Address" | "Login Info";
 }
 
-export const SignerAddressOrEmailForSiwe: FC<SignerAddressOrEmailProps> = ({
+export const SignerInfo: FC<SignerInfoProps> = ({
   signer,
   origin,
   initialViewType = "View Address",
diff --git a/embed/oko_attached/src/components/modal_variants/common/signer_info/styles.module.scss b/embed/oko_attached/src/components/modal_variants/common/signer_info/styles.module.scss
new file mode 100644
index 000000000..a7ed28fe9
--- /dev/null
+++ b/embed/oko_attached/src/components/modal_variants/common/signer_info/styles.module.scss
@@ -0,0 +1,10 @@
+.wrapper {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 0.5rem;
+  width: 100%;
+  word-break: break-all;
+  word-wrap: break-word;
+  overflow-wrap: break-word;
+}
diff --git a/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/make_arbitrary_sig_modal.tsx b/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/make_arbitrary_sig_modal.tsx
index b830071a1..eaf89c0bd 100644
--- a/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/make_arbitrary_sig_modal.tsx
+++ b/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/make_arbitrary_sig_modal.tsx
@@ -16,7 +16,7 @@ import {
   verifySiweMessage,
 } from "@oko-wallet-attached/components/modal_variants/eth/siwe_message";
 import { EthereumSiweSignatureContent } from "@oko-wallet-attached/components/modal_variants/eth/arbitrary_sig/siwe_sig/make_siwe_signature_content";
-import { SiweRiskWarningCheckBox } from "@oko-wallet-attached/components/modal_variants/eth/arbitrary_sig/siwe_sig/siwe_risk_warning_box";
+import { RiskWarningCheckBox } from "@oko-wallet-attached/components/modal_variants/common/risk_warning/risk_warning";
 
 export const MakeArbitrarySigModal: FC<MakeArbitrarySigModalProps> = ({
   getIsAborted,
@@ -74,14 +74,14 @@ export const MakeArbitrarySigModal: FC<MakeArbitrarySigModalProps> = ({
           )}
         </div>
 
-        <Spacing height={!!siweMessage ? 12 : 20} />
+        <Spacing height={20} />
         {!hasOnChainSchema && <ArbitrarySignatureDesc />}
 
         <Spacing height={8} />
 
         {siweMessage && !isValidSiweMessage && (
           <>
-            <SiweRiskWarningCheckBox
+            <RiskWarningCheckBox
               checked={isSiweRiskWarningChecked}
               onChange={setIsSiweRiskWarningChecked}
             />
diff --git a/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/make_siwe_signature_content.tsx b/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/make_siwe_signature_content.tsx
index a76a4f1c0..bd86c82dd 100644
--- a/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/make_siwe_signature_content.tsx
+++ b/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/make_siwe_signature_content.tsx
@@ -4,16 +4,16 @@ import { Typography } from "@oko-wallet/oko-common-ui/typography";
 import type { Theme } from "@oko-wallet/oko-common-ui/theme";
 import type { FC } from "react";
 
-import styles from "./ethereum_siwe_signature_content.module.scss";
+import styles from "@oko-wallet-attached/components/modal_variants/common/sign_in_content/sign_in_content.module.scss";
 import {
   getSiweMessage,
   verifySiweMessage,
 } from "@oko-wallet-attached/components/modal_variants/eth/siwe_message";
 import { SiweSigTitleBadge } from "@oko-wallet-attached/components/modal_variants/eth/arbitrary_sig/siwe_sig/siwe_sig_title_badge";
-import { SignerAddressOrEmailForSiwe } from "@oko-wallet-attached/components/modal_variants/eth/arbitrary_sig/siwe_sig/signer_address_or_email_for_siwe";
+import { SignerInfo } from "@oko-wallet-attached/components/modal_variants/common/signer_info";
 import { MakeSignatureRawCodeBlockContainer } from "@oko-wallet-attached/components/modal_variants/common/make_signature/make_sig_modal_code_block_container";
 import { MakeSignatureRawCodeBlock } from "@oko-wallet-attached/components/modal_variants/common/make_signature/make_sig_modal_code_block";
-import { SiweRiskWarningBox } from "@oko-wallet-attached/components/modal_variants/eth/arbitrary_sig/siwe_sig/siwe_risk_warning_box";
+import { RiskWarningBox } from "@oko-wallet-attached/components/modal_variants/common/risk_warning/risk_warning";
 import { Avatar } from "@oko-wallet-attached/components/avatar/avatar";
 
 interface EthereumSiweSignatureContentProps {
@@ -37,7 +37,7 @@ export const EthereumSiweSignatureContent: FC<
       {isValidSiweMessage ? (
         <SiweSigTitleBadge theme={theme} />
       ) : (
-        <SiweRiskWarningBox />
+        <RiskWarningBox />
       )}
 
       <div className={styles.metadataContainer}>
@@ -58,7 +58,7 @@ export const EthereumSiweSignatureContent: FC<
         </div>
 
         <Spacing height={8} />
-        <SignerAddressOrEmailForSiwe
+        <SignerInfo
           origin={payload.origin}
           signer={payload.signer}
           initialViewType="Login Info"
diff --git a/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/signer_address_or_email_for_siwe/styles.module.scss b/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/signer_address_or_email_for_siwe/styles.module.scss
deleted file mode 100644
index 3c83eb1f3..000000000
--- a/embed/oko_attached/src/components/modal_variants/eth/arbitrary_sig/siwe_sig/signer_address_or_email_for_siwe/styles.module.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-.wrapper {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 0.5rem;
-  width: 100%;
-  word-break: break-all;
-  word-wrap: break-word;
-  overflow-wrap: break-word;
-}
-
-.changeViewTypeButton {
-  display: flex;
-  padding: 4px 8px;
-  align-items: center;
-  gap: 4px;
-  flex-shrink: 0;
-
-  cursor: pointer;
-  border-radius: 12px;
-  background: var(--bg-secondary);
-  width: fit-content;
-}
diff --git a/embed/oko_attached/src/components/modal_variants/eth/siwe_message.ts b/embed/oko_attached/src/components/modal_variants/eth/siwe_message.ts
index 082e81146..4a153197f 100644
--- a/embed/oko_attached/src/components/modal_variants/eth/siwe_message.ts
+++ b/embed/oko_attached/src/components/modal_variants/eth/siwe_message.ts
@@ -1,8 +1,7 @@
 import type { SignableMessage } from "viem";
 import { parseSiweMessage, type SiweMessage } from "viem/siwe";
 
-const ALLOW_PROTOCOLS = ["https:"];
-const BYPASS_HOSTS = ["localhost"];
+import { verifySignInOrigin } from "@oko-wallet-attached/components/modal_variants/common/sign_in_message";
 
 export function getSiweMessage(
   message: SignableMessage,
@@ -33,32 +32,5 @@ export function verifySiweMessage(
   message: SiweMessage,
   origin: string,
 ): boolean {
-  try {
-    const {
-      origin: originByPayload,
-      protocol: protocolByPayload,
-      host: hostByPayload,
-    } = new URL(origin);
-    const { origin: originByTxUri, protocol: protocolByTxUri } = new URL(
-      message.uri,
-    );
-
-    if (originByPayload !== originByTxUri || hostByPayload !== message.domain) {
-      return false;
-    }
-
-    // If scheme is not HTTPS, return false (when hostname is not localhost)
-    if (
-      !BYPASS_HOSTS.includes(hostByPayload.split(":")[0]) &&
-      (!ALLOW_PROTOCOLS.includes(protocolByPayload) ||
-        !ALLOW_PROTOCOLS.includes(protocolByTxUri))
-    ) {
-      return false;
-    }
-  } catch (error) {
-    console.error(error);
-    return false;
-  }
-
-  return true;
+  return verifySignInOrigin(message.domain, message.uri, origin);
 }
diff --git a/embed/oko_attached/src/components/modal_variants/sol/message_sig/make_message_sig_modal.tsx b/embed/oko_attached/src/components/modal_variants/sol/message_sig/make_message_sig_modal.tsx
index a3b1eab16..8dbadad1b 100644
--- a/embed/oko_attached/src/components/modal_variants/sol/message_sig/make_message_sig_modal.tsx
+++ b/embed/oko_attached/src/components/modal_variants/sol/message_sig/make_message_sig_modal.tsx
@@ -1,4 +1,4 @@
-import type { FC } from "react";
+import { useMemo, useState, type FC } from "react";
 import type { MakeSolMessageSignData } from "@oko-wallet/oko-sdk-core";
 import { XCloseIcon } from "@oko-wallet/oko-common-ui/icons/x_close";
 import { Spacing } from "@oko-wallet/oko-common-ui/spacing";
@@ -10,6 +10,13 @@ import { DemoView } from "@oko-wallet-attached/components/modal_variants/common/
 import { SignWithOkoBox } from "@oko-wallet-attached/components/sign_with_oko_box/sign_with_oko_box";
 import { useMessageSigModal } from "./use_message_sig_modal";
 import { SolanaMessageSignatureContent } from "./sol_message_signature_content";
+import {
+  getSiwsMessage,
+  verifySiwsMessage,
+} from "@oko-wallet-attached/components/modal_variants/sol/siws_message";
+import { SolanaSiwsSignatureContent } from "@oko-wallet-attached/components/modal_variants/sol/message_sig/siws_sig/make_siws_signature_content";
+import { RiskWarningCheckBox } from "@oko-wallet-attached/components/modal_variants/common/risk_warning/risk_warning";
+import { hexToUint8Array } from "@oko-wallet-attached/crypto/keygen_ed25519";
 
 export interface MakeMessageSigModalProps {
   getIsAborted: () => boolean;
@@ -22,12 +29,48 @@ export const MakeMessageSigModal: FC<MakeMessageSigModalProps> = ({
   data,
   modalId,
 }) => {
-  const { onReject, onApprove, isLoading, isApproveEnabled, isDemo, theme } =
-    useMessageSigModal({
-      getIsAborted,
-      data,
-      modalId,
-    });
+  // Decode hex message to check for SIWS
+  const decodedMessage = useMemo(() => {
+    try {
+      const bytes = hexToUint8Array(data.payload.data.message);
+      return new TextDecoder().decode(bytes);
+    } catch {
+      return data.payload.data.message;
+    }
+  }, [data.payload.data.message]);
+
+  const siwsMessage = getSiwsMessage(decodedMessage);
+  const isValidSiwsMessage = siwsMessage
+    ? verifySiwsMessage(siwsMessage, data.payload.origin)
+    : false;
+  const [isSiwsRiskWarningChecked, setIsSiwsRiskWarningChecked] =
+    useState(false);
+
+  const {
+    onReject,
+    onApprove,
+    isLoading,
+    isApproveEnabled: isApproveEnabledOriginal,
+    isDemo,
+    theme,
+  } = useMessageSigModal({
+    getIsAborted,
+    data,
+    modalId,
+  });
+
+  const isApproveEnabled = useMemo(() => {
+    if (siwsMessage && !isValidSiwsMessage) {
+      return isApproveEnabledOriginal && isSiwsRiskWarningChecked;
+    }
+
+    return isApproveEnabledOriginal;
+  }, [
+    isApproveEnabledOriginal,
+    isSiwsRiskWarningChecked,
+    siwsMessage,
+    isValidSiwsMessage,
+  ]);
 
   return (
     <div className={styles.container}>
@@ -37,11 +80,25 @@ export const MakeMessageSigModal: FC<MakeMessageSigModalProps> = ({
         </div>
 
         <div className={styles.modalInnerContentContainer}>
-          <SolanaMessageSignatureContent payload={data.payload} />
+          {!!siwsMessage ? (
+            <SolanaSiwsSignatureContent payload={data.payload} theme={theme} />
+          ) : (
+            <SolanaMessageSignatureContent payload={data.payload} />
+          )}
         </div>
 
         <Spacing height={20} />
 
+        {siwsMessage && !isValidSiwsMessage && (
+          <>
+            <RiskWarningCheckBox
+              checked={isSiwsRiskWarningChecked}
+              onChange={setIsSiwsRiskWarningChecked}
+            />
+            <Spacing height={12} />
+          </>
+        )}
+
         <div className={styles.buttonContainer}>
           <Button
             variant="secondary"
diff --git a/embed/oko_attached/src/components/modal_variants/sol/message_sig/siws_sig/make_siws_signature_content.tsx b/embed/oko_attached/src/components/modal_variants/sol/message_sig/siws_sig/make_siws_signature_content.tsx
new file mode 100644
index 000000000..3d7088d29
--- /dev/null
+++ b/embed/oko_attached/src/components/modal_variants/sol/message_sig/siws_sig/make_siws_signature_content.tsx
@@ -0,0 +1,122 @@
+import type { SolanaMessageSignPayload } from "@oko-wallet/oko-sdk-core";
+import { Spacing } from "@oko-wallet/oko-common-ui/spacing";
+import { Typography } from "@oko-wallet/oko-common-ui/typography";
+import type { Theme } from "@oko-wallet/oko-common-ui/theme";
+import { useMemo, type FC } from "react";
+
+import styles from "@oko-wallet-attached/components/modal_variants/common/sign_in_content/sign_in_content.module.scss";
+import {
+  getSiwsMessage,
+  verifySiwsMessage,
+} from "@oko-wallet-attached/components/modal_variants/sol/siws_message";
+import { SiwsSigTitleBadge } from "@oko-wallet-attached/components/modal_variants/sol/message_sig/siws_sig/siws_sig_title_badge";
+import { SignerInfo } from "@oko-wallet-attached/components/modal_variants/common/signer_info";
+import { MakeSignatureRawCodeBlockContainer } from "@oko-wallet-attached/components/modal_variants/common/make_signature/make_sig_modal_code_block_container";
+import { MakeSignatureRawCodeBlock } from "@oko-wallet-attached/components/modal_variants/common/make_signature/make_sig_modal_code_block";
+import { RiskWarningBox } from "@oko-wallet-attached/components/modal_variants/common/risk_warning/risk_warning";
+import { Avatar } from "@oko-wallet-attached/components/avatar/avatar";
+import { SOLANA_LOGO_URL } from "@oko-wallet-attached/constants/urls";
+import { hexToUint8Array } from "@oko-wallet-attached/crypto/keygen_ed25519";
+
+interface SolanaSiwsSignatureContentProps {
+  payload: SolanaMessageSignPayload;
+  theme: Theme | null;
+}
+
+export const SolanaSiwsSignatureContent: FC<
+  SolanaSiwsSignatureContentProps
+> = ({ payload, theme }) => {
+  // Decode hex message to string
+  const decodedMessage = useMemo(() => {
+    try {
+      const bytes = hexToUint8Array(payload.data.message);
+      return new TextDecoder().decode(bytes);
+    } catch {
+      return payload.data.message;
+    }
+  }, [payload.data.message]);
+
+  const message = getSiwsMessage(decodedMessage);
+  if (!message) {
+    // @unreachable
+    throw new Error("unreachable");
+  }
+
+  const isValidSiwsMessage = verifySiwsMessage(message, payload.origin);
+
+  return (
+    <div>
+      {isValidSiwsMessage ? <SiwsSigTitleBadge /> : <RiskWarningBox />}
+
+      <div className={styles.metadataContainer}>
+        <Spacing height={isValidSiwsMessage ? 8 : 12} />
+        <Typography size="lg" color="primary" weight="semibold">
+          Sign in to
+        </Typography>
+
+        <Spacing height={4} />
+        <div className={styles.originRow}>
+          <Typography
+            size="lg"
+            color={isValidSiwsMessage ? "primary" : "warning-primary"}
+            weight="semibold"
+          >
+            {payload.origin.replace(/^https?:\/\//, "")}
+          </Typography>
+        </div>
+
+        <Spacing height={8} />
+        <SignerInfo
+          origin={payload.origin}
+          signer={payload.signer}
+          initialViewType="Login Info"
+        />
+      </div>
+
+      <Spacing height={20} />
+
+      <div className={styles.chainInfoContainer}>
+        <div className={styles.chainInfoRow}>
+          <Typography size="xs" color="secondary" weight="semibold">
+            Impact on balance
+          </Typography>
+          <Typography size="sm" color="secondary" weight="medium">
+            None
+          </Typography>
+        </div>
+
+        <Spacing height={8} />
+        <div className={styles.chainInfoRow}>
+          <Typography size="xs" color="secondary" weight="semibold">
+            Network
+          </Typography>
+
+          <div className={styles.chainInfoRowContent}>
+            <Avatar
+              src={SOLANA_LOGO_URL}
+              alt="Solana"
+              size="sm"
+              variant="rounded"
+            />
+            <Typography size="sm" color="secondary" weight="medium">
+              Solana
+            </Typography>
+          </div>
+        </div>
+      </div>
+
+      <Spacing height={16} />
+      <MakeSignatureRawCodeBlockContainer className={styles.messageContainer}>
+        <Typography color="tertiary" size="xs" weight="semibold">
+          Message
+        </Typography>
+
+        <Spacing height={16} />
+        <MakeSignatureRawCodeBlock
+          code={message.statement ?? ""}
+          className={styles.messageContent}
+        />
+      </MakeSignatureRawCodeBlockContainer>
+    </div>
+  );
+};
diff --git a/embed/oko_attached/src/components/modal_variants/sol/message_sig/siws_sig/siws_sig_title_badge/index.tsx b/embed/oko_attached/src/components/modal_variants/sol/message_sig/siws_sig/siws_sig_title_badge/index.tsx
new file mode 100644
index 000000000..847e7227a
--- /dev/null
+++ b/embed/oko_attached/src/components/modal_variants/sol/message_sig/siws_sig/siws_sig_title_badge/index.tsx
@@ -0,0 +1,15 @@
+import { Typography } from "@oko-wallet/oko-common-ui/typography";
+
+import styles from "./styles.module.scss";
+import { SOLANA_LOGO_URL } from "@oko-wallet-attached/constants/urls";
+
+export const SiwsSigTitleBadge = () => {
+  return (
+    <div className={styles.badgeContainer}>
+      <img src={SOLANA_LOGO_URL} alt="Solana" className={styles.solanaLogo} />
+      <Typography size="lg" color="primary" weight="bold">
+        Sign In With Solana
+      </Typography>
+    </div>
+  );
+};
diff --git a/embed/oko_attached/src/components/modal_variants/sol/message_sig/siws_sig/siws_sig_title_badge/styles.module.scss b/embed/oko_attached/src/components/modal_variants/sol/message_sig/siws_sig/siws_sig_title_badge/styles.module.scss
new file mode 100644
index 000000000..5de1c1c32
--- /dev/null
+++ b/embed/oko_attached/src/components/modal_variants/sol/message_sig/siws_sig/siws_sig_title_badge/styles.module.scss
@@ -0,0 +1,14 @@
+.badgeContainer {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  padding: 12px 16px;
+  border-radius: 12px;
+  background-color: var(--bg-secondary);
+}
+
+.solanaLogo {
+  width: 24px;
+  height: 24px;
+}
diff --git a/embed/oko_attached/src/components/modal_variants/sol/siws_message.ts b/embed/oko_attached/src/components/modal_variants/sol/siws_message.ts
new file mode 100644
index 000000000..d2ac32093
--- /dev/null
+++ b/embed/oko_attached/src/components/modal_variants/sol/siws_message.ts
@@ -0,0 +1,213 @@
+/**
+ * SIWS (Sign In With Solana) message parsing and verification
+ * Following EIP-4361 format adapted for Solana
+ * https://eips.ethereum.org/EIPS/eip-4361
+ */
+
+import { verifySignInOrigin } from "@oko-wallet-attached/components/modal_variants/common/sign_in_message";
+
+export interface SiwsMessage {
+  domain: string;
+  address: string;
+  statement?: string;
+  uri?: string;
+  version?: string;
+  chainId?: string;
+  nonce?: string;
+  issuedAt?: string;
+  expirationTime?: string;
+  notBefore?: string;
+  requestId?: string;
+  resources?: string[];
+}
+
+/**
+ * Parse a SIWS message string into a structured object
+ * Message format:
+ * ```
+ * ${domain} wants you to sign in with your Solana account:
+ * ${address}
+ *
+ * ${statement}
+ *
+ * URI: ${uri}
+ * Version: ${version}
+ * Chain ID: ${chainId}
+ * Nonce: ${nonce}
+ * Issued At: ${issuedAt}
+ * Expiration Time: ${expirationTime}
+ * Not Before: ${notBefore}
+ * Request ID: ${requestId}
+ * Resources:
+ * - ${resource1}
+ * - ${resource2}
+ * ```
+ */
+export function parseSiwsMessage(message: string): Partial<SiwsMessage> {
+  const result: Partial<SiwsMessage> = {};
+  const lines = message.split("\n");
+
+  if (lines.length < 2) {
+    return result;
+  }
+
+  // First line: "${domain} wants you to sign in with your Solana account:"
+  const firstLineMatch = lines[0].match(
+    /^(.+?) wants you to sign in with your Solana account:$/,
+  );
+  if (firstLineMatch) {
+    result.domain = firstLineMatch[1];
+  }
+
+  // Second line: address
+  if (lines[1] && lines[1].trim()) {
+    result.address = lines[1].trim();
+  }
+
+  // Find the separator between header and fields
+  let statementLines: string[] = [];
+  let fieldStartIndex = -1;
+
+  for (let i = 2; i < lines.length; i++) {
+    const line = lines[i];
+
+    // Check if this line starts a field
+    if (
+      line.startsWith("URI:") ||
+      line.startsWith("Version:") ||
+      line.startsWith("Chain ID:") ||
+      line.startsWith("Nonce:") ||
+      line.startsWith("Issued At:") ||
+      line.startsWith("Expiration Time:") ||
+      line.startsWith("Not Before:") ||
+      line.startsWith("Request ID:") ||
+      line.startsWith("Resources:")
+    ) {
+      fieldStartIndex = i;
+      break;
+    }
+
+    // Collect statement lines (skip empty lines at the beginning)
+    if (line.trim() || statementLines.length > 0) {
+      statementLines.push(line);
+    }
+  }
+
+  // Clean up statement (remove trailing empty lines)
+  while (
+    statementLines.length > 0 &&
+    !statementLines[statementLines.length - 1].trim()
+  ) {
+    statementLines.pop();
+  }
+  while (statementLines.length > 0 && !statementLines[0].trim()) {
+    statementLines.shift();
+  }
+
+  if (statementLines.length > 0) {
+    result.statement = statementLines.join("\n");
+  }
+
+  // Parse fields
+  if (fieldStartIndex !== -1) {
+    let inResources = false;
+    const resources: string[] = [];
+
+    for (let i = fieldStartIndex; i < lines.length; i++) {
+      const line = lines[i];
+
+      if (line.startsWith("Resources:")) {
+        inResources = true;
+        continue;
+      }
+
+      if (inResources) {
+        if (line.startsWith("- ")) {
+          resources.push(line.slice(2));
+        }
+        continue;
+      }
+
+      const colonIndex = line.indexOf(":");
+      if (colonIndex === -1) continue;
+
+      const key = line.slice(0, colonIndex).trim();
+      const value = line.slice(colonIndex + 1).trim();
+
+      switch (key) {
+        case "URI":
+          result.uri = value;
+          break;
+        case "Version":
+          result.version = value;
+          break;
+        case "Chain ID":
+          result.chainId = value;
+          break;
+        case "Nonce":
+          result.nonce = value;
+          break;
+        case "Issued At":
+          result.issuedAt = value;
+          break;
+        case "Expiration Time":
+          result.expirationTime = value;
+          break;
+        case "Not Before":
+          result.notBefore = value;
+          break;
+        case "Request ID":
+          result.requestId = value;
+          break;
+      }
+    }
+
+    if (resources.length > 0) {
+      result.resources = resources;
+    }
+  }
+
+  return result;
+}
+
+/**
+ * Check if a message is a valid SIWS message
+ * Returns the parsed message if valid, undefined otherwise
+ */
+export function getSiwsMessage(message: Uint8Array | string): SiwsMessage | undefined {
+  let messageStr: string;
+
+  if (message instanceof Uint8Array) {
+    try {
+      messageStr = new TextDecoder().decode(message);
+    } catch {
+      return undefined;
+    }
+  } else {
+    messageStr = message;
+  }
+
+  const siwsMsg = parseSiwsMessage(messageStr);
+
+  // Validate required fields for SIWS
+  // Address should be a valid Solana base58 address (32-44 characters)
+  const isValidSolanaAddress =
+    siwsMsg.address &&
+    /^[1-9A-HJ-NP-Za-km-z]{32,44}$/.test(siwsMsg.address);
+
+  if (siwsMsg.domain && isValidSolanaAddress) {
+    return siwsMsg as SiwsMessage;
+  }
+
+  return undefined;
+}
+
+/**
+ * Verify that the SIWS message matches the origin
+ */
+export function verifySiwsMessage(
+  message: SiwsMessage,
+  origin: string,
+): boolean {
+  return verifySignInOrigin(message.domain, message.uri, origin);
+}