diff --git a/src/components/Airdrop/AirdropModal.tsx b/src/components/Airdrop/AirdropModal.tsx index ffc464a4..7208dc88 100644 --- a/src/components/Airdrop/AirdropModal.tsx +++ b/src/components/Airdrop/AirdropModal.tsx @@ -3,7 +3,11 @@ import { AccountInterface } from "starknet"; import { Eligible } from "./getProof"; import { shortInteger } from "../../utils/computations"; -import { CARMINE_STAKING_MONTH, GOVERNANCE_ADDRESS } from "../../constants/amm"; +import { + CARMINE_STAKING_MONTH, + CARMINE_STAKING_YEAR, + GOVERNANCE_ADDRESS, +} from "../../constants/amm"; import GovernanceABI from "../../abi/governance_abi.json"; import { @@ -194,7 +198,7 @@ export const AirdropModal = ({ account, data, open, setOpen }: Props) => { account, data.proof, data.claimable, - CARMINE_STAKING_MONTH, + CARMINE_STAKING_YEAR, setYearState ).then(() => { setMonthState(TransactionState.Initial); @@ -214,7 +218,7 @@ export const AirdropModal = ({ account, data, open, setOpen }: Props) => {

Claim Airdrop

Congratulations! You are eligible to claim{" "} - {shortInteger(data.claimable, 18)} CRM! + {shortInteger(data.claimable, 18)} veCRM!

You can claim and stake for any of these periods:

diff --git a/src/components/CarmineStaking/StakeCRM.tsx b/src/components/CarmineStaking/StakeCRM.tsx index e38ecac3..4f29e310 100644 --- a/src/components/CarmineStaking/StakeCRM.tsx +++ b/src/components/CarmineStaking/StakeCRM.tsx @@ -1,7 +1,11 @@ import { AccountInterface } from "starknet"; import { useState } from "react"; import { longInteger, shortInteger } from "../../utils/computations"; -import { CARMINE_STAKING_MONTH, GOVERNANCE_ADDRESS } from "../../constants/amm"; +import { + CARMINE_STAKING_MONTH, + CARMINE_STAKING_YEAR, + GOVERNANCE_ADDRESS, +} from "../../constants/amm"; import { TransactionState, TxTracking } from "../../types/network"; import { stateToClassName } from "./StakingModal"; import { LoadingAnimation } from "../Loading/Loading"; @@ -102,12 +106,10 @@ export const StakeCrm = ({ account, carmBalance }: Props) => { const handleYear = () => { setMonthState(TransactionState.Processing); setSixMonthsState(TransactionState.Processing); - stake(account, amount, 12 * CARMINE_STAKING_MONTH, setYearState).then( - () => { - setMonthState(TransactionState.Initial); - setSixMonthsState(TransactionState.Initial); - } - ); + stake(account, amount, CARMINE_STAKING_YEAR, setYearState).then(() => { + setMonthState(TransactionState.Initial); + setSixMonthsState(TransactionState.Initial); + }); }; const handleInputChange = (value: string) => { diff --git a/src/components/CarmineStaking/StakingModal.tsx b/src/components/CarmineStaking/StakingModal.tsx index 40cb3e28..223d8423 100644 --- a/src/components/CarmineStaking/StakingModal.tsx +++ b/src/components/CarmineStaking/StakingModal.tsx @@ -2,7 +2,11 @@ import { Dialog } from "@mui/material"; import { AccountInterface } from "starknet"; import { longInteger, shortInteger } from "../../utils/computations"; -import { CARMINE_STAKING_MONTH, GOVERNANCE_ADDRESS } from "../../constants/amm"; +import { + CARMINE_STAKING_MONTH, + CARMINE_STAKING_YEAR, + GOVERNANCE_ADDRESS, +} from "../../constants/amm"; import GovernanceABI from "../../abi/governance_abi.json"; import { addTx, @@ -142,7 +146,7 @@ export const StakingModal = ({ account, amount, open, setOpen }: Props) => { unstakeAndStake( account, selectedAmount, - 12 * CARMINE_STAKING_MONTH, + CARMINE_STAKING_YEAR, setYearState ).then(() => { setMonthState(TransactionState.Initial); diff --git a/src/constants/amm.ts b/src/constants/amm.ts index 4b32a24f..a4ac9cff 100644 --- a/src/constants/amm.ts +++ b/src/constants/amm.ts @@ -76,3 +76,4 @@ export const BASE_MATH_64 = BigInt(2) ** BigInt(64); export const USDC_PRECISSION = 1000; export const CARMINE_STAKING_MONTH = 2629743; +export const CARMINE_STAKING_YEAR = 31536000; diff --git a/src/network/account.ts b/src/network/account.ts index f637c6da..eb68f28e 100644 --- a/src/network/account.ts +++ b/src/network/account.ts @@ -97,7 +97,8 @@ export const connect = ( // do not open the dialog if the page is loading/just loaded return; } - openNetworkMismatchDialog(); + // TODO: fix this + // openNetworkMismatchDialog(); } addWalletEventHandlers(wallet);