Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
rmourey26 authored Apr 1, 2024
1 parent 93d0ed8 commit ede9728
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion src/components/About/ProtocolBanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const ProtocolBanner = () => {
</DescriptionText>
</TextContainer>
<BannerButtonContainer>
<BannerButton width="200px" as="a" href="https://www.defiprotocol.blockchain-company.io" rel="noopener noreferrer" target="_blank">
<BannerButton width="200px" as="a" href="https://www.defione.io" rel="noopener noreferrer" target="_blank">
Learn more
</BannerButton>
</BannerButtonContainer>
Expand Down
2 changes: 1 addition & 1 deletion src/components/About/constants.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const MORE_CARDS = [
{
to: '/pools',
title: 'Earn',
description: 'Provide liquidity to pools on DFP and earn fees on swaps.',
description: 'Provide liquidity to pools on ONE and earn fees on swaps.',
lightIcon: <StyledCardLogo src={lightArrowImgSrc} alt="Analytics" />,
darkIcon: <StyledCardLogo src={darkArrowImgSrc} alt="Analytics" />,
cta: 'Provide liquidity',
Expand Down
4 changes: 2 additions & 2 deletions src/components/AccountDrawer/UniwalletModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default function UniwalletModal() {
<UniwalletConnectWrapper>
<HeaderRow>
<ThemedText.SubHeader>
<Trans>Scan with DFP Wallet</Trans>
<Trans>Scan with ONE Wallet</Trans>
</ThemedText.SubHeader>
<CloseIcon onClick={cancelActivation} />
</HeaderRow>
Expand Down Expand Up @@ -117,7 +117,7 @@ function InfoSection() {
<InfoSectionWrapper>
<AutoColumn gap="4px">
<ThemedText.SubHeaderSmall color="textPrimary">
<Trans>Don&apos;t have DFP Wallet?</Trans>
<Trans>Don&apos;t have ONE Wallet?</Trans>
</ThemedText.SubHeaderSmall>
<ThemedText.Caption color="textSecondary">
<Trans>
Expand Down
4 changes: 2 additions & 2 deletions src/components/AirdropModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ const AirdropModal = () => {
<ImageContainer>
<TextContainer>
<SyledCloseIcon onClick={usdcAirdropToggle} stroke="white" />
<MainHeader>DFP NFT Airdrop</MainHeader>
<MainHeader>ONE NFT Airdrop</MainHeader>
<USDCLabel>{totalAmount} USDC</USDCLabel>
<Line />
<RewardsDetailsContainer>
Expand Down Expand Up @@ -303,7 +303,7 @@ const AirdropModal = () => {
</RewardsInformationText>
<ReactLinkWrap>
<LinkWrap href="https://uniswap.org/blog/uniswap-nft-aggregator-announcement" target="_blank">
<ThemedText.Link>Read more about DFP NFT.</ThemedText.Link>
<ThemedText.Link>Read more about ONE NFT.</ThemedText.Link>
</LinkWrap>
</ReactLinkWrap>

Expand Down
2 changes: 1 addition & 1 deletion src/components/Banner/UniswapWalletBanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default function UniswapWalletBanner() {

<AutoColumn gap="8px">
<ThemedText.HeadlineMedium fontSize="24px" lineHeight="28px" color="white" maxWidth="60%">
<Trans>DFP in your pocket</Trans>
<Trans>ONE in your pocket</Trans>
</ThemedText.HeadlineMedium>
</AutoColumn>

Expand Down
2 changes: 1 addition & 1 deletion src/components/NavBar/MenuDropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export const MenuDropdown = () => {
<AppleLogo width="24px" height="24px" fill={theme.textPrimary} />
</Icon>
<PrimaryMenuRow.Text>
<Trans>Download DFP Wallet</Trans>
<Trans>Download ONE Wallet</Trans>
</PrimaryMenuRow.Text>
</PrimaryMenuRow>
</Box>
Expand Down
2 changes: 1 addition & 1 deletion src/components/vote/ProposalEmptyState.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default function ProposalEmptyState() {
HeaderContent={() => <Trans>Please connect to Layer 1 Ethereum</Trans>}
SubHeaderContent={() => (
<Trans>
DFP governance is only available on Layer 1. Switch your network to Ethereum Mainnet to view Proposals
ONE governance is only available on Layer 1. Switch your network to Ethereum Mainnet to view Proposals

Check failure on line 47 in src/components/vote/ProposalEmptyState.tsx

View workflow job for this annotation

GitHub Actions / lint

Insert `·and`
and Vote.

Check failure on line 48 in src/components/vote/ProposalEmptyState.tsx

View workflow job for this annotation

GitHub Actions / lint

Delete `·and`
</Trans>
)}
Expand Down
8 changes: 4 additions & 4 deletions src/connection/WalletConnect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class WalletConnectV1 extends WalletConnect {

// Custom class for Uniswap Wallet specific functionality
export class UniwalletConnect extends WalletConnectV1 {
ANALYTICS_EVENT = 'DFP Wallet QR Scan'
ANALYTICS_EVENT = 'ONE Wallet QR Scan'
static UNI_URI_AVAILABLE = 'uni_uri_available'

constructor({ actions, onError }: Omit<WalletConnectConstructorArgs, 'options'>) {
Expand All @@ -47,12 +47,12 @@ export class UniwalletConnect extends WalletConnectV1 {

this.events.on(URI_AVAILABLE, (uri) => {
if (!uri) return
// Emits custom wallet connect code, parseable by the DFP Wallet
// Emits custom wallet connect code, parseable by the ONE Wallet
this.events.emit(UniwalletConnect.UNI_URI_AVAILABLE, `hello_uniwallet:${uri}`)

// Opens deeplink to DFP Wallet if on iOS
// Opens deeplink to ONE Wallet if on iOS
if (isIOS) {
const newTab = window.open(`https://defiprotocol.blockchain-company.io/wc?uri=${encodeURIComponent(uri)}`)
const newTab = window.open(`https://defione.io/wc?uri=${encodeURIComponent(uri)}`)

// Fixes blank tab opening on mobile Chrome
newTab?.close()
Expand Down
8 changes: 4 additions & 4 deletions src/connection/WalletConnectV2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ export class WalletConnectV2 extends WalletConnect {
}
}

// Custom class for DFP Wallet specific functionality
// Custom class for ONE Wallet specific functionality
export class UniwalletConnect extends WalletConnectV2 {
ANALYTICS_EVENT = 'DFP Wallet QR Scan'
ANALYTICS_EVENT = 'ONE Wallet QR Scan'
static UNI_URI_AVAILABLE = 'uni_uri_available'

constructor({ actions, onError }: Omit<WalletConnectConstructorArgs, 'options'>) {
Expand All @@ -77,10 +77,10 @@ export class UniwalletConnect extends WalletConnectV2 {

this.events.on(URI_AVAILABLE, (uri) => {
if (!uri) return
// Emits custom wallet connect code, parseable by the DFP Wallet
// Emits custom wallet connect code, parseable by the ONE Wallet
this.events.emit(UniwalletConnect.UNI_URI_AVAILABLE, `hello_uniwallet:${uri}`)

// Opens deeplink to DFP Wallet if on iOS
// Opens deeplink to ONE Wallet if on iOS
if (isIOS) {
const newTab = window.open(`https://uniswap.org/app/wc?uri=${encodeURIComponent(uri)}`)

Expand Down
6 changes: 3 additions & 3 deletions src/connection/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const [web3UniwalletConnect, web3UniwalletConnectHooks] = initializeConnector<Un
(actions) => new UniwalletConnect({ actions, onError })
)
export const uniwalletConnectConnection: Connection = {
getName: () => 'DFP Wallet',
getName: () => 'ONE Wallet',
connector: web3UniwalletConnect,
hooks: web3UniwalletConnectHooks,
type: ConnectionType.UNISWAP_WALLET,
Expand All @@ -122,7 +122,7 @@ const [web3WCV2UniwalletConnect, web3WCV2UniwalletConnectHooks] = initializeConn
(actions) => new UniwalletWCV2Connect({ actions, onError })
)
export const uniwalletWCV2ConnectConnection: Connection = {
getName: () => 'DFP Wallet',
getName: () => 'ONE Wallet',
connector: web3WCV2UniwalletConnect,
hooks: web3WCV2UniwalletConnectHooks,
type: ConnectionType.UNISWAP_WALLET_V2,
Expand All @@ -137,7 +137,7 @@ const [web3CoinbaseWallet, web3CoinbaseWalletHooks] = initializeConnector<Coinba
actions,
options: {
url: RPC_URLS[SupportedChainId.MAINNET][0],
appName: 'DFP',
appName: 'ONE',
appLogoUrl: UNISWAP_LOGO,
reloadOnDisconnect: false,
},
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Landing/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ export default function Landing() {

<DownloadWalletLink href="#">
<AppleLogo width="20" height="20" />
DFP for iOS coming soon!
ONE for iOS coming soon!
</DownloadWalletLink>
</ContentContainer>
<AboutContentContainer isDarkMode={isDarkMode}>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Tokens/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@ const Tokens = () => {
<ExploreContainer>
<TitleContainer>
<MouseoverTooltip
text={<Trans>This table contains the top tokens by DFP volume, sorted based on your input.</Trans>}
text={<Trans>This table contains the top tokens by ONE volume, sorted based on your input.</Trans>}
placement="bottom"
>
<ThemedText.LargeHeader>
<Trans>Top tokens on DFP</Trans>
<Trans>Top tokens on ONE</Trans>
</ThemedText.LargeHeader>
</MouseoverTooltip>
</TitleContainer>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/Vote/Landing.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,13 @@ export default function Landing() {
<AutoColumn gap="md">
<RowBetween>
<ThemedText.DeprecatedWhite fontWeight={600}>
<Trans>DFP Governance</Trans>
<Trans>ONE Governance</Trans>
</ThemedText.DeprecatedWhite>
</RowBetween>
<RowBetween>
<ThemedText.DeprecatedWhite fontSize={14}>
<Trans>
DFP tokens represent voting shares in DeFi One governance. You can vote on each proposal yourself
ONE tokens represent voting shares in DeFi One governance. You can vote on each proposal yourself
or delegate your votes to a third party.
</Trans>
</ThemedText.DeprecatedWhite>
Expand All @@ -180,7 +180,7 @@ export default function Landing() {
target="_blank"
>
<ThemedText.DeprecatedWhite fontSize={14}>
<Trans>Read more about DFP governance</Trans>
<Trans>Read more about ONE governance</Trans>
</ThemedText.DeprecatedWhite>
</ExternalLink>
</AutoColumn>
Expand Down

0 comments on commit ede9728

Please sign in to comment.