Merge pull request #61 from pnetwork-association/feat/ethPNT-support

feat(ethPNT): support ethPNT

__mocks__/react-web3-settings.js

@@ -9,7 +9,7 @@ export const getWeb3Settings = () => ({
   ultra: 'https://corsproxy.ptokens.io/v1/?apiurl=http://ultra-mainnet-1.ptokens.io:8888',
   arbitrum: 'https://arb1.arbitrum.io/rpc',
   luxochain: 'https://corsproxy.ptokens.io/v1/?apiurl=https://lugano.nodes.luxochain.io',
-  algorand: 'https://algorand-node-1.ptokens.io',
+  algorand: 'https://mainnet-api.algonode.cloud',
   ftm: 'https://rpc.ftm.tools/',
   ore: 'https://ore-node-1.ptokens.io',
   btc: 'https://blockstream.info/api/',

package.json

@@ -1,7 +1,7 @@
 {
   "name": "plain-dapp-update",
   "private": true,
-  "version": "1.18.1",
+  "version": "1.19.0",
   "type": "module",
   "scripts": {
     "dev": "npm run create-version-file && vite",

src/components/organisms/assetInfo/AssetInfo.jsx

@@ -1,14 +1,36 @@
-import React, { useState, useEffect, useCallback } from 'react'
-import styled from 'styled-components'
 import PropTypes from 'prop-types'
+import React, { useState, useEffect, useCallback } from 'react'
 import { Row, Col } from 'react-bootstrap'
 import ReactTooltip from 'react-tooltip'
-import Icon from '../../atoms/icon/Icon'
-import { copyToClipboard } from '../../../utils/utils'
-import { registerToken } from '../../../utils/wallet'
-import { getBase64Image } from '../../../utils/image'
+import styled from 'styled-components'
+
+import { ETHPNT_ON_ETH_MAINNET } from '../../../constants'
 import { useProvider } from '../../../hooks/use-provider'
 import { capitalizeAllLettersExceptFirst } from '../../../utils/capitalize'
+import { getBase64Image } from '../../../utils/image'
+import { copyToClipboard } from '../../../utils/utils'
+import { registerToken } from '../../../utils/wallet'
+import Icon from '../../atoms/icon/Icon'
+
+const InfoEta = styled.div`
+  margin-top: 30px;
+  padding: 20px;
+  margin-bottom: 10px;
+  background: #66b8ff40;
+  border: 0.5px solid ${({ theme }) => theme.blue};
+  border-radius: 10px;
+  color: ${({ theme }) => theme.blue};
+  text-align: center;
+`
+
+const InflationInfo = styled(InfoEta)`
+  width: 100%;
+  margin-top: 10px;
+  margin-bottom: 0px;
+  margin-right: 10px;
+  margin-left: 10px;
+  padding: 5px;
+`
 
 const ContainerAssetInfo = styled(Col)`
   margin-top: 10px;
@@ -120,6 +142,15 @@ const AssetInfo = ({ asset, wallet }) => {
             </Token>
           </ContainerOptions>
         </Row>
+        {asset.id === ETHPNT_ON_ETH_MAINNET ? (
+          <Row>
+            <InflationInfo>
+              ethPNT is an extension of the PNT token with cross-chain functionality, maintaining the same token economy
+              and functionalities as PNT-on-Ethereum. ethPNT grants the same DAO governance power of PNT, inheriting its
+              full value.
+            </InflationInfo>
+          </Row>
+        ) : null}
         <ReactTooltip
           getContent={(_dataTip) =>
             _dataTip === 'Add to MetaMask' || _dataTip === 'Connect MetaMask to add the token'

src/components/organisms/assetListModal/AssetListModal.jsx

@@ -1,9 +1,15 @@
+import PropTypes from 'prop-types'
 import React, { useState, useCallback, useEffect, useMemo, useRef } from 'react'
 import { Col, Row, Spinner } from 'react-bootstrap'
-import PropTypes from 'prop-types'
 import styled from 'styled-components'
+
+import {
+  useAssetsWithouDefault,
+  useSearchAssets,
+  useAssetsGroupedByGivenStrategy,
+  useSortPntInflationToken,
+} from '../../../hooks/use-assets'
 import { getAssetFromSymbol } from '../../../utils/maps'
-import { useAssetsWithouDefault, useSearchAssets, useAssetsGroupedByGivenStrategy } from '../../../hooks/use-assets'
 import Icon from '../../atoms/icon/Icon'
 import Modal from '../../molecules/modal/Modal'
 
@@ -166,7 +172,8 @@ const StyledSpinner = styled(Spinner)`
 const AssetListModal = ({ show: showModal, title, onClose, onSelect, assets: _assets, defaultAssets }) => {
   const [assetsWithoutDefault] = useAssetsWithouDefault(_assets)
   const [filteredAssets, setSearchWord] = useSearchAssets(assetsWithoutDefault)
-  const [assets] = useAssetsGroupedByGivenStrategy(filteredAssets)
+  const [groupedAssets] = useAssetsGroupedByGivenStrategy(filteredAssets)
+  const assets = useSortPntInflationToken(groupedAssets)
   const [show, setShow] = useState([])
   const inputSearchRef = useRef(null)
 

src/components/organisms/swapLine/SwapLine.jsx

@@ -2,15 +2,27 @@ import PropTypes from 'prop-types'
 import React, { useState, useEffect, useMemo } from 'react'
 import { Row, Col } from 'react-bootstrap'
 import Skeleton from 'react-loading-skeleton'
+import 'react-loading-skeleton/dist/skeleton.css'
 import { NumericFormat } from 'react-number-format'
 import styled from 'styled-components'
 
+import { ETHPNT_ON_ETH_MAINNET, PNT_ON_ETH_MAINNET } from '../../../constants'
 import { getDecimalSeparator, getThousandSeparator } from '../../../utils/amount-utils'
 import { capitalizeAllLettersExceptFirst } from '../../../utils/capitalize'
 import Icon from '../../atoms/icon/Icon'
+import Switch from '../../atoms/switch/Switch'
 import AssetInfo from '../assetInfo/AssetInfo'
 
-import 'react-loading-skeleton/dist/skeleton.css'
+const SelectCol = styled(Col)`
+  text-align: center;
+  font-weight: 500;
+  padding-top: 10px;
+  margin-left: 6px;
+  color: ${({ theme }) => theme.text1};
+  @media (max-width: 767.98px) {
+    font-size: 12px;
+  }
+`
 
 const SwapLineContainer = styled.div`
   border-radius: 20px;
@@ -198,6 +210,7 @@ const Arrow = styled(Icon)`
 
 const SwapLine = ({
   asset,
+  assets,
   amount,
   address,
   defaultImage,
@@ -211,22 +224,53 @@ const SwapLine = ({
   onMax,
   withTitleLabel,
   disableInput,
+  selectFrom = () => null,
+  selectTo = () => null,
+  migration = false,
   inputType = 'number',
   inputPlaceholder = '0',
   prefix = '',
   ..._props
 }) => {
   const [showInfo, setShowInfo] = useState(false)
   const [id, setId] = useState(false)
+  const [selectEthPNT, setSelectEthPNT] = useState(false)
 
   // NOTE: avoid to close show info when asset is reloaded with the balance
   useEffect(() => {
-    if (asset && asset.id !== id) {
+    if (asset && asset.id !== id && asset.id !== ETHPNT_ON_ETH_MAINNET) {
       setShowInfo(false)
       setId(asset.id)
     }
   }, [asset, id])
 
+  useEffect(() => {
+    if (asset && asset.id === ETHPNT_ON_ETH_MAINNET) {
+      setSelectEthPNT(true)
+      setShowInfo(true)
+    } else setSelectEthPNT(false)
+  }, [asset, id])
+
+  // This switch provides the ability to use ethPNT or PNT alternatively.
+  // When pressed the selected asset switch between ethPNt or PNT.
+  const switchPNT = () => {
+    if (migration) return
+    if (asset.id === ETHPNT_ON_ETH_MAINNET) {
+      const pnt = assets.find((asset) => asset.id === PNT_ON_ETH_MAINNET)
+      if (!address && address !== '') selectFrom(pnt)
+    } else {
+      const ethPnt = assets.find((asset) => asset.id === ETHPNT_ON_ETH_MAINNET)
+      if (!address && address !== '') selectFrom(ethPnt)
+    }
+  }
+
+  const isPNTcase = asset?.id === PNT_ON_ETH_MAINNET || asset?.id === ETHPNT_ON_ETH_MAINNET
+
+  // showPntSwitch can be true only in from swapLine because of !address && address !== ''
+  // which is true only if address is undefined. In to swapLine address is defined and therefore
+  // showPntSwitch is false.
+  const showPntSwitch = asset && isPNTcase && !migration && !address && address !== ''
+
   const formattedTitle = useMemo(() => {
     if (!withTitleLabel || !asset || !asset.titleLabel) return title
 
@@ -237,7 +281,7 @@ const SwapLine = ({
     <SwapLineContainer {..._props}>
       <ContainerTypeAndBalance>
         <ContainerTitle xs={6}>{formattedTitle}</ContainerTitle>
-        {asset && asset.formattedBalance !== '-' ? (
+        {asset && asset.formattedBalance && asset.formattedBalance !== '-' ? (
           <Col xs={6} className="text-right my-auto">
             <ContainerBalance>
               <BalanceLabel>{`Balance: ${asset.formattedBalance} ${
@@ -254,12 +298,15 @@ const SwapLine = ({
       <Row>
         <ContainerImageAndMaxButton xs={4} className="my-auto">
           <ContainerImage onClick={() => onClickImage && onClickImage()}>
-            <Image src={asset ? asset.image : defaultImage} onClick={() => onClickImage && onClickImage()} />
+            <Image
+              src={asset ? (isPNTcase ? './assets/svg/PNT.svg' : asset.image) : defaultImage}
+              onClick={() => onClickImage && onClickImage()}
+            />
             {(asset && asset.withMiniImage) || (!asset && defaultMiniImage) ? (
-              <MiniImage src={!asset ? defaultMiniImage : asset.miniImage} />
+              <MiniImage src={asset ? (isPNTcase ? './assets/svg/ETH.svg' : asset.miniImage) : defaultMiniImage} />
             ) : null}
           </ContainerImage>{' '}
-          {asset && asset.formattedBalance !== '-' && !hideMaxButton ? (
+          {asset && asset.formattedBalance && asset.formattedBalance !== '-' && !hideMaxButton ? (
             <ContainerMaxButton>
               <MaxButton onClick={onMax}>MAX</MaxButton>
             </ContainerMaxButton>
@@ -287,6 +334,11 @@ const SwapLine = ({
         </Col>
       </Row>
       <Row>
+        {showPntSwitch ? (
+          <SelectCol data-tip={'Use ethPNT'} data-for="tooltip-gasless" xs={2}>
+            <Switch height={15} width={30} checked={selectEthPNT} disabled={false} onChange={switchPNT} />
+          </SelectCol>
+        ) : null}
         <ExpandContainer>
           <Expand onClick={() => setShowInfo(!showInfo)}>
             {asset && asset.address ? (

src/components/pages/migration/Migration.jsx

@@ -1,10 +1,16 @@
-import React from 'react'
-import styled from 'styled-components'
 import PropTypes from 'prop-types'
+import React from 'react'
 import { Row, Col, Container } from 'react-bootstrap'
-import SwapLine from '../../organisms/swapLine/SwapLine'
-import { useMigration } from '../../../hooks/use-migration'
+import styled from 'styled-components'
+
+import { PBTC_ON_ETH_MAINNET_V2_MIGRATION, PNT_ON_ETH_MAINNET } from '../../../constants'
 import { useAssets } from '../../../hooks/use-assets'
+import { useMigration } from '../../../hooks/use-migration'
+import Button from '../../atoms/button/Button'
+import Progress from '../../molecules/progress/Progress'
+import InfoModal from '../../organisms/infoModal/InfoModal'
+import MigrationInfo from '../../organisms/migrationInfo/MigrationInfo'
+import SwapLine from '../../organisms/swapLine/SwapLine'
 import {
   OuterContainerSwap,
   ContainerSwap,
@@ -13,11 +19,6 @@ import {
   ArrowContainer,
   SortIcon,
 } from '../swap/Swap'
-import Button from '../../atoms/button/Button'
-import Progress from '../../molecules/progress/Progress'
-import InfoModal from '../../organisms/infoModal/InfoModal'
-import MigrationInfo from '../../organisms/migrationInfo/MigrationInfo'
-import { PBTC_ON_ETH_MAINNET_V2_MIGRATION, PNT_ON_ETH_MAINNET } from '../../../constants'
 
 const ArrowIcon = styled(SortIcon)`
   cursor: normal !important;
@@ -91,6 +92,7 @@ const Migration = ({
                 asset={from}
                 amount={fromAmount}
                 wallet={fromWallet}
+                migration={true}
                 onChangeAmount={onChangeFromAmount}
                 onMax={onFromMax}
                 withTitleLabel
@@ -106,6 +108,7 @@ const Migration = ({
                 amount={toAmount}
                 address={address}
                 wallet={toWallet}
+                migration={true}
                 inputType={'text'}
                 onChangeAmount={onChangeToAmount}
                 onChangeAddress={setAddress}

src/components/pages/migrationHome/MigrationHome.jsx

@@ -1,7 +1,8 @@
-import React, { useCallback } from 'react'
-import styled from 'styled-components'
 import PropTypes from 'prop-types'
+import React, { useCallback } from 'react'
 import { Container, Table } from 'react-bootstrap'
+import styled from 'styled-components'
+
 import Button from '../../atoms/button/Button'
 import { ContainerImage, Image } from '../../organisms/swapLine/SwapLine'
 
@@ -136,7 +137,7 @@ const MigrationHome = ({ apys, selectPage, loadMigrationData }) => {
               {' '}
               <TdContent>
                 <ContainerImage>
-                  <StyledImage src={'./assets/svg/PNT_gray.svg'} />
+                  <StyledImage src={'./assets/svg/PNT.svg'} />
                 </ContainerImage>
                 <Text>ethPNT</Text>
               </TdContent>

src/components/pages/swap/Swap.jsx

@@ -1,26 +1,27 @@
-import React, { useCallback, useEffect, useState } from 'react'
-import styled from 'styled-components'
-import PropTypes from 'prop-types'
 import BigNumber from 'bignumber.js'
+import PropTypes from 'prop-types'
+import React, { useCallback, useEffect, useState } from 'react'
 import { Row, Col, Container } from 'react-bootstrap'
-import AssetListModal from '../../organisms/assetListModal/AssetListModal'
-import Progress from '../../molecules/progress/Progress'
+import ReactTooltip from 'react-tooltip'
+import styled from 'styled-components'
+
+import TermsOfService from '../../../components/molecules/popup/TermsOfService'
+import { MAX_IMPACT, PBTC_ON_ETH_MAINNET_V1_MIGRATION } from '../../../constants'
+import { sendEvent } from '../../../ga4'
+import { useAssets } from '../../../hooks/use-assets'
 import { useSwap } from '../../../hooks/use-swap'
-import SwapLine from '../../organisms/swapLine/SwapLine'
-import DepositAddressModal from '../../organisms/depositAddressModal/DepositAddressModal'
-import SwapInfo from '../../organisms/swapInfo/SwapInfo'
 import defaultAssets from '../../../settings/swap-assets'
-import { useAssets } from '../../../hooks/use-assets'
+import Button from '../../atoms/button/Button'
 import Icon from '../../atoms/icon/Icon'
-import InfoModal from '../../organisms/infoModal/InfoModal'
-import TermsOfService from '../../../components/molecules/popup/TermsOfService'
+import Switch from '../../atoms/switch/Switch'
 import AddressWarning from '../../molecules/popup/AddressWarning'
 import WarningPopup from '../../molecules/popup/Warning'
-import Switch from '../../atoms/switch/Switch'
-import Button from '../../atoms/button/Button'
-import { MAX_IMPACT, PBTC_ON_ETH_MAINNET_V1_MIGRATION } from '../../../constants'
-import { sendEvent } from '../../../ga4'
-import ReactTooltip from 'react-tooltip'
+import Progress from '../../molecules/progress/Progress'
+import AssetListModal from '../../organisms/assetListModal/AssetListModal'
+import DepositAddressModal from '../../organisms/depositAddressModal/DepositAddressModal'
+import InfoModal from '../../organisms/infoModal/InfoModal'
+import SwapInfo from '../../organisms/swapInfo/SwapInfo'
+import SwapLine from '../../organisms/swapLine/SwapLine'
 
 export const OuterContainerSwap = styled.div`
   @media (max-width: 767.98px) {
@@ -342,9 +343,11 @@ const Swap = ({
                 defaultImage="./assets/svg/BTC.svg"
                 title="From"
                 asset={from}
+                assets={assets.length === 0 ? defaultAssets : assets}
                 amount={fromAmount}
                 wallet={fromWallet}
                 disableInput={disableFromInput}
+                selectFrom={onSelectFrom}
                 onChangeAmount={onChangeFromAmount}
                 onClickImage={() => setShowModalFrom(true)}
                 onMax={onFromMax}
@@ -358,10 +361,12 @@ const Swap = ({
                 defaultMiniImage="./assets/svg/ETH.svg"
                 title="To"
                 asset={to}
+                assets={assets.length === 0 ? defaultAssets : assets}
                 amount={toAmount}
                 address={address}
                 wallet={toWallet}
                 disableInput={disableToInput}
+                selectTo={onSelectTo}
                 onChangeAmount={onChangeToAmount}
                 onClickImage={() => setShowModalTo(true)}
                 onChangeAddress={setAddress}