Skip to content

Commit

Permalink
Merge pull request #2504 from Giveth/hotfix-2.14.6
Browse files Browse the repository at this point in the history
Hotfix 2.14.6
  • Loading branch information
MohammadPCh authored Apr 12, 2023
2 parents aca8f2c + 2d96ceb commit 4d65d4a
Show file tree
Hide file tree
Showing 10 changed files with 269 additions and 313 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "givethdapp",
"version": "2.14.4",
"version": "2.14.6",
"private": true,
"scripts": {
"build": "next build",
Expand Down
2 changes: 2 additions & 0 deletions pages/test1.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ const TestRoute = () => {
);
};

//This comment is for testing

const TestIndex = () => {
// const xDaiValues = useSelector(
// (state: RootState) => state.subgraph.xDaiValues,
Expand Down
5 changes: 2 additions & 3 deletions src/components/NetworkLogo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { IconGnosisChain } from '@/components/Icons/GnosisChain';
import { IconPolygon } from '@/components/Icons/Polygon';
import config from '@/configuration';
import { IconOptimism } from './Icons/Optimism';
import { IconCelo } from './Icons/Celo';

const NetworkLogo = (props: { chainId?: number; logoSize?: number }) => {
const { chainId, logoSize } = props;
Expand All @@ -16,8 +15,8 @@ const NetworkLogo = (props: { chainId?: number; logoSize?: number }) => {
return <IconPolygon size={logoSize} />;
} else if (chainId === config.OPTIMISM_NETWORK_NUMBER) {
return <IconOptimism size={logoSize} />;
} else if (chainId === config.CELO_NETWORK_NUMBER) {
return <IconCelo size={logoSize} />;
//TODO:Celo } else if (chainId === config.CELO_NETWORK_NUMBER) {
// return <IconCelo size={logoSize} />;
} else return null;
};

Expand Down
11 changes: 6 additions & 5 deletions src/components/modals/DonateModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const DonateModal: FC<IDonateModalProps> = props => {
const isGnosis = chainId === config.XDAI_NETWORK_NUMBER;
const isPolygon = chainId === config.POLYGON_NETWORK_NUMBER;
const isOptimism = chainId === config.OPTIMISM_NETWORK_NUMBER;
const isCelo = chainId === config.CELO_NETWORK_NUMBER;
//TODO:Celo const isCelo = chainId === config.CELO_NETWORK_NUMBER;

const [donating, setDonating] = useState(false);
const [firstDonationSaved, setFirstDonationSaved] = useState(false);
Expand Down Expand Up @@ -195,7 +195,8 @@ const DonateModal: FC<IDonateModalProps> = props => {
// Coingecko doesn't have these tokens in Gnosis Chain, so fetching price from ethereum
if (
// TODO:Optimism (isGnosis || isPolygon || isCelo || isOptimism) &&
(isGnosis || isPolygon || isCelo) &&
//TODO:Celo (isGnosis || isPolygon || isCelo) &&
(isGnosis || isPolygon) &&
token.mainnetAddress
) {
tokenAddress = token.mainnetAddress || '';
Expand All @@ -205,9 +206,9 @@ const DonateModal: FC<IDonateModalProps> = props => {
? config.MAINNET_NETWORK_NUMBER
: isGnosis
? config.XDAI_NETWORK_NUMBER
: isCelo
? config.CELO_NETWORK_NUMBER
: config.POLYGON_NETWORK_NUMBER;
: //TODO:Celo : isCelo
// ? config.CELO_NETWORK_NUMBER
config.POLYGON_NETWORK_NUMBER;
// TODO:Optimism : isPolygon
// ? config.POLYGON_NETWORK_NUMBER
// : config.OPTIMISM_NETWORK_NUMBER;
Expand Down
Loading

1 comment on commit 4d65d4a

@vercel
Copy link

@vercel vercel bot commented on 4d65d4a Apr 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

giveth-dapps-v2 – ./

giveth-dapps-v2-givethio.vercel.app
giveth.io
giveth-dapps-v2-git-main-givethio.vercel.app
www.giveth.io

Please sign in to comment.