Merge remote-tracking branch 'origin/master' into develop

Sifchain · Apr 28, 2023 · a6cfeca · a6cfeca
2 parents 4ca27ae + 13204e5
commit a6cfeca
Show file tree

Hide file tree

Showing 5 changed files with 829 additions and 5 deletions.
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "2.14.10",
+  "version": "2.14.12",
   "private": true,
   "scripts": {
     "bump": "bump patch --tag --commit 'testnet release '",

diff --git a/app/src/store/modules/flags.ts b/app/src/store/modules/flags.ts
@@ -70,6 +70,7 @@ export const flagsStore = Vuextra.createStore({
     remoteFlags: {
       ASYMMETRIC_POOLING: false,
       MARGIN: false,
+      DISABLE_ETH_BRIDGE_EXPORT: false,
       DISABLE_ETH_BRIDGE: false,
       DISABLE_ATOM_POOL: false,
     },

diff --git a/app/src/views/BalancePage/BalanceRow.tsx b/app/src/views/BalancePage/BalanceRow.tsx
@@ -17,6 +17,8 @@ import { getImportLocation } from "./Import/useImportData";
 
 const ETH_MERGE_DISCLAIMER =
   "All imports/exports of ERC-20 tokens and ETH are currently unavailable.";
+const ETH_BRIDGE_EXPORT_DISCLAIMER =
+  "At the moment, exporting ERC-20 tokens and ETH is not possible. However, you can withdraw your funds by exchanging them for an IBC token and then exporting them through IBC.";
 
 export default defineComponent({
   name: "BalanceRow",
@@ -67,6 +69,12 @@ export default defineComponent({
         props.tokenItem.asset.homeNetwork === "ethereum",
     );
 
+    const isEthBridgeExportDisabled = computed(
+      () =>
+        flagsStore.state.remoteFlags.DISABLE_ETH_BRIDGE_EXPORT &&
+        props.tokenItem.asset.homeNetwork === "ethereum",
+    );
+
     const importItem = computed(() => ({
       tag: RouterLink,
       icon: "interactive/arrow-down",
@@ -118,13 +126,19 @@ export default defineComponent({
           ]
         : [
             importItem.value,
-            hasNoBalance.value || isEthBridgeDisabled.value
+            hasNoBalance.value ||
+            isEthBridgeDisabled.value ||
+            isEthBridgeExportDisabled.value
               ? {
                   tag: "button",
                   icon: "interactive/arrow-up",
                   name: "Export",
                   visible: true,
-                  help: isEthBridgeDisabled.value ? ETH_MERGE_DISCLAIMER : null,
+                  help: isEthBridgeExportDisabled.value
+                    ? ETH_BRIDGE_EXPORT_DISCLAIMER
+                    : isEthBridgeDisabled.value
+                    ? ETH_MERGE_DISCLAIMER
+                    : null,
                   props: { disabled: true, class: "" },
                 }
               : {