Skip to content

Commit

Permalink
Merge pull request #2509 from Giveth/hotfix-2.14.7
Browse files Browse the repository at this point in the history 
Hotfix 2.14.7
  • Loading branch information
@MohammadPCh
MohammadPCh authored Apr 12, 2023
2 parents 4d65d4a + 77746f0 commit ee5e8b5
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "givethdapp",
"version": "2.14.6",
"version": "2.14.7",
"private": true,
"scripts": {
"build": "next build",
Expand Down
2 changes: 1 addition & 1 deletion src/components/GIVeconomyPages/GIVstream.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ export const GIVstreamHistory: FC = () => {
<TxHash
as='a'
size='Big'
href={`${config.NETWORKS_CONFIG[chainId]?.blockExplorerUrls}/tx/${tokenAllocation.txHash}`}
href={`${config.NETWORKS_CONFIG[chainId]?.blockExplorerUrls}tx/${tokenAllocation.txHash}`}
target='_blank'
>
{shortenAddress(
Expand Down
6 changes: 3 additions & 3 deletions src/components/modals/ConfirmSubmit.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const SubmittedInnerModal: FC<IConfirmSubmitProps> = ({
href={`${
config.NETWORKS_CONFIG[chainId!]?.blockExplorerUrls
}
/tx/${txHash}`}
tx/${txHash}`}
target='_blank'
size='Big'
>
Expand Down Expand Up @@ -97,7 +97,7 @@ export const ConfirmedInnerModal: FC<IConfirmSubmitProps> = ({
<BlockExplorerLink
as='a'
href={`${config.NETWORKS_CONFIG[chainId!]?.blockExplorerUrls}
/tx/${txHash}`}
tx/${txHash}`}
target='_blank'
size='Big'
>
Expand Down Expand Up @@ -136,7 +136,7 @@ export const ErrorInnerModal: FC<IErrorProps> = ({
href={`${
config.NETWORKS_CONFIG[chainId!]?.blockExplorerUrls
}
/tx/${txHash}`}
tx/${txHash}`}
target='_blank'
size='Big'
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/modals/StakeLock/StakeGIV.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ const StakeGIVInnerModal: FC<IStakeModalProps> = ({
linkType='texty'
size='small'
icon={<IconExternalLink size={16} />}
href={`${config.XDAI_CONFIG.blockExplorerUrls}/tx/${txHash}`}
href={`${config.XDAI_CONFIG.blockExplorerUrls}tx/${txHash}`}
target='_blank'
/>
</BriefContainer>
Expand Down
6 changes: 3 additions & 3 deletions src/components/toasts/claim.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import toast from 'react-hot-toast';
import { networksParams } from '@/helpers/blockchain';

export function showPendingClaim(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.success(
<span>
Expand Down Expand Up @@ -40,7 +40,7 @@ export function wrongWallet(address: string): void {
}

export function showFailedClaim(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.error(
<span>
Expand All @@ -59,7 +59,7 @@ export function showFailedClaim(network: number, txHash: string): void {
}

export function showConfirmedClaim(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.success(
<span>
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/nft/mint/NFTMintIndex.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export const NFTMintIndex = () => {
<ButtonLink
linkType='texty'
label='View transaction on etherscan'
href={`${config.MAINNET_CONFIG.blockExplorerUrls}/tx/${txHash}`}
href={`${config.MAINNET_CONFIG.blockExplorerUrls}tx/${txHash}`}
/>
<MintAgainButton
label={formatMessage({
Expand Down
28 changes: 14 additions & 14 deletions src/helpers/blockchain.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export const networksParams: {
symbol: 'ETH', // 2-6 characters long
decimals: 18,
},
blockExplorerUrls: ['https://etherscan.io'],
rpcUrls: ['https://eth.llamarpc.com', 'https://mainnet.infura.io/v3/'],
blockExplorerUrls: ['https://etherscan.io/'],
rpcUrls: ['https://eth.llamarpc.com/', 'https://mainnet.infura.io/v3/'],
},
100: {
chainId: '0x64',
Expand All @@ -23,7 +23,7 @@ export const networksParams: {
decimals: 18,
},
rpcUrls: ['https://rpc.gnosischain.com/'],
blockExplorerUrls: ['https://gnosisscan.io'],
blockExplorerUrls: ['https://gnosisscan.io/'],
},
3: {
chainId: '0x3',
Expand All @@ -33,7 +33,7 @@ export const networksParams: {
symbol: 'ETH',
decimals: 18,
},
blockExplorerUrls: ['https://ropsten.etherscan.io'],
blockExplorerUrls: ['https://ropsten.etherscan.io/'],
rpcUrls: ['https://ropsten.infura.io/v3/'],
},
4: {
Expand All @@ -44,7 +44,7 @@ export const networksParams: {
symbol: 'ETH',
decimals: 18,
},
blockExplorerUrls: ['https://rinkeby.etherscan.io'],
blockExplorerUrls: ['https://rinkeby.etherscan.io/'],
rpcUrls: ['https://rinkeby.infura.io/v3/'],
},
5: {
Expand All @@ -55,7 +55,7 @@ export const networksParams: {
symbol: 'ETH',
decimals: 18,
},
blockExplorerUrls: ['https://goerli.etherscan.io'],
blockExplorerUrls: ['https://goerli.etherscan.io/'],
rpcUrls: ['https://goerli.infura.io/v3/'],
},
10: {
Expand All @@ -67,7 +67,7 @@ export const networksParams: {
decimals: 18,
},
blockExplorerUrls: ['https://optimistic.etherscan.io/'],
rpcUrls: ['https://mainnet.optimism.io'],
rpcUrls: ['https://mainnet.optimism.io/'],
},
42: {
chainId: '0x2A',
Expand All @@ -77,19 +77,19 @@ export const networksParams: {
symbol: 'ETH',
decimals: 18,
},
blockExplorerUrls: ['https://kovan.etherscan.io'],
blockExplorerUrls: ['https://kovan.etherscan.io/'],
rpcUrls: ['https://kovan.infura.io/v3/'],
},
137: {
chainId: '0x89',
chainName: 'Polygon Mainnet',
nativeCurrency: {
name: 'Matic',
name: 'MATIC',
symbol: 'MATIC',
decimals: 18,
},
blockExplorerUrls: ['https://polygonscan.com'],
rpcUrls: ['https://polygon-rpc.com'],
blockExplorerUrls: ['https://polygonscan.com/'],
rpcUrls: ['https://polygon-rpc.com/'],
},
42220: {
chainId: '0xa4ec',
Expand All @@ -99,8 +99,8 @@ export const networksParams: {
symbol: 'CELO',
decimals: 18,
},
blockExplorerUrls: ['https://celoscan.io'],
rpcUrls: ['https://forno.celo.org'],
blockExplorerUrls: ['https://celoscan.io/'],
rpcUrls: ['https://forno.celo.org/'],
},
44787: {
chainId: '0xaef3',
Expand All @@ -110,7 +110,7 @@ export const networksParams: {
symbol: 'CELO',
decimals: 18,
},
rpcUrls: ['https://alfajores-forno.celo-testnet.org'],
rpcUrls: ['https://alfajores-forno.celo-testnet.org/'],
blockExplorerUrls: ['https://alfajores-blockscout.celo-testnet.org/'],
iconUrls: ['future'],
},
Expand Down
2 changes: 1 addition & 1 deletion src/lib/helpers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const thousandsSeparator = (x?: string | number): string | undefined => {

export const formatTxLink = (networkId?: number, txHash?: string) => {
if (!networkId || !txHash || !networksParams[networkId]) return '';
return `${networksParams[networkId].blockExplorerUrls[0]}/tx/${txHash}`;
return `${networksParams[networkId].blockExplorerUrls[0]}tx/${txHash}`;
};

export function formatWalletLink(chainId?: number, address?: string) {
Expand Down
6 changes: 3 additions & 3 deletions src/lib/notifications/claim.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import toast from 'react-hot-toast';
import { networksParams } from '@/helpers/blockchain';

export function showPendingClaim(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.success(
<span>
Expand All @@ -21,7 +21,7 @@ export function showPendingClaim(network: number, txHash: string): void {
}

export function showFailedClaim(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.error(
<span>
Expand All @@ -40,7 +40,7 @@ export function showFailedClaim(network: number, txHash: string): void {
}

export function showConfirmedClaim(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.success(
<span>
Expand Down
6 changes: 3 additions & 3 deletions src/lib/notifications/drop.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export function showCorrectAnswer(): void {
}

export function showPendingRequest(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.success(
<span>
Expand All @@ -26,7 +26,7 @@ export function showPendingRequest(network: number, txHash: string): void {
}

export function showFailedRequest(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.error(
<span>
Expand All @@ -45,7 +45,7 @@ export function showFailedRequest(network: number, txHash: string): void {
}

export function showConfirmedRequest(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

if (network === config.MAINNET_NETWORK_NUMBER) {
toast.success(
Expand Down
6 changes: 3 additions & 3 deletions src/lib/notifications/harvest.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import toast from 'react-hot-toast';
import { networksParams } from '@/helpers/blockchain';

export function showPendingHarvest(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.success(
<span>
Expand All @@ -21,7 +21,7 @@ export function showPendingHarvest(network: number, txHash: string): void {
}

export function showFailedHarvest(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.error(
<span>
Expand All @@ -40,7 +40,7 @@ export function showFailedHarvest(network: number, txHash: string): void {
}

export function showConfirmedHarvest(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.success(
<span>
Expand Down
12 changes: 6 additions & 6 deletions src/lib/notifications/stake.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export function showPendingStake(
network: number,
txHash: string,
): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.success(
<span>
Expand All @@ -26,7 +26,7 @@ export function showPendingStake(
}

export function showPendingApproval(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.success(
<span>
Expand All @@ -45,7 +45,7 @@ export function showPendingApproval(network: number, txHash: string): void {
}

export function showFailedStake(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.error(
<span>
Expand All @@ -64,7 +64,7 @@ export function showFailedStake(network: number, txHash: string): void {
}

export function showConfirmedStake(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.success(
<span>
Expand All @@ -83,7 +83,7 @@ export function showConfirmedStake(network: number, txHash: string): void {
}

export function showFailedApproval(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.error(
<span>
Expand All @@ -102,7 +102,7 @@ export function showFailedApproval(network: number, txHash: string): void {
}

export function showConfirmedApproval(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.success(
<span>
Expand Down
6 changes: 3 additions & 3 deletions src/lib/notifications/withdraw.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import toast from 'react-hot-toast';
import { networksParams } from '@/helpers/blockchain';

export function showPendingWithdraw(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.success(
<span>
Expand All @@ -21,7 +21,7 @@ export function showPendingWithdraw(network: number, txHash: string): void {
}

export function showFailedWithdraw(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.error(
<span>
Expand All @@ -40,7 +40,7 @@ export function showFailedWithdraw(network: number, txHash: string): void {
}

export function showConfirmedWithdraw(network: number, txHash: string): void {
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}/tx/${txHash}`;
const transactionExplorer = `${networksParams[network].blockExplorerUrls[0]}tx/${txHash}`;

toast.success(
<span>
Expand Down

1 comment on commit ee5e8b5

@vercel
Copy link

@vercel vercel bot commented on ee5e8b5 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
www.giveth.io
giveth-dapps-v2-git-main-givethio.vercel.app
giveth.io

Please sign in to comment.