Merge branch 'main' into hidotmatrix/fix/newDesign

# Conflicts: # src/old_components/jay-test.tsx
ringecosystem · Aug 8, 2024 · 7cfdac6 · 7cfdac6
2 parents 5d0061e + 340e2e0
commit 7cfdac6
Show file tree

Hide file tree

Showing 9 changed files with 5,582 additions and 1,012 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -22,7 +22,7 @@ jobs:
           vercel_token: ${{ secrets.VERCEL_TOKEN }}
           vercel_group: itering
           preview_output: true
-          alias_domain: "crosschain-dev"
+          alias_domain: "paralink-dev"
           project_name: "crosschain-ui"
           script_run: false
           dist_path: .

diff --git a/.github/workflows/deploy-stg.yml b/.github/workflows/deploy-stg.yml
@@ -23,7 +23,7 @@ jobs:
           vercel_token: ${{ secrets.VERCEL_TOKEN }}
           vercel_group: itering
           preview_output: true
-          alias_domain: "crosschain-stg"
+          alias_domain: "paralink-stg"
           project_name: "crosschain-ui"
           script_run: false
           dist_path: .

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@floating-ui/react": "^0.26.1",
-    "@polkadot/api": "^10.10.1",
+    "@polkadot/api": "^12.3.1",
     "@polkadot/react-identicon": "^3.6.3",
     "@rainbow-me/rainbowkit": "^1.1.3",
     "@talismn/connect-wallets": "^1.2.3",

diff --git a/src/config/chains/hydradx-chain.ts b/src/config/chains/hydradx-chain.ts
@@ -72,6 +72,7 @@ export const hydradxChain: ChainConfig = {
   /**
    * Substrate
    */
-  endpoint: "wss://rpc.hydradx.cloud",
+  // endpoint: "wss://rpc.hydradx.cloud",
+  endpoint: "wss://hydradx-rpc.dwellir.com",
   parachainId: ParachainID.HYDRADX,
 };
diff --git a/src/hooks/use-api.ts b/src/hooks/use-api.ts
@@ -12,6 +12,7 @@ export function useApi(chain: ChainConfig) {
       setApi(_api);
     };
     const failedListener = () => {
+      console.error(new Error(`API has been disconnected from the endpoint(${chain.endpoint})`));
       setApi(undefined);
     };
 

diff --git a/src/libs/bridge/base.ts b/src/libs/bridge/base.ts
@@ -1,3 +1,6 @@
+import "@polkadot/api-augment";
+import "@polkadot/types-augment";
+
 import { Asset, AssetID, ChainConfig, Cross } from "@/types";
 import { ApiPromise } from "@polkadot/api";
 import { BN_ZERO, bnToBn, isFunction } from "@polkadot/util";
@@ -149,7 +152,7 @@ export abstract class BaseBridge {
             ],
           },
         },
-      }) as Promise<Option<u128>>);
+      }) as unknown as Promise<Option<u128>>);
       amount = limitOption.isSome ? limitOption.unwrap().toBn() : amount;
     }
     return { currency: { symbol, name, decimals }, amount };

diff --git a/src/old_components/jay-test.tsx b/src/old_components/jay-test.tsx