Merge branch 'develop' of github.com:oraichain/oraiscan-frontend into…

… refactor/remove-tabs

src/components/Tx/TxData/TxMessage/TxMessageContent.js

@@ -80,6 +80,14 @@ const TxMessageContent = ({
 						</div>
 					</>
 				)}
+				{compareTypeMessage(type, [txTypes.COSMOS_SDK.MSG_UPDATE_ADMIN_CONTRACT, txTypes.COSMOS_SDK_NEW_VERSION.MSG_UPDATE_ADMIN_CONTRACT]) && (
+					<>
+						{getAddressRow("Contract", value?.contract)}
+						{getAddressRow("Sender", value?.sender)}
+						{getAddressRow("New Admin", value?.new_admin)}
+						{getCurrencyRowFromObject("Init funds", value?.init_funds ?? value?.funds)}
+					</>
+				)}
 				{compareTypeMessage(type, [txTypes.COSMOS_SDK.MSG_DELEGATE, txTypes.COSMOS_SDK_NEW_VERSION.MSG_DELEGATE]) && (
 					<>
 						{getAddressRow("Delegator Address", value?.delegator_address, value?.delegator_address_tag)}
@@ -343,7 +351,6 @@ const TxMessageContent = ({
 					</>
 				)}
 
-
 				{/* update 23/3/2023: add IBC progress for MsgExecute */}
 				{compareTypeMessage(type, [txTypes.COSMOS_SDK.EXECUTE_CONTRACT, txTypes.COSMOS_SDK_NEW_VERSION.EXECUTE_CONTRACT]) && (
 					<>
@@ -366,7 +373,6 @@ const TxMessageContent = ({
 					</>
 				)}
 
-
 				{/* add IBC Progress */}
 
 				{compareTypeMessage(type, [txTypes.COSMOS_SDK.MSG_IBC_TRANSFER, txTypes.COSMOS_SDK_NEW_VERSION.MSG_IBC_TRANSFER]) && (
@@ -607,9 +613,7 @@ const TxMessageContent = ({
 						</InfoRow>
 					</>
 				)}
-				{
-					getRawLog(data?.raw_log)
-				}
+				{getRawLog(data?.raw_log)}
 			</div>
 		</>
 	);

src/components/common/StatusBox/StatusBox.js

@@ -115,7 +115,7 @@ const StatusBox = memo(() => {
 				</div>
 			</div>
 			<div className={cx("status-box-item")}>
-				<span className={cx("status-label")}>Community Pool: </span>
+				<span className={cx("status-label")}>DAO Treasury: </span>
 				<span className={cx("status-value")}>{formatOrai(communityPool?.amount, 1000000, 2) + " " + communityPool?.denom.toUpperCase()}</span>
 			</div>
 		</div>

src/constants/txTypes.js

@@ -32,12 +32,13 @@ export default Object.freeze({
 		MSG_CHANNEL_OPEN_INIT: "/ibc.core.channel.v1beta1.MsgChannelOpenInit",
 		MSG_CHANNEL_OPEN_ACK: "/ibc.core.channel.v1beta1.MsgChannelOpenAck",
 		MSG_CHANNEL_ACKNOWLEDGEMENT: "/ibc.core.channel.v1beta1.MsgAcknowledgement",
-		MSG_TIMEOUT: "/ibc.core.channel.v1beta1.MsgTimeout"
+		MSG_UPDATE_ADMIN_CONTRACT: "/cosmwasm.wasm.v1beta1.MsgUpdateAdmin",
+		MSG_TIMEOUT: "/ibc.core.channel.v1beta1.MsgTimeout",
 	},
 
-
 	// MIGRATE VERSION COSMOS
 	COSMOS_SDK_NEW_VERSION: {
+		MSG_UPDATE_ADMIN_CONTRACT: "/cosmwasm.wasm.v1.MsgUpdateAdmin",
 		MSG_CREATE_VALIDATOR: "/cosmos.staking.v1.MsgCreateValidator",
 		MSG_DELEGATE: "/cosmos.staking.v1.MsgDelegate",
 		MSG_UNDELEGATE: "/cosmos.staking.v1.MsgUndelegate",
@@ -69,7 +70,7 @@ export default Object.freeze({
 		MSG_CHANNEL_OPEN_INIT: "/ibc.core.channel.v1.MsgChannelOpenInit",
 		MSG_CHANNEL_OPEN_ACK: "/ibc.core.channel.v1.MsgChannelOpenAck",
 		MSG_CHANNEL_ACKNOWLEDGEMENT: "/ibc.core.channel.v1.MsgAcknowledgement",
-		MSG_TIMEOUT: "/ibc.core.channel.v1.MsgTimeout"
+		MSG_TIMEOUT: "/ibc.core.channel.v1.MsgTimeout",
 	},
 
 	//  DEX

src/containers/AccountList/AccountList.js

@@ -1,6 +1,6 @@
-import React, {memo, useState} from "react";
-import {useGet} from "restful-react";
-import {useTheme} from "@material-ui/core/styles";
+import React, { memo, useState, useEffect } from "react";
+import { useGet } from "restful-react";
+import { useTheme } from "@material-ui/core/styles";
 import useMediaQuery from "@material-ui/core/useMediaQuery";
 import classNames from "classnames/bind";
 import consts from "src/constants/consts";
@@ -10,13 +10,14 @@ import AccountCardList from "src/components/ValidatorList/AccountCardList/Accoun
 import AccountCardListSkeleton from "src/components/ValidatorList/AccountCardList/AccountCardListSkeleton.js";
 import Pagination from "src/components/common/Pagination";
 import NoResult from "src/components/common/NoResult";
-import {useRef} from "react";
-import {Container} from "@material-ui/core";
+import { useRef } from "react";
+import { Container } from "@material-ui/core";
 import TitleWrapper from "src/components/common/TitleWrapper";
 import PageTitle from "src/components/common/PageTitle";
 import StatusBox from "src/components/common/StatusBox";
 import TogglePageBar from "src/components/common/TogglePageBar";
 import styles from "./AccountList.module.scss";
+import axios from "axios";
 
 const cx = classNames.bind(styles);
 
@@ -33,14 +34,37 @@ const AccountList = memo(() => {
 	const basePath = `${consts.API.ACCOUNTS}?limit=${consts.REQUEST.LIMIT}`;
 	const path = `${basePath}&page_id=${pageId}`;
 
-	const {data, loading, error} = useGet({
+	const [listBalance, setListBalance] = useState([]);
+
+	const { data, loading, error } = useGet({
 		path: path,
 	});
 
 	let titleSection;
 	let tableSection;
 	let paginationSection;
 
+	//TODO: hardcode hotfix with balance
+	const fetchBalance = async address => {
+		const resp = await axios.get(`https://api.scan.orai.io/v1/account/coins/${address}`);
+		return resp?.data;
+	};
+
+	const fetchAllBalance = async data => {
+		const bal = data.map(e => {
+			return fetchBalance(e.address);
+		});
+		const balanceList = await Promise.all(bal);
+		setListBalance(balanceList);
+	};
+
+	useEffect(() => {
+		if (data?.data?.length) {
+			fetchAllBalance(data.data);
+		}
+		return () => {};
+	}, [data]);
+
 	titleSection = isLargeScreen ? (
 		<Container fixed>
 			<TitleWrapper>
@@ -65,8 +89,14 @@ const AccountList = memo(() => {
 				totalPagesRef.current = null;
 			}
 
+			const dataWithBalance = data?.data?.map((e, i) => {
+				return {
+					...e,
+					balance: listBalance[i]?.total,
+				};
+			});
 			if (Array.isArray(data?.data) && data.data.length > 0) {
-				tableSection = isLargeScreen ? <AccountTable data={data.data} /> : <AccountCardList data={data.data} />;
+				tableSection = isLargeScreen ? <AccountTable data={dataWithBalance} /> : <AccountCardList data={dataWithBalance} />;
 			} else {
 				tableSection = <NoResult />;
 			}

src/containers/Proposals/constant.js

@@ -1,7 +1,17 @@
 import consts from "src/constants/consts";
 
 const {
-	PROPOSALS_OPTIONS: { UNBONDING_TIME, VOTING_PERIOD, COMMUNITY_TAX, INFLATION_MIN, INFLATION_MAX, TEXT_PROPOSAL, DEPOSIT_PARAMS, UPDATE_ADMIN_PROPOSAL, COMMUNITY_POOL_SPEND_PROPOSAL },
+	PROPOSALS_OPTIONS: {
+		UNBONDING_TIME,
+		VOTING_PERIOD,
+		COMMUNITY_TAX,
+		INFLATION_MIN,
+		INFLATION_MAX,
+		TEXT_PROPOSAL,
+		DEPOSIT_PARAMS,
+		UPDATE_ADMIN_PROPOSAL,
+		COMMUNITY_POOL_SPEND_PROPOSAL,
+	},
 	VOTING_PERIOD_OPTIONS: { VOTING_DAY, VOTING_TIME },
 } = consts;
 
@@ -19,10 +29,9 @@ const defaultValues = {
 	newadmin: "",
 	contract: "",
 	recipient: "",
-	receiveAmount: 10
+	receiveAmount: 10,
 };
 
-
 const fields = [
 	{
 		label: "Unbonding time",
@@ -57,7 +66,7 @@ const fields = [
 		value: UPDATE_ADMIN_PROPOSAL,
 	},
 	{
-		label: "Community Pool Spend Proposal",
+		label: "DAO Treasury Spend Proposal",
 		value: COMMUNITY_POOL_SPEND_PROPOSAL,
 	},
 ];
@@ -73,8 +82,4 @@ const votingFields = [
 	},
 ];
 
-export {
-    defaultValues,
-    fields,
-    votingFields
-}
+export { defaultValues, fields, votingFields };

yarn.lock

@@ -10675,11 +10675,6 @@ immer@^8.0.1:
   resolved "https://registry.yarnpkg.com/immer/-/immer-8.0.4.tgz#3a21605a4e2dded852fb2afd208ad50969737b7a"
   integrity sha512-jMfL18P+/6P6epANRvRk6q8t+3gGhqsJ9EuJ25AXE+9bNTYtssvzeYbEd0mXRYWCmmXSIbnlpz6vd6iJlmGGGQ==
 
-immer@^9.0.21:
-  version "9.0.21"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176"
-  integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==
-
 immer@^9.0.7:
   version "9.0.15"
   resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.15.tgz#0b9169e5b1d22137aba7d43f8a81a495dd1b62dc"
@@ -17358,25 +17353,13 @@ redux-persist@^6.0.0:
   resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-6.0.0.tgz#b4d2972f9859597c130d40d4b146fecdab51b3a8"
   integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ==
 
-redux-thunk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b"
-  integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==
-
 redux@^4.0.0, redux@^4.0.5:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
   integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
   dependencies:
     "@babel/runtime" "^7.9.2"
 
-redux@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
-  integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-
 reflect-metadata@^0.1.13:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
@@ -17598,11 +17581,6 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
-reselect@^4.1.8:
-  version "4.1.8"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
-  integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==
-
 resize-observer-polyfill@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"