Merge branch 'develop' of github.com:hop-protocol/hop into develop

hop-protocol · Jun 12, 2024 · badd6b8 · badd6b8
2 parents a0bcbb7 + b388ed4
commit badd6b8
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 8 deletions.
diff --git 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.15",
   "description": "Hop Protocol Frontend",
   "author": "Authereum Labs, Inc.",
   "license": "MIT",

diff --git 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 (
     <Box>
-      {configs.map((config: any, i) => {
+      {configs.map((config: any) => {
         const chainName = getChainName(config.chainId)
 
         return (
           <RewardsWidget
-            key={i}
+            key={config.chainId}
             requiredChainId={config.chainId}
             rewardsContractAddress={config.rewardsContractAddress}
             merkleBaseUrl={config.merkleBaseUrl}

diff --git 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: '',
+    rewardsContractAddress: '0xb3c18710fE030a75A3A981a1AbAC0db984e51853',
     merkleBaseUrl: 'https://raw.githubusercontent.com/hop-protocol/arbitrum-refund-merkle-rewards/master'
-  }*/]
+  }]
 }
 
 export { configs }
diff --git 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}`
   }

diff --git 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)
 

diff --git 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
@@ -1,3 +1,4 @@
 node_modules
 dist
 *.tsbuildinfo
+*.env
diff --git a/packages/v2-sdk/.gitignore b/packages/v2-sdk/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 dist
 *.tsbuildinfo
+*.env