diff --git a/.coderabbit.yaml b/.coderabbit.yaml
new file mode 100644
index 000000000..803c19055
--- /dev/null
+++ b/.coderabbit.yaml
@@ -0,0 +1,104 @@
+language: en-US
+tone_instructions: ""
+early_access: false
+enable_free_tier: true
+reviews:
+  profile: chill
+  request_changes_workflow: true
+  high_level_summary: true
+  high_level_summary_placeholder: "@coderabbitai summary"
+  auto_title_placeholder: "@coderabbitai"
+  review_status: true
+  commit_status: true
+  poem: false
+  collapse_walkthrough: false
+  sequence_diagrams: true
+  changed_files_summary: true
+  labeling_instructions: []
+  path_filters: []
+  path_instructions: []
+  abort_on_close: true
+  auto_review:
+    enabled: true
+    auto_incremental_review: true
+    ignore_title_keywords:
+      - "!CR"
+    drafts: false
+    base_branches:
+      - main
+      - develop
+      - devop/vite-migrate
+  tools:
+    shellcheck:
+      enabled: true
+    ruff:
+      enabled: true
+    markdownlint:
+      enabled: true
+    github-checks:
+      enabled: true
+      timeout_ms: 90000
+    languagetool:
+      enabled: true
+      enabled_only: false
+      level: default
+      enabled_rules: []
+      disabled_rules: []
+      enabled_categories: []
+      disabled_categories: []
+    biome:
+      enabled: true
+    hadolint:
+      enabled: true
+    swiftlint:
+      enabled: true
+    phpstan:
+      enabled: true
+      level: default
+    golangci-lint:
+      enabled: true
+    yamllint:
+      enabled: true
+    gitleaks:
+      enabled: true
+    checkov:
+      enabled: true
+    detekt:
+      enabled: true
+    eslint:
+      enabled: true
+    rubocop:
+      enabled: true
+    buf:
+      enabled: true
+    regal:
+      enabled: true
+    actionlint:
+      enabled: true
+    pmd:
+      enabled: true
+    cppcheck:
+      enabled: true
+    semgrep:
+      enabled: true
+    circleci:
+      enabled: true
+    ast-grep:
+      packages: []
+      rule_dirs: []
+      util_dirs: []
+      essential_rules: true
+chat:
+  auto_reply: true
+knowledge_base:
+  opt_out: false
+  learnings:
+    scope: auto
+  issues:
+    scope: auto
+  jira:
+    project_keys: []
+  linear:
+    team_keys: []
+  pull_requests:
+    scope: auto
diff --git a/packages/extension/src/manifest/manifest.firefox.ts b/packages/extension/src/manifest/manifest.firefox.ts
index 9e3f0c400..9dfca3a33 100644
--- a/packages/extension/src/manifest/manifest.firefox.ts
+++ b/packages/extension/src/manifest/manifest.firefox.ts
@@ -24,7 +24,9 @@ const firefoxManifest = {
       strict_min_version: '100.0',
     },
   },
-  content_security_policy: "script-src 'self' 'unsafe-eval' 'wasm-unsafe-eval'",
+  content_security_policy: {
+    extension_pages: "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'",
+  },
 };
 
 export default defineManifest({
diff --git a/packages/extension/src/ui/action/views/settings/views/settings-general/index.vue b/packages/extension/src/ui/action/views/settings/views/settings-general/index.vue
index 1c81b1beb..330a4c334 100644
--- a/packages/extension/src/ui/action/views/settings/views/settings-general/index.vue
+++ b/packages/extension/src/ui/action/views/settings/views/settings-general/index.vue
@@ -91,22 +91,26 @@ const toggleEthereumDisable = async (isChecked: boolean) => {
     timestamp: new Date().getTime(),
   };
   await settingsState.setEVMSettings(evmSettings);
+  isEthereumDisabled.value = isChecked;
 };
 const togglePjsDisable = async (isChecked: boolean) => {
   const subSettings = await settingsState.getSubstrateSettings();
   subSettings.injectPolkadotjs = !isChecked;
   await settingsState.setSubstrateSettings(subSettings);
+  isPolkadotjsDisabled.value = isChecked;
 };
 const toggleUnisatEnable = async (isChecked: boolean) => {
   const btcSettings = await settingsState.getBtcSettings();
   btcSettings.injectUnisat = isChecked;
   await settingsState.setBtcSettings(btcSettings);
+  isUnisatEnabled.value = isChecked;
 };
 const toggleMetricsEnabled = async (isChecked: boolean) => {
   const enkryptSettings = await settingsState.getEnkryptSettings();
   enkryptSettings.isMetricsEnabled = !isChecked;
   await settingsState.setEnkryptSettings(enkryptSettings);
   optOutofMetrics(isChecked);
+  isMetricsEnabled.value = !isChecked;
 };
 </script>
 
diff --git a/packages/extension/vite.config.ts b/packages/extension/vite.config.ts
index 2ac6e8bdb..3ac6ee12b 100644
--- a/packages/extension/vite.config.ts
+++ b/packages/extension/vite.config.ts
@@ -33,7 +33,10 @@ export default defineConfig({
     },
   },
   define: {
-    __PREFILL_PASSWORD__: JSON.stringify('test pass'),
+    __PREFILL_PASSWORD__:
+      process.env.NODE_ENV === 'development'
+        ? JSON.stringify('test pass')
+        : JSON.stringify(''),
     __PACKAGE_VERSION__: JSON.stringify(version),
     __IS_DEV__: process.env.NODE_ENV === 'development',
     __IS_FIREFOX__: BROWSER === 'firefox',