Merge pull request #13 from oraichain/staging

Staging

.env.mainnet

@@ -0,0 +1,2 @@
+NEXT_PUBLIC_MIXPANEL_TOKEN=acbafd21a85654933cbb0332c5a6f4f8
+NEXT_PUBLIC_ENV=mainnet

.env.staging

@@ -0,0 +1,2 @@
+NEXT_PUBLIC_MIXPANEL_TOKEN=''
+NEXT_PUBLIC_ENV='staging

.firebaserc

@@ -7,6 +7,9 @@
       "hosting": {
         "ton-bridge": [
           "ton-bridge"
+        ],
+        "ton-bridge-staging": [
+          "ton-bridge-staging"
         ]
       }
     }

.github/workflows/firebase-staging.yml

@@ -0,0 +1,21 @@
+name: Deploy to Firebase Hosting
+
+on:
+  push:
+    branches: [staging]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  dispatch:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Repository Dispatch
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.PAT }}
+          repository: oraichain/infra
+          event-type: firebase
+          client-payload: '{"ref": "${{ github.ref }}", "repo": "${{ github.repository }}", "node_version": "18", "target": "ton-bridge-staging", "env_file": ".env.staging"}'

components/layout/connectButton/index.tsx

@@ -33,6 +33,7 @@ import classNames from "classnames";
 import { FC, useCallback, useEffect, useRef, useState } from "react";
 import ConnectedInfo from "../connectedInfo";
 import styles from "./index.module.scss";
+import { Environment } from "@/constants/ton";
 
 export type ConnectStatus =
   | "init"
@@ -84,8 +85,8 @@ const ConnectButton: FC<{ fullWidth?: boolean }> = ({ fullWidth }) => {
 
       window.Keplr = new Keplr(walletType);
       setStorageKey("typeWallet", walletType);
-      await initClient();
-      const oraiAddr = await window.Keplr.getKeplrAddr();
+      await initClient(process.env.NEXT_PUBLIC_ENV as Environment);
+      const oraiAddr = await window.Keplr.getKeplrAddr("Oraichain");
       handleSetOraiAddress({ oraiAddress: oraiAddr });
       handleSetOraiWallet({ oraiWallet: walletType });
       setStep(2);

components/page/bridge/components/inputBridge/index.tsx

@@ -5,7 +5,7 @@ import { ArrowDownIcon } from "@/assets/icons/arrow";
 import { SelectOptionIcon } from "@/assets/icons/network";
 import SelectCommon from "@/components/commons/select";
 import { AMOUNT_BALANCE_ENTRIES_UNIVERSAL_SWAP } from "@/constants/config";
-import { TonNetwork } from "@/constants/ton";
+import { Environment } from "@/constants/ton";
 import {
   OraichainTokenList,
   OsmosisTokenList,
@@ -37,7 +37,7 @@ const InputBridge: FC<{
   onChangeAmount?: (amount: number | undefined) => void;
   amount: number;
   token: any;
-  tonNetwork: TonNetwork;
+  tonNetwork: Environment;
   setToken: Dispatch<any>;
   txtSearch: string;
   setTxtSearch: Dispatch<SetStateAction<string>>;
@@ -99,7 +99,7 @@ const InputBridge: FC<{
   }
 
   if (networkFrom === NetworkList["osmosis-1"].id)
-    networkList = OsmosisTokenList;
+    networkList = OsmosisTokenList(tonNetwork);
 
   return (
     <div
@@ -212,8 +212,6 @@ const InputBridge: FC<{
                     className={styles.tokenItem}
                     key={`token-${key}`}
                     onClick={() => {
-                      console.log({ eerererere: e });
-
                       setToken(e);
                       setOpen(false);
                     }}

components/page/bridge/hooks/useGetFee.ts

@@ -1,21 +1,22 @@
-import { TonNetwork } from "@/constants/ton";
-import { network } from "@/constants/networks";
+import { Environment } from "@/constants/ton";
+import { getNetworkConfig } from "@/constants/networks";
 import { TokenType, TonTokenList } from "@/constants/tokens";
 import { useAuthOraiAddress } from "@/stores/authentication/selector";
-import { BigDecimal, toDisplay } from "@oraichain/oraidex-common";
+import { BigDecimal } from "@oraichain/oraidex-common";
 import { TonbridgeBridgeClient } from "@oraichain/tonbridge-contracts-sdk";
 import { useEffect, useState } from "react";
 
 const useGetFee = ({ token }: { token: TokenType }) => {
   const oraiAddress = useAuthOraiAddress();
   const [bridgeFee, setBridgeFee] = useState(0);
   const [tokenFee, setTokenFee] = useState(0);
+  const network = getNetworkConfig(Environment.Mainnet);
 
   useEffect(() => {
     (async () => {
       try {
         if (token) {
-          const tokenInTon = TonTokenList(TonNetwork.Mainnet).find(
+          const tokenInTon = TonTokenList(Environment.Mainnet).find(
             (tk) => tk.coingeckoId === token.coingeckoId
           );
           if (!tokenInTon) {
@@ -56,7 +57,7 @@ const useGetFee = ({ token }: { token: TokenType }) => {
   useEffect(() => {
     (async () => {
       if (token) {
-        const tokenInTon = TonTokenList(TonNetwork.Mainnet).find(
+        const tokenInTon = TonTokenList(Environment.Mainnet).find(
           (tk) => tk.coingeckoId === token.coingeckoId
         );
         if (!tokenInTon) {

components/page/bridge/hooks/useGetStateData.ts

@@ -1,9 +1,12 @@
-import { network } from "@/constants/networks";
+import { getNetworkConfig } from "@/constants/networks";
 import { TokenType } from "@/constants/tokens";
+import { Environment } from "@/constants/ton";
 import { useAuthOraiAddress } from "@/stores/authentication/selector";
 import { TonbridgeBridgeClient } from "@oraichain/tonbridge-contracts-sdk";
 import { useEffect, useState } from "react";
 
+const env = process.env.NEXT_PUBLIC_ENV as Environment;
+
 const useGetStateData = () => {
   const oraiAddress = useAuthOraiAddress();
   const [balances, setBalances] = useState([]);
@@ -12,7 +15,7 @@ const useGetStateData = () => {
     const tonBridgeClient = new TonbridgeBridgeClient(
       window.client,
       oraiAddress,
-      network.CW_TON_BRIDGE
+      getNetworkConfig(env).CW_TON_BRIDGE
     );
 
     const config = await tonBridgeClient.channelStateData();