Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

9 changes: 0 additions & 9 deletions packages/eco-data-server/src/apis/treasury/polkadot/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,13 @@ const {
loansPendulumDotBalance,
loansHydrationDotBalance,
} = require("./loans");
const {
getAmbassadorTreasuryOnAssetHub,
} = require("./ambassadorTreasuryOnAssetHub");

function calcTotalBalance({
dotTreasuryBalanceOnRelayChain,
usdtTreasuryBalanceOnRelayChain,
usdcTreasuryBalanceOnRelayChain,
bountyTreasuryOnRelay,
fellowshipTreasuryDotOnAssetHub,
fellowshipSalaryUsdtBalance,
ambassadorTreasuryUsdtBalance,
dotTreasuryBalanceOnAssetHub,
usdtTreasuryBalanceOnAssetHub,
usdcTreasuryBalanceOnAssetHub,
Expand Down Expand Up @@ -81,7 +76,6 @@ function calcTotalBalance({
const usdt = new BigNumber(fellowshipSalaryUsdtBalance?.balance || 0)
.plus(usdtTreasuryBalanceOnAssetHub?.balance || 0)
.plus(usdtTreasuryBalanceOnRelayChain?.balance || 0)
.plus(ambassadorTreasuryUsdtBalance?.balance || 0)
.plus(getTotal(hydrationAccount1Usdt))
.plus(getTotal(hydrationAccount2Usdt))
.plus(getTotal(hydrationAccount4Usdt))
Expand Down Expand Up @@ -118,8 +112,6 @@ async function getPolkadotTreasuryData() {

const fellowshipSalaryUsdtBalance = await getFellowshipSalaryUsdtOnAssetHub();

const ambassadorTreasuryUsdtBalance = await getAmbassadorTreasuryOnAssetHub();

const {
dotTreasuryBalanceOnAssetHub,
usdtTreasuryBalanceOnAssetHub,
Expand All @@ -141,7 +133,6 @@ async function getPolkadotTreasuryData() {
bountyTreasuryOnRelay,
fellowshipTreasuryDotOnAssetHub,
fellowshipSalaryUsdtBalance,
ambassadorTreasuryUsdtBalance,
dotTreasuryBalanceOnAssetHub,
usdtTreasuryBalanceOnAssetHub,
usdcTreasuryBalanceOnAssetHub,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ const {
const {
getFellowshipSalaryUsdtOnAssetHubFromApi,
} = require("../../apis/treasury/polkadot/fellowshipSalaryOnAssetHub");
const {
getAmbassadorTreasuryOnAssetHubFromApi,
} = require("../../apis/treasury/polkadot/ambassadorTreasuryOnAssetHub");
const {
getTreasuryOnAssetHubFromApi,
} = require("../../apis/treasury/polkadot/treasuryOnAssetHub");
Expand Down Expand Up @@ -75,9 +72,6 @@ async function getPolkadotAssetHubTreasuries(api, daysAgo) {
const fellowshipSalaryUsdtBalance =
await getFellowshipSalaryUsdtOnAssetHubFromApi(blockApi);

const ambassadorTreasuryUsdtBalance =
await getAmbassadorTreasuryOnAssetHubFromApi(blockApi);

const {
dotTreasuryBalanceOnAssetHub,
usdtTreasuryBalanceOnAssetHub,
Expand All @@ -89,7 +83,6 @@ async function getPolkadotAssetHubTreasuries(api, daysAgo) {
return {
fellowshipTreasuryDotOnAssetHub,
fellowshipSalaryUsdtBalance,
ambassadorTreasuryUsdtBalance,
dotTreasuryBalanceOnAssetHub,
usdtTreasuryBalanceOnAssetHub,
usdcTreasuryBalanceOnAssetHub,
Expand Down
3 changes: 0 additions & 3 deletions site/src/constants/statemint.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ export const STATEMINT_FELLOWSHIP_SALARY_ACCOUNT =
export const STATEMINT_FELLOWSHIP_TREASURY_ACCOUNT =
"16VcQSRcMFy6ZHVjBvosKmo7FKqTb8ZATChDYo8ibutzLnos";

export const STATEMINT_AMBASSADOR_TREASURY_ACCOUNT =
"13wa8ddUNUhXnGeTrjYH8hYXF2jNdCJvgcADJakNvtNdGozX";

export const STATEMINT_ASSETS = [
{
id: 1984,
Expand Down
13 changes: 1 addition & 12 deletions site/src/context/PolkadotTreasury.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { useQueryAssetHubTreasuryFree } from "../hooks/treasury/useQueryAssetHub
import {
STATEMINT_FELLOWSHIP_TREASURY_ACCOUNT,
STATEMINT_FELLOWSHIP_SALARY_ACCOUNT,
STATEMINT_AMBASSADOR_TREASURY_ACCOUNT,
} from "../constants/statemint";
import {
useLoansBifrostDotBalance,
Expand Down Expand Up @@ -81,12 +80,6 @@ export default function PolkadotTreasuryProvider({ children }) {
isLoading: isFellowshipTreasuryDotLoading,
} = useQueryAssetHubTreasuryFree(STATEMINT_FELLOWSHIP_TREASURY_ACCOUNT);

const { balance: ambassadorUSDtBalance, isLoading: isAmbassadorUSDtLoading } =
useQueryAccountBalanceBySymbol(
"USDt",
STATEMINT_AMBASSADOR_TREASURY_ACCOUNT,
);

const {
balance: loansBifrostDotBalance,
isLoading: isLoansBifrostDotLoading,
Expand Down Expand Up @@ -126,7 +119,6 @@ export default function PolkadotTreasuryProvider({ children }) {
assetHubUSDtBalance || 0,
hydrationUSDtBalance || 0,
fellowshipSalaryUSDtBalance || 0,
ambassadorUSDtBalance || 0,
).toString(),
USDt.decimals,
);
Expand Down Expand Up @@ -167,8 +159,7 @@ export default function PolkadotTreasuryProvider({ children }) {
isUsdtBalanceLoadingOnRelayChain ||
isAssetHubUSDtLoading ||
isHydrationLoading ||
isFellowshipSalaryUSDtLoading ||
isAmbassadorUSDtLoading;
isFellowshipSalaryUSDtLoading;

const isTotalUSDCLoading =
isUsdcBalanceLoadingOnRelayChain ||
Expand Down Expand Up @@ -202,8 +193,6 @@ export default function PolkadotTreasuryProvider({ children }) {
isHydrationLoading,
fellowshipSalaryUSDtBalance,
isFellowshipSalaryUSDtLoading,
ambassadorUSDtBalance,
isAmbassadorUSDtLoading,
fellowshipTreasuryDotBalance,
isFellowshipTreasuryDotLoading,
loansBifrostDotBalance,
Expand Down
46 changes: 0 additions & 46 deletions site/src/pages/Overview/polkadot/treasuryDetail/ambassador.jsx

This file was deleted.

2 changes: 0 additions & 2 deletions site/src/pages/Overview/polkadot/treasuryDetail/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { mdcss, smcss } from "../../../../styles/responsive";
import TreasuryDetailLoans from "./loans";
import TreasuryDetailAssets from "./assets";
import TreasuryDetailMythToken from "./mythToken";
import TreasuryDetailAmbassador from "./ambassador";

const Wrapper = styled(Card)`
padding: 24px;
Expand All @@ -27,7 +26,6 @@ export default function OverviewTreasuryDetail() {
<TreasuryDetailAssets />
<TreasuryDetailBounties />
<TreasuryDetailFellowship />
<TreasuryDetailAmbassador />
<TreasuryDetailLoans />
<TreasuryDetailHydration />
<TreasuryDetailMythToken />
Expand Down