diff --git a/.gitignore b/.gitignore
index 5f058d1..1dc785a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ npm-debug.log
 .env
 .idea
 .vite
+.playwright-mcp/
diff --git a/env.mainnet b/env.mainnet
index f28885f..fe26a69 100644
--- a/env.mainnet
+++ b/env.mainnet
@@ -1,6 +1,6 @@
-VITE_BLOCKCHAIN_API_URL=https://api.xe.network
-VITE_BRIDGE_WALLET_ADDRESS=xe_A4788d8201Fb879e3b7523a0367401D2a985D42F
-VITE_EXPLORER_URL=https://xe.network
+VITE_BLOCKCHAIN_API_URL=https://blockchain.edge.network
+VITE_BRIDGE_WALLET_ADDRESS=xe_F48AC6bF3C040A7BDC4DE93A2B02AD45b4550333
+VITE_EXPLORER_URL=https://explorer.edge.network
 VITE_GOVERNANCE_URL=https://governance.edge.network
-VITE_INDEX_API_URL=https://index.xe.network
+VITE_INDEX_API_URL=https://index.edge.network
 VITE_IS_TESTNET=false
diff --git a/package.json b/package.json
index 70e6d35..89be3ce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wallet",
-  "version": "1.23.5",
+  "version": "1.23.6",
   "description": "Web wallet for managing $EDGE",
   "private": true,
   "license": "GPL",
diff --git a/src/components/tx/DepositModal.vue b/src/components/tx/DepositModal.vue
index e5460ef..8e0af30 100644
--- a/src/components/tx/DepositModal.vue
+++ b/src/components/tx/DepositModal.vue
@@ -292,7 +292,7 @@ export default {
     }
   },
   computed: {
-    ...mapState(['address']),
+    ...mapState(['address', 'bridgeOnline']),
     browserSupport() {
       return ['brave', 'chrome', 'edge', 'firefox'].includes(detect().name)
     },
@@ -303,6 +303,7 @@ export default {
       return (Math.floor(parseAmount(this.amount) * 1e6) / 1e6)
     },
     canDeposit() {
+      if (!this.bridgeOnline) return false
       if (this.depositInProgress || this.v$.$invalid) return false
       return this.xeAmount > 0
     },
diff --git a/src/components/tx/SwapModal.vue b/src/components/tx/SwapModal.vue
index 264d03c..c179eb6 100644
--- a/src/components/tx/SwapModal.vue
+++ b/src/components/tx/SwapModal.vue
@@ -13,7 +13,7 @@
             <img src="/deposit.svg" alt="Deposit $EDGE onto XE" class="account-panel__swap-img">
           </div>
 
-          <button class="w-full button--outline-success button" @click="openDeposit">
+          <button class="w-full button--outline-success button" :disabled="!bridgeOnline" @click="openDeposit">
             <span class="w-12 button__icon">
               <ArrowNarrowLeftIcon/>
             </span>
@@ -26,7 +26,7 @@
             <p class="mb-25">Withdraw $EDGE from the XE blockchain for use within the Ethereum network.</p>
             <img src="/withdraw.svg" alt="Withdraw $EDGE from XE" class="account-panel__swap-img">
           </div>
-          <button class="w-full button--outline-success button" @click="openWithdraw">
+          <button class="w-full button--outline-success button" :disabled="!bridgeOnline" @click="openWithdraw">
             <span class="w-12 button__icon">
               <ArrowNarrowRightIcon/>
             </span>
@@ -48,7 +48,7 @@
         </div> -->
       </div>
       <div class="pt-8 pb-20 text-center" v-if="!bridgeOnline">
-        <p class="font-bold mb-4">Bridge is currently unavailable, so transactions may be delayed.</p>
+        <p class="font-bold mb-4">The bridge is currently offline. Deposits and withdrawals are temporarily disabled.</p>
         <p>Please check again later or contact support for more information.</p>
       </div>
     </template>
@@ -56,16 +56,15 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
 import Modal from '../Modal.vue'
-import { ArrowNarrowLeftIcon, ArrowNarrowRightIcon, CurrencyDollarIcon } from '@heroicons/vue/outline'
+import { mapState } from 'vuex'
+import { ArrowNarrowLeftIcon, ArrowNarrowRightIcon } from '@heroicons/vue/outline'
 
 export default {
   name: 'SwapModal',
   components: {
     ArrowNarrowLeftIcon,
     ArrowNarrowRightIcon,
-    CurrencyDollarIcon,
     Modal
   },
   props: {
diff --git a/src/components/tx/WithdrawModal.vue b/src/components/tx/WithdrawModal.vue
index 3285689..24c7323 100644
--- a/src/components/tx/WithdrawModal.vue
+++ b/src/components/tx/WithdrawModal.vue
@@ -310,15 +310,15 @@ export default {
     }
   },
   computed: {
-    ...mapState(['address', 'balance', 'nextNonce']),
+    ...mapState(['address', 'balance', 'bridgeOnline', 'nextNonce']),
     amountParsed() {
       return parseAmount(this.amount)
     },
     canReadyWithdraw() {
-      return ![this.v$.recipient, this.v$.amount].map(f => f.$invalid).includes(true) && this.edgeAmount > 0
+      return this.bridgeOnline && ![this.v$.recipient, this.v$.amount].map(f => f.$invalid).includes(true) && this.edgeAmount > 0
     },
     canWithdraw() {
-      return !this.v$.$invalid && this.edgeAmount > 0
+      return this.bridgeOnline && !this.v$.$invalid && this.edgeAmount > 0
     },
     minimumFee() {
       if (isNaN(this.amountParsed)) return NaN