diff --git a/package-lock.json b/package-lock.json
index 1a653184..385681ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,18 +10,18 @@
       "dependencies": {
         "@emotion/react": "11.11.1",
         "@types/dom-screen-wake-lock": "1.0.1",
-        "buffer": "^6.0.3",
-        "ethers": "6.6.7",
+        "buffer": "6.0.3",
+        "ethers": "6.7.0",
         "i18next": "23.4.1",
         "jest-environment-jsdom": "29.6.2",
         "react": "18.2.0",
         "react-dom": "18.2.0",
-        "react-i18next": "13.0.2"
+        "react-i18next": "13.0.3"
       },
       "devDependencies": {
         "@brave-intl/skus-sdk": "0.1.3",
         "@types/jest": "29.5.3",
-        "@types/react": "18.2.17",
+        "@types/react": "18.2.18",
         "@types/react-dom": "18.2.7",
         "@typescript-eslint/eslint-plugin": "5.62.0",
         "@typescript-eslint/parser": "5.62.0",
@@ -29,7 +29,7 @@
         "css-loader": "6.8.1",
         "css-minimizer-webpack-plugin": "5.0.1",
         "eslint": "8.46.0",
-        "eslint-config-prettier": "8.9.0",
+        "eslint-config-prettier": "8.10.0",
         "eslint-config-react-app": "7.0.1",
         "html-webpack-plugin": "5.5.3",
         "husky": "8.0.3",
@@ -3035,9 +3035,9 @@
       "dev": true
     },
     "node_modules/@types/react": {
-      "version": "18.2.17",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.17.tgz",
-      "integrity": "sha512-u+e7OlgPPh+aryjOm5UJMX32OvB2E3QASOAqVMY6Ahs90djagxwv2ya0IctglNbNTexC12qCSMZG47KPfy1hAA==",
+      "version": "18.2.18",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.18.tgz",
+      "integrity": "sha512-da4NTSeBv/P34xoZPhtcLkmZuJ+oYaCxHmyHzwaDQo9RQPBeXV+06gEk2FpqEcsX9XrnNLvRpVh6bdavDSjtiQ==",
       "dev": true,
       "dependencies": {
         "@types/prop-types": "*",
@@ -5972,9 +5972,9 @@
       }
     },
     "node_modules/eslint-config-prettier": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.9.0.tgz",
-      "integrity": "sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
+      "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==",
       "dev": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
@@ -6394,9 +6394,9 @@
       }
     },
     "node_modules/ethers": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.6.7.tgz",
-      "integrity": "sha512-1SdT3W5/IPAcx9l5/+9qKRYR/iqVIdNQIct18yeh+XvN+I4RK44mvOsAerMwJYCAwdQfsOgf3OkfozeuMInbtQ==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.7.0.tgz",
+      "integrity": "sha512-pxt5hK82RNwcTX2gOZP81t6qVPVspnkpeivwEgQuK9XUvbNtghBnT8GNIb/gPh+WnVSfi8cXC9XlfT8sqc6D6w==",
       "funding": [
         {
           "type": "individual",
@@ -7629,9 +7629,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz",
-      "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -10648,9 +10648,9 @@
       }
     },
     "node_modules/react-i18next": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-13.0.2.tgz",
-      "integrity": "sha512-NEVxC32v0oR4egwYM0QM0WE93AiJG5r0NTXTL8mhQfAhsMfDS2fSO6jpluyfsfypP988KzUQrAXncspcJ7+GHA==",
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-13.0.3.tgz",
+      "integrity": "sha512-/t4kt4Y2o+21hbvx+o9zpVnmoiud7KLDncyZFGN0U6TGAWYaXdTsp/ytAHFcKKSAODg4noIMaOO3X7bMgCqLHw==",
       "dependencies": {
         "@babel/runtime": "^7.22.5",
         "html-parse-stringify": "^3.0.1"
@@ -10844,11 +10844,11 @@
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
     },
     "node_modules/resolve": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
       "dependencies": {
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -15171,9 +15171,9 @@
       "dev": true
     },
     "@types/react": {
-      "version": "18.2.17",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.17.tgz",
-      "integrity": "sha512-u+e7OlgPPh+aryjOm5UJMX32OvB2E3QASOAqVMY6Ahs90djagxwv2ya0IctglNbNTexC12qCSMZG47KPfy1hAA==",
+      "version": "18.2.18",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.18.tgz",
+      "integrity": "sha512-da4NTSeBv/P34xoZPhtcLkmZuJ+oYaCxHmyHzwaDQo9RQPBeXV+06gEk2FpqEcsX9XrnNLvRpVh6bdavDSjtiQ==",
       "dev": true,
       "requires": {
         "@types/prop-types": "*",
@@ -17324,9 +17324,9 @@
       }
     },
     "eslint-config-prettier": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.9.0.tgz",
-      "integrity": "sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
+      "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==",
       "dev": true,
       "requires": {}
     },
@@ -17616,9 +17616,9 @@
       "dev": true
     },
     "ethers": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.6.7.tgz",
-      "integrity": "sha512-1SdT3W5/IPAcx9l5/+9qKRYR/iqVIdNQIct18yeh+XvN+I4RK44mvOsAerMwJYCAwdQfsOgf3OkfozeuMInbtQ==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.7.0.tgz",
+      "integrity": "sha512-pxt5hK82RNwcTX2gOZP81t6qVPVspnkpeivwEgQuK9XUvbNtghBnT8GNIb/gPh+WnVSfi8cXC9XlfT8sqc6D6w==",
       "requires": {
         "@adraffy/ens-normalize": "1.9.2",
         "@noble/hashes": "1.1.2",
@@ -18518,9 +18518,9 @@
       "dev": true
     },
     "is-core-module": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz",
-      "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "requires": {
         "has": "^1.0.3"
       }
@@ -20667,9 +20667,9 @@
       }
     },
     "react-i18next": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-13.0.2.tgz",
-      "integrity": "sha512-NEVxC32v0oR4egwYM0QM0WE93AiJG5r0NTXTL8mhQfAhsMfDS2fSO6jpluyfsfypP988KzUQrAXncspcJ7+GHA==",
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-13.0.3.tgz",
+      "integrity": "sha512-/t4kt4Y2o+21hbvx+o9zpVnmoiud7KLDncyZFGN0U6TGAWYaXdTsp/ytAHFcKKSAODg4noIMaOO3X7bMgCqLHw==",
       "requires": {
         "@babel/runtime": "^7.22.5",
         "html-parse-stringify": "^3.0.1"
@@ -20817,11 +20817,11 @@
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
     },
     "resolve": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
-      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
       "requires": {
-        "is-core-module": "^2.11.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
diff --git a/package.json b/package.json
index 0463d237..565a6931 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "devDependencies": {
     "@brave-intl/skus-sdk": "0.1.3",
     "@types/jest": "29.5.3",
-    "@types/react": "18.2.17",
+    "@types/react": "18.2.18",
     "@types/react-dom": "18.2.7",
     "@typescript-eslint/eslint-plugin": "5.62.0",
     "@typescript-eslint/parser": "5.62.0",
@@ -32,7 +32,7 @@
     "css-loader": "6.8.1",
     "css-minimizer-webpack-plugin": "5.0.1",
     "eslint": "8.46.0",
-    "eslint-config-prettier": "8.9.0",
+    "eslint-config-prettier": "8.10.0",
     "eslint-config-react-app": "7.0.1",
     "html-webpack-plugin": "5.5.3",
     "husky": "8.0.3",
@@ -54,11 +54,11 @@
     "@emotion/react": "11.11.1",
     "@types/dom-screen-wake-lock": "1.0.1",
     "buffer": "6.0.3",
-    "ethers": "6.6.7",
+    "ethers": "6.7.0",
     "i18next": "23.4.1",
     "jest-environment-jsdom": "29.6.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-i18next": "13.0.2"
+    "react-i18next": "13.0.3"
   }
 }
diff --git a/src/components/WelcomeScreen.tsx b/src/components/WelcomeScreen.tsx
index d4ccc965..eb348aa6 100644
--- a/src/components/WelcomeScreen.tsx
+++ b/src/components/WelcomeScreen.tsx
@@ -1,4 +1,5 @@
 import React, { DispatchWithoutAction } from "react";
+import { css } from "@emotion/react";
 import { useSubscribedStatus } from "../hooks/use-subscribed-status";
 import { Background } from "./Background";
 import { Footer } from "./Footer";
@@ -89,61 +90,63 @@ export const WelcomeScreen: React.FC<Props> = ({
     }
 
     if (isWeb3Call && web3Account === null) {
-      const popupContainerStyle: React.CSSProperties = {
-        position: "fixed",
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-        background: "rgba(0, 0, 0, 0.5)",
-        display: "flex",
-        justifyContent: "center",
-        alignItems: "center",
-        zIndex: 9999,
-      };
-      const popupContentStyle: React.CSSProperties = {
-        background: "white",
-        padding: "20px",
-        borderRadius: "5px",
-        textAlign: "center",
-      };
-
-      const buttonContainerStyle: React.CSSProperties = {
-        marginTop: "20px",
-        display: "flex",
-        justifyContent: "center",
-      };
-
-      const buttonStyle: React.CSSProperties = {
-        margin: "0 10px",
-        padding: "10px 20px",
-        border: "solid 1px #ccc",
-        borderRadius: "10px",
-        backgroundColor: "transparent",
-        color: "black",
-        cursor: "pointer",
-        display: "flex",
-        flexDirection: "column",
-        alignItems: "center",
-        overflow: "hidden",
-        flex: 1,
-      };
-
-      const buttonWrapperStyle: React.CSSProperties = {
-        display: "flex",
-        width: "100%",
-      };
-
-      const logoStyle: React.CSSProperties = {
-        width: "50px",
-        height: "50px",
-        marginBottom: "10px",
-        borderRadius: "50%",
-      };
+      // Define styles using the css prop
+      const popupContainerStyle = css`
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, 0.5);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        z-index: 9999;
+      `;
+
+      const popupContentStyle = css`
+        background: white;
+        padding: 20px;
+        border-radius: 5px;
+        text-align: center;
+      `;
+
+      const buttonContainerStyle = css`
+        margin-top: 20px;
+        display: flex;
+        justify-content: center;
+      `;
+
+      const buttonStyle = css`
+        margin: 0 10px;
+        padding: 10px 20px;
+        border: solid 1px #ccc;
+        border-radius: 10px;
+        background-color: transparent;
+        color: black;
+        cursor: pointer;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        overflow: hidden;
+        flex: 1;
+      `;
+
+      const buttonWrapperStyle = css`
+        display: flex;
+        width: 100%;
+      `;
+
+      const logoStyle = css`
+        width: 50px;
+        height: 50px;
+        margin-bottom: 10px;
+        border-radius: 50%;
+      `;
 
       return (
-        <div style={popupContainerStyle}>
-          <div style={popupContentStyle}>
+        <div css={popupContainerStyle}>
+          <div css={popupContentStyle}>
             <Text css={{ color: "black", display: "block" }} variant="header">
               Web3 Account
             </Text>
@@ -152,23 +155,23 @@ export const WelcomeScreen: React.FC<Props> = ({
               variant="body"
               children={t("web3_account_body")}
             />
-            <div style={buttonContainerStyle}>
-              <div style={buttonWrapperStyle}>
-                <button style={buttonStyle} onClick={onClickEthAccount}>
+            <div css={buttonContainerStyle}>
+              <div css={buttonWrapperStyle}>
+                <button css={buttonStyle} onClick={onClickEthAccount}>
                   <img
                     src={require("../images/ethereum.svg")}
                     alt="Logo"
-                    style={logoStyle}
+                    css={logoStyle}
                   />
                   <Text css={{ color: "black" }} variant="body">
                     Ethereum
                   </Text>
                 </button>
-                <button style={buttonStyle} onClick={onClickSolAccount}>
+                <button css={buttonStyle} onClick={onClickSolAccount}>
                   <img
                     src={require("../images/solana.svg")}
                     alt="Logo"
-                    style={logoStyle}
+                    css={logoStyle}
                   />
                   <Text css={{ color: "black" }} variant="body">
                     Solana
diff --git a/src/components/web3/ExceptionListPanel.tsx b/src/components/web3/ExceptionListPanel.tsx
index c8c5d668..91d864e1 100644
--- a/src/components/web3/ExceptionListPanel.tsx
+++ b/src/components/web3/ExceptionListPanel.tsx
@@ -9,6 +9,7 @@ interface Props {
   setIsExceptionAddressWrong?: (val: boolean) => void;
   children?: ReactNode;
   exceptionList: string[];
+  compareList: string[];
   onChange: Dispatch<string[]>;
 }
 
@@ -19,6 +20,7 @@ export const ExceptionListPanel: React.FC<Props> = ({
   isExceptionAddressWrong,
   setIsExceptionAddressWrong,
   exceptionList,
+  compareList,
   onChange,
 }) => {
   const [inputText, setInputText] = useState("");
@@ -47,7 +49,10 @@ export const ExceptionListPanel: React.FC<Props> = ({
         // Skip empty addresses (remove empty strings from the list)
         return;
       }
-      if (!isValidAddress(address, web3Account)) {
+      if (
+        !isValidAddress(address, web3Account) ||
+        compareList.includes(address)
+      ) {
         flag = 1;
         invalidAddressesList.push(address);
       } else {
@@ -81,62 +86,62 @@ export const ExceptionListPanel: React.FC<Props> = ({
 
   return (
     <div>
-        <div
+      <div
         css={{
-            background: 'rgba(255, 255, 255, 0.24)',
-            backdropFilter: 'blur(8px)',
-            marginTop: '11px',
-            padding: '24px 19px',
-            textAlign: 'left',
+          background: "rgba(255, 255, 255, 0.24)",
+          backdropFilter: "blur(8px)",
+          marginTop: "11px",
+          padding: "24px 19px",
+          textAlign: "left",
         }}
-        >
+      >
         <div
-            css={{
-            display: 'flex',
-            alignItems: 'center',
-            }}
+          css={{
+            display: "flex",
+            alignItems: "center",
+          }}
         >
-            <div css={{ flex: 1 }}>
+          <div css={{ flex: 1 }}>
             <div
-                css={{
+              css={{
                 fontWeight: 500,
-                fontSize: '22px',
-                lineHeight: '32px',
-                }}
+                fontSize: "22px",
+                lineHeight: "32px",
+              }}
             >
-                {header}
+              {header}
             </div>
             <div>{subhead}</div>
-            </div>
+          </div>
         </div>
         <textarea
-            css={{
+          css={{
             fontWeight: 200,
-            fontSize: '15px',
-            lineHeight: '15px',
-            width: '100%',
-            height: 'auto', // Adjust height based on content
-            resize: 'vertical', // Allow vertical resizing if needed
-            marginTop: '3px',
-            borderColor: invalidAddresses.length > 0 ? 'red' : undefined, // Add red border if there are invalid addresses
-            }}
-            placeholder={placeholderText}
-            value={inputText}
-            onChange={handleInputChange}
-            onBlur={validateAddresses}
-            rows={3} // Set the number of visible rows here (adjust as needed)
+            fontSize: "15px",
+            lineHeight: "15px",
+            width: "100%",
+            height: "auto", // Adjust height based on content
+            resize: "vertical", // Allow vertical resizing if needed
+            marginTop: "3px",
+            borderColor: invalidAddresses.length > 0 ? "red" : undefined, // Add red border if there are invalid addresses
+          }}
+          placeholder={placeholderText}
+          value={inputText}
+          onChange={handleInputChange}
+          onBlur={validateAddresses}
+          rows={3} // Set the number of visible rows here (adjust as needed)
         />
+      </div>
+      {invalidAddresses.length > 0 && (
+        <div css={[bodyText, { marginTop: "28px" }]}>
+          {invalidAddresses.length === 1
+            ? "Invalid address:"
+            : "Invalid addresses:"}
+          {invalidAddresses.map((address, index) => (
+            <div key={index}>{address}</div>
+          ))}
         </div>
-        {invalidAddresses.length > 0 && (
-            <div css={[bodyText, { marginTop: "28px" }]}>
-                {invalidAddresses.length === 1
-                ? 'Invalid address:'
-                : 'Invalid addresses:'}
-                {invalidAddresses.map((address, index) => (
-                <div key={index}>{address}</div>
-                ))}
-            </div>
-        )}
+      )}
     </div>
   );
 };
diff --git a/src/components/web3/OptionalSettings.tsx b/src/components/web3/OptionalSettings.tsx
index e7358e1a..0a0ad03e 100644
--- a/src/components/web3/OptionalSettings.tsx
+++ b/src/components/web3/OptionalSettings.tsx
@@ -205,6 +205,7 @@ export const OptionalSettings: React.FC<Props> = ({
             subhead={t("address_exception_subheader")}
             web3Account={web3Account}
             exceptionList={exceptionList}
+            compareList={allowList}
             onChange={(addr) => {
               setExceptionList(addr);
             }}
@@ -220,9 +221,11 @@ export const OptionalSettings: React.FC<Props> = ({
             subhead={t("address_allow_subheader")}
             web3Account={web3Account}
             exceptionList={allowList}
+            compareList={exceptionList}
             onChange={(addr) => {
-              setAllowList(addr);}}
-            isExceptionAddressWrong={isExceptionAddressWrong} 
+              setAllowList(addr);
+            }}
+            isExceptionAddressWrong={isExceptionAddressWrong}
             setIsExceptionAddressWrong={setIsExceptionAddressWrong}
           />
         </React.Fragment>
diff --git a/src/components/web3/PermissionTypeSelector.tsx b/src/components/web3/PermissionTypeSelector.tsx
index f4b99f99..f8006a2d 100644
--- a/src/components/web3/PermissionTypeSelector.tsx
+++ b/src/components/web3/PermissionTypeSelector.tsx
@@ -50,7 +50,7 @@ export const PermissionTypeSelector: React.FC<Props> = ({
         css={[
           styles.base,
           permissionType === "POAP" && styles.selected,
-          web3Account === "SOL" ? disabledButton : null,
+          web3Account === "SOL" && disabledButton,
         ]}
       >
         {t("poap_permission_type")}
@@ -66,8 +66,11 @@ export const PermissionTypeSelector: React.FC<Props> = ({
       </button>
       <button
         onClick={() => setPermissionType("balance")}
-        css={[styles.base, permissionType === "balance" && styles.selected,
-             web3Account === "SOL" ? disabledButton : null]}
+        css={[
+          styles.base,
+          permissionType === "balance" && styles.selected,
+          web3Account === "SOL" && disabledButton,
+        ]}
       >
         {"BAT Gating"}
       </button>
diff --git a/src/components/web3/SolLogin.tsx b/src/components/web3/SolLogin.tsx
index d872922a..4069dcb6 100644
--- a/src/components/web3/SolLogin.tsx
+++ b/src/components/web3/SolLogin.tsx
@@ -19,7 +19,7 @@ export const SolLogin: React.FC<Props> = ({
     try {
       window.braveSolana?.on("!!! accountChanged", () => setNotice(undefined));
     } catch {
-      console.warn("!!! Brave Wallet does not exists");
+      console.warn("!!! Brave Wallet does not exist");
     }
 
     try {
@@ -27,7 +27,7 @@ export const SolLogin: React.FC<Props> = ({
         setNotice(undefined)
       );
     } catch {
-      console.warn("!!! Phantom Wallet does not exists");
+      console.warn("!!! Phantom Wallet does not exist");
     }
   }, []);
 
diff --git a/src/components/web3/StartCall.tsx b/src/components/web3/StartCall.tsx
index 3d85e092..2558cf32 100644
--- a/src/components/web3/StartCall.tsx
+++ b/src/components/web3/StartCall.tsx
@@ -141,6 +141,7 @@ export const StartCall: React.FC<Props> = ({
           Debug Mode
         </label>
       )}
+
       {web3Account === "ETH" ? (
         <Login web3address={web3Address} onAddressSelected={setWeb3Address} />
       ) : (
diff --git a/src/i18n/locales/jp/translation.json b/src/i18n/locales/jp/translation.json
index 811b3947..4fa2e9bc 100644
--- a/src/i18n/locales/jp/translation.json
+++ b/src/i18n/locales/jp/translation.json
@@ -3,6 +3,10 @@
   "avatar_nft_subhead": "Ethereum ERC-721のNFT、Solana MetaplexのNFTが使用可能です。",
   "bat_gating_panel_header": "BATを用いたトークンゲート（入場制限）が適用されます。",
   "bat_gating_panel_subheader": "ウォレットでBATを保有していない場合（0BATの場合）、このコールには参加できません。",
+  "address_exception_header": "アドレス除外リスト",
+  "address_exception_subheader": "このリストに追加されたアドレスのユーザーについてはコールへの参加が許可されません。",
+  "address_allow_header": "アドレス許可リスト",
+  "address_allow_subheader": "このリストに追加されたアドレスのユーザーはコールに参加することができます。",
   "call_permission_type": "通話の許可タイプ:",
   "check_subscription": "サブスクリプションの状態を確認しています...",
   "create_link": "リンクを作成",
diff --git a/src/jitsi/options.ts b/src/jitsi/options.ts
index 0bd16d97..e3fbb903 100644
--- a/src/jitsi/options.ts
+++ b/src/jitsi/options.ts
@@ -182,7 +182,6 @@ export const jitsiOptions = (
   };
 
   const features = jwt_decode(jwt)?.context?.features;
-  features.recording = "true";
   reportAction("features", { features });
 
   Object.entries(features).forEach(([feature, state]) => {