From 7b0ee81b5662d7e5b40e94351617d944ae86d146 Mon Sep 17 00:00:00 2001 From: Miguel Mota Date: Wed, 12 Jun 2024 00:07:41 -0700 Subject: [PATCH 1/6] v2: Update .gitignore --- packages/v2-explorer-frontend/.gitignore | 1 + packages/v2-sdk-demo/.gitignore | 1 + packages/v2-sdk/.gitignore | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/v2-explorer-frontend/.gitignore b/packages/v2-explorer-frontend/.gitignore index ef2fe83bc2..2708adc852 100644 --- a/packages/v2-explorer-frontend/.gitignore +++ b/packages/v2-explorer-frontend/.gitignore @@ -18,6 +18,7 @@ .env.development.local .env.test.local .env.production.local +*.env npm-debug.log* yarn-debug.log* diff --git a/packages/v2-sdk-demo/.gitignore b/packages/v2-sdk-demo/.gitignore index 06e60381b9..87bfd178fe 100644 --- a/packages/v2-sdk-demo/.gitignore +++ b/packages/v2-sdk-demo/.gitignore @@ -1,3 +1,4 @@ node_modules dist *.tsbuildinfo +*.env diff --git a/packages/v2-sdk/.gitignore b/packages/v2-sdk/.gitignore index 06e60381b9..87bfd178fe 100644 --- a/packages/v2-sdk/.gitignore +++ b/packages/v2-sdk/.gitignore @@ -1,3 +1,4 @@ node_modules dist *.tsbuildinfo +*.env From f9e9b67a71f684cc0fcb08bd5d53e167e34f36a3 Mon Sep 17 00:00:00 2001 From: Miguel Mota Date: Wed, 12 Jun 2024 12:56:50 -0700 Subject: [PATCH 2/6] frontend: arb merkle rewards --- packages/frontend/src/pages/Rewards/config.ts | 4 ++-- packages/frontend/src/pages/Send/useSend.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/pages/Rewards/config.ts b/packages/frontend/src/pages/Rewards/config.ts index e0aa307091..ea0a66c9eb 100644 --- a/packages/frontend/src/pages/Rewards/config.ts +++ b/packages/frontend/src/pages/Rewards/config.ts @@ -14,11 +14,11 @@ if (isGoerli) { chainId: 10, rewardsContractAddress: '0x45269F59aA76bB491D0Fc4c26F468D8E1EE26b73', merkleBaseUrl: getQueryParam('merkleBaseUrl') ?? 'https://raw.githubusercontent.com/hop-protocol/optimism-refund-merkle-rewards/master' - }/*, { + }, { chainId: 42161, rewardsContractAddress: '', merkleBaseUrl: 'https://raw.githubusercontent.com/hop-protocol/arbitrum-refund-merkle-rewards/master' - }*/] + }] } export { configs } diff --git a/packages/frontend/src/pages/Send/useSend.tsx b/packages/frontend/src/pages/Send/useSend.tsx index 03f29561c8..dc09ca8009 100644 --- a/packages/frontend/src/pages/Send/useSend.tsx +++ b/packages/frontend/src/pages/Send/useSend.tsx @@ -871,7 +871,7 @@ export function useSend(): SendResponseProps { toTokenAmount, ]) - const showFeeRefund = feeRefundEnabled && [ChainSlug.Optimism].includes(toNetwork?.slug as ChainSlug) && !!feeRefund && !!feeRefundUsd && !!feeRefundTokenSymbol + const showFeeRefund = feeRefundEnabled && [ChainSlug.Optimism, ChainSlug.Arbitrum].includes(toNetwork?.slug as ChainSlug) && !!feeRefund && !!feeRefundUsd && !!feeRefundTokenSymbol const feeRefundDisplay = feeRefund && feeRefundUsd && feeRefundTokenSymbol ? `${feeRefund} ($${feeRefundUsd})` : '' const maxButtonFixedAmountToSubtract = fromToken?.symbol === 'ETH' ? relayFeeEth : BigNumber.from(0) From becfbae6a84d53332122bdf81cf759a32ff7d2b2 Mon Sep 17 00:00:00 2001 From: Miguel Mota Date: Wed, 12 Jun 2024 12:57:36 -0700 Subject: [PATCH 3/6] frontend: Bump version --- packages/frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 9a6763d89c..06198f8f68 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -1,6 +1,6 @@ { "name": "@hop-protocol/frontend", - "version": "0.0.13", + "version": "0.0.14", "description": "Hop Protocol Frontend", "author": "Authereum Labs, Inc.", "license": "MIT", From 239866c6bd6256ef24d17ec281d64f17353ba790 Mon Sep 17 00:00:00 2001 From: Miguel Mota Date: Wed, 12 Jun 2024 13:16:40 -0700 Subject: [PATCH 4/6] frontend: Add arb rewards address --- packages/frontend/src/pages/Rewards/Rewards.tsx | 4 ++-- packages/frontend/src/pages/Rewards/config.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/pages/Rewards/Rewards.tsx b/packages/frontend/src/pages/Rewards/Rewards.tsx index ad457f6e83..b1e5ebcedc 100644 --- a/packages/frontend/src/pages/Rewards/Rewards.tsx +++ b/packages/frontend/src/pages/Rewards/Rewards.tsx @@ -7,12 +7,12 @@ import { getChainName } from '#utils/getChainName.js' export function Rewards() { return ( - {configs.map((config: any, i) => { + {configs.map((config: any) => { const chainName = getChainName(config.chainId) return ( Date: Wed, 12 Jun 2024 13:18:34 -0700 Subject: [PATCH 5/6] frontend: rewards: update explorer link --- packages/frontend/src/pages/Rewards/useRewards.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/frontend/src/pages/Rewards/useRewards.tsx b/packages/frontend/src/pages/Rewards/useRewards.tsx index 89d5bacef9..22710800a8 100644 --- a/packages/frontend/src/pages/Rewards/useRewards.tsx +++ b/packages/frontend/src/pages/Rewards/useRewards.tsx @@ -5,6 +5,7 @@ import { BigNumber, Contract, utils } from 'ethers' import { DateTime } from 'luxon' import { ShardedMerkleTree } from './merkle' import { ERC20__factory } from '@hop-protocol/sdk/contracts' +import { ChainSlug } from '@hop-protocol/sdk' import { findNetworkBySlug, networkIdToSlug } from '#utils/networks.js' import { formatError } from '#utils/format.js' import { getProviderByNetworkName } from '#utils/getProvider.js' @@ -391,7 +392,12 @@ export const useRewards = (props: Props) => { } const hasRewards = !!(address && claimableAmount?.gt(0)) - let txHistoryLink = `https://${isGoerli ? 'goerli.explorer' : 'explorer'}.hop.exchange/?startDate=2022-09-23` + // TODO: read from api + let startDate = '2022-09-23' // OP + if (chainSlug === ChainSlug.Arbitrum) { + startDate = '2024-06-12' // ARB + } + let txHistoryLink = `https://${isGoerli ? 'goerli.explorer' : 'explorer'}.hop.exchange/?startDate=${startDate}` if (address) { txHistoryLink += `&account=${address}` } From b388ed491fd3b459057a28c9344b780ebb1cf038 Mon Sep 17 00:00:00 2001 From: Miguel Mota Date: Wed, 12 Jun 2024 13:18:58 -0700 Subject: [PATCH 6/6] frontend: Bump version --- packages/frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 06198f8f68..2192d5e3bd 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -1,6 +1,6 @@ { "name": "@hop-protocol/frontend", - "version": "0.0.14", + "version": "0.0.15", "description": "Hop Protocol Frontend", "author": "Authereum Labs, Inc.", "license": "MIT",