Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove element.fi urls #461

Merged
merged 3 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions apps/core-frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,29 +44,3 @@ This will spin up the frontend as normal. It will be noticeably slower in initia

1. Sometimes metamask can be out of sync and will attempt to cache on the basis of blocknumber last seen. This is known as ["tagging"](https://ethereum.stackexchange.com/questions/109625/received-invalid-block-tag-87-latest-block-number-is-0) and will most likely occur when the node is restarted, resetting the blocknumber. This can be circumvented as instructed from the link and so it is advised to set your network to some other and back again to localhost
2. When submitting transactions, there may be a nonce issue which is also due to metamask caching. This can be annoying but can be manually edited with the correct one. Usually if a transaction is attempted there should be an error log in the console which should mention the correct one.

## Deployment

This app is deployed to 3 different projects in [Vercel](https://vercel.com/element-finance).

### 1. [core-v1-staging](https://vercel.com/element-finance/core-v1-staging)

This is a password protected app accessible at [staging.element.fi][staging-app-url]. It uses `main` as its production branch and will create a new [preview deployment](https://vercel.com/docs/concepts/deployments/environments#preview) each time there's a push to _any_ branch or a deployment is made using the [`vercel` command](https://vercel.com/docs/concepts/deployments/overview#vercel-cli).

Once a branch has been merged into `main`, it will be deployed to [staging.element.fi][staging-app-url].

### 2. [core-v1-testnet](https://vercel.com/element-finance/core-v1-testnet)

This is the Goerli app accessible at [testnet.element.fi][testnet-app-url] and uses `testnet` as its production branch.

After merging a branch into `main`, merge `main` into `testnet` to deploy to [testnet.element.fi][testnet-app-url].

### 3. [core-v1](https://vercel.com/element-finance/core-v1)

This is the main app accessible at [app.element.fi][mainnet-app-url] and uses `mainnet` as its production branch.

After merging a branch into `main`, merge `main` into `mainnet` to deploy to [app.element.fi][mainnet-app-url].

[staging-app-url]: https://staging.element.fi
[testnet-app-url]: https://testnet.element.fi
[mainnet-app-url]: https://app.element.fi
4 changes: 2 additions & 2 deletions apps/core-frontend/public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"short_name": "EFI",
"name": "Element.fi",
"description": "Element Finance",
"providedBy": { "name": "Element Finance", "url": "https://element.fi" },
"iconPath": "https://elementfi.s3.us-east-2.amazonaws.com/logo.svg",
"providedBy": { "name": "Element Finance", "url": "https://website.com" },
"iconPath": "https://website.com/logo.svg",
"icons": [
{
"src": "favicon.ico",
Expand Down
4 changes: 2 additions & 2 deletions apps/core-frontend/src/elf/canperform/canperform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ export const canPerformJson: CanPerformJsonFile = require(`canperform/${chainNam
export const CAN_PERFORM_URL = getCanPerformJsonUrl();
function getCanPerformJsonUrl() {
if (process.env.NEXT_PUBLIC_CHAIN_NAME === "mainnet") {
return "https://elementfi.s3.us-east-2.amazonaws.com/mainnet.canperform.json";
return "https://example.s3.us-east-2.amazonaws.com/mainnet.canperform.json";
}

return "https://elementfi.s3.us-east-2.amazonaws.com/goerli.canperform.json";
return "https://example.s3.us-east-2.amazonaws.com/goerli.canperform.json";
}
4 changes: 2 additions & 2 deletions apps/core-frontend/src/elf/wallets/connectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ export const ledgerConnector = new LedgerConnector({
});

export const trezorConnector = new TrezorConnector({
manifestEmail: "support@element.fi",
manifestAppUrl: "https://app.element.fi",
manifestEmail: "support@website.com",
manifestAppUrl: "https://app.website.com",
chainId: AddressesJson.chainId,
url:
AddressesJson.chainId === ChainId.MAINNET
Expand Down
2 changes: 1 addition & 1 deletion apps/core-frontend/src/tokenlists/mock.tokenlist.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Testnet token list",
"logoURI": "https://element.fi/logo.svg",
"logoURI": "data:image/svg+xml,%3csvg%20width='80'%20height='32'%20viewBox='0%200%2080%2032'%20fill='none'%20xmlns='http://www.w3.org/2000/svg'%3e%3cpath%20d='M0%209.57422H4.80178C8.90756%209.57422%2011.7484%2012.3049%2011.7484%2015.9707C11.7484%2019.6364%208.90756%2022.4044%204.80178%2022.4044H0V9.57422ZM3.83111%2020.0587H4.80267C7.47911%2020.0587%209.14667%2018.3724%209.14667%2015.9716C9.14667%2013.5707%207.47911%2011.9209%204.80267%2011.9209H2.56622V22.2764L3.83111%2020.0587Z'%20fill='white'/%3e%3cpath%20d='M18.2773%209.57422H26.672V11.92H20.8436V16.832L22.0898%2014.6507H26.3973V16.96H20.8436V20.0578H26.7636V22.4036H18.2773V9.57422Z'%20fill='white'/%3e%3cpath%20d='M33.5307%209.57422H36.0969V22.2764L37.3618%2020.0587H41.9253V22.4044H33.5307V9.57422Z'%20fill='white'/%3e%3cpath%20d='M45.5582%209.57422H48.2711L51.6436%2019.1049L54.888%209.57422H57.6009L54.2836%2019.3067H51.6987L52.7982%2022.4044H50.0853L45.5582%209.57422Z'%20fill='white'/%3e%3cpath%20d='M64%200V6.36622C69.3209%206.36622%2073.6338%2010.6791%2073.6338%2016C73.6338%2021.3209%2069.3209%2025.6338%2064%2025.6338V32C72.8365%2032%2080%2024.8364%2080%2016C80%207.16356%2072.8365%200%2064%200Z'%20fill='white'/%3e%3c/svg%3e",
"tags": {
"eP": {
"name": "Principal token",
Expand Down
2 changes: 1 addition & 1 deletion apps/core-frontend/src/tokenlists/testnet.tokenlist.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Testnet token list",
"logoURI": "https://element.fi/logo.svg",
"logoURI": "https://website.com/logo.svg",
"tags": {
"underlying": {
"name": "Underlying asset",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function AppHamburgerButton(): ReactElement {
content={
<Menu large>
<MenuItem
href="https://element.fi"
href="https://website.com"
target="_blank"
rel="noreferrer"
text={t`About`}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ function ResourcesMenu({ onClose }: ResourcesMenuProps) {
/>
<MenuItem
icon={<Icon icon={IconNames.BLANK} />}
href="https://element.fi"
href="https://website.com"
target="_blank"
rel="noreferrer"
text={t`About`}
Expand Down
2 changes: 1 addition & 1 deletion apps/core-frontend/src/ui/app/Banner/TermsBanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const setAcceptedTOS = () => {
};

export const TOS_URL =
"https://elementfi.s3.us-east-2.amazonaws.com/element-finance-terms-of-service.pdf";
"https://example.s3.us-east-2.amazonaws.com/example-terms-of-service.pdf";

export const TermsBanner = (): ReactElement => {
const [open, setOpen] = useState(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ interface FixedRatesListViewProps {}
const fixedYieldLink = (
<a
key="fixed-yield-link"
href="https://medium.com/element-finance/fixed-rate-interest-markets-a-casual-users-journey-through-fixed-rate-interest-using-element-50f420df1859"
href="https://medium.com/delvtech/fixed-rate-interest-markets-a-casual-users-journey-through-fixed-rate-interest-using-element-50f420df1859"
target="_noreferrer"
>{t`Fixed Yield`}</a>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export function SocialMediaMenuItems(): ReactElement {
text={t`Twitter`}
/>
<MenuItem
href="https://t.me/elementfinance"
href="https://t.me/example"
target="_blank"
className={tw("items-center")}
icon={
Expand All @@ -65,7 +65,7 @@ export function SocialMediaMenuItems(): ReactElement {
text={t`Telegram`}
/>
<MenuItem
href="https://medium.com/element-finance"
href="https://medium.com/example"
className={tw("items-center")}
icon={
<img
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ function getElementPoolLink(
const { address } = principalToken;
const { address: poolAddress } = getPoolInfoForPrincipalToken(address);
// assume testnet by default (goerli)
let domain = "https://testnet.element.fi";
let domain = "https://testnet.website.com";
if (isGoerli(AddressesJson.chainId)) {
domain = "https://testnet.element.fi";
domain = "https://testnet.website.com";
} else if (isMainnet(AddressesJson.chainId)) {
// TODO: What will be the url for mainnet?
domain = "https://app.element.fi";
domain = "https://app.website.com";
}

return (
Expand Down Expand Up @@ -106,8 +106,8 @@ function getGoogleCalendarLink(

const event: CalendarEvent = {
title: t`Redeem ${name}`,
description: t`Your ${baseAssetSymbol} fixed rate term has been reached! You can now head back to https://app.element.fi/ to redeem your ${baseAssetSymbol}.`,
url: "https://element.fi",
description: t`Your ${baseAssetSymbol} fixed rate term has been reached! You can now head back to https://app.website.com/ to redeem your ${baseAssetSymbol}.`,
url: "https://website.com",
start: unlockTimestamp * 1000,
duration: [1, "hour"],
};
Expand Down
2 changes: 1 addition & 1 deletion apps/core-testnet/src/tokenlist/getTokenList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export async function getTokenList(

const tokenList: TokenList = {
name,
logoURI: "https://element.fi/logo.svg",
logoURI: "https://website.com/logo.svg",
tags,
timestamp: new Date().toISOString(),
version: {
Expand Down
2 changes: 1 addition & 1 deletion apps/core-testnet/src/tokenlist/goerli.tokenlist.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Goerli token list",
"logoURI": "https://element.fi/logo.svg",
"logoURI": "https://website.com/logo.svg",
"tags": {
"underlying": {
"name": "Underlying asset",
Expand Down
2 changes: 1 addition & 1 deletion apps/core-testnet/src/tokenlist/mainnet.tokenlist.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Mainnet token list",
"logoURI": "https://element.fi/logo.svg",
"logoURI": "https://website.com/logo.svg",
"tags": {
"underlying": {
"name": "Underlying asset",
Expand Down
2 changes: 1 addition & 1 deletion apps/council-frontend/src/integrations/commonwealth.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export function getGSCCandidateUrl(
commonwealthPostedFromAddress: string,
): string {
return `https://forum.element.fi/account/${commonwealthPostedFromAddress}`;
return `https://forum.website.com/account/${commonwealthPostedFromAddress}`;
}
4 changes: 2 additions & 2 deletions apps/council-frontend/src/integrations/snapshot/endpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function getSnapshotUrl() {
case ChainId.GOERLI:
case ChainId.LOCAL:
default:
return "https://snapshot.org/#/element-finance-goerli.eth";
return "https://snapshot.org/#/example-goerli.eth";
}
}

Expand All @@ -23,6 +23,6 @@ function getGSCSnapshotUrl() {
case ChainId.GOERLI:
case ChainId.LOCAL:
default:
return "https://snapshot.org/#/element-finance-goerli.eth";
return "https://snapshot.org/#/example-goerli.eth";
}
}
12 changes: 6 additions & 6 deletions apps/council-frontend/src/proposals/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ export const GSC_PROPOSALS_JSON_URL = getGscProposalsJsonUrl();
function getProposalsJsonUrl() {
switch (addressesJson.chainId) {
case ChainId.MAINNET:
return "https://elementfi.s3.us-east-2.amazonaws.com/mainnet.proposals.json";
return "https://example.s3.us-east-2.amazonaws.com/mainnet.proposals.json";

case ChainId.GOERLI:
return "https://elementfi.s3.us-east-2.amazonaws.com/goerli.proposals.json";
return "https://example.s3.us-east-2.amazonaws.com/goerli.proposals.json";

case ChainId.LOCAL:
default:
return "https://elementfi.s3.us-east-2.amazonaws.com/testnet.proposals.json";
return "https://example.s3.us-east-2.amazonaws.com/testnet.proposals.json";
}
}

function getGscProposalsJsonUrl() {
switch (addressesJson.chainId) {
case ChainId.MAINNET:
return "https://elementfi.s3.us-east-2.amazonaws.com/mainnet-gsc.proposals.json";
return "https://example.s3.us-east-2.amazonaws.com/mainnet-gsc.proposals.json";

case ChainId.GOERLI:
return "https://elementfi.s3.us-east-2.amazonaws.com/goerli-gsc.proposals.json";
return "https://example.s3.us-east-2.amazonaws.com/goerli-gsc.proposals.json";

case ChainId.LOCAL:
default:
return "https://elementfi.s3.us-east-2.amazonaws.com/testnet-gsc.proposals.json";
return "https://example.s3.us-east-2.amazonaws.com/testnet-gsc.proposals.json";
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/council-frontend/src/tokenlist/testnet.tokenlist.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Council testnet token list",
"logoURI": "https://element.fi/logo.svg",
"logoURI": "https://website.com/logo.svg",
"timestamp": "2022-05-03T18:12:25.966Z",
"version": {
"major": 0,
Expand Down
2 changes: 1 addition & 1 deletion apps/council-frontend/src/ui/app/PageView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const councilLink = (
"text-principalRoyalBlue decoration-current underline-offset-2 hover:underline",
)}
>
governance.element.fi
governance.website.com
</a>
);
export default function PageView(props: PageViewProps): ReactElement {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ export function makeTOSAndPrivacyPolicyToast({
<AnchorButton
variant={ButtonVariant.MINIMAL}
className="text-center"
href="https://elementfi.s3.us-east-2.amazonaws.com/element-finance-terms-of-service-02-03-2023.pdf"
href="https://example.s3.us-east-2.amazonaws.com/example-terms-of-service-02-03-2023.pdf"
>
Terms of Service
</AnchorButton>
<AnchorButton
variant={ButtonVariant.MINIMAL}
className="text-center"
href="https://elementfi.s3.us-east-2.amazonaws.com/element-finance-privacy-policy-02-03-23.pdf"
href="https://example.s3.us-east-2.amazonaws.com/example-privacy-policy-02-03-23.pdf"
>
Privacy Policy
</AnchorButton>
Expand Down
6 changes: 3 additions & 3 deletions apps/council-frontend/src/ui/gsc/GSCHistory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function getGSCStatusText(
{t`To learn more about our GSC program, its role within the Element DAO’s
Governance, and how it affects your experience as a member`}
<ExternalLink
href="https://medium.com/element-finance/the-governance-steering-council-63aea7732262"
href="https://medium.com/delvtech/the-governance-steering-council-63aea7732262"
text="read more here"
/>
</div>
Expand All @@ -89,7 +89,7 @@ function getGSCStatusText(
{t`To learn more about our GSC program, its role within the Element DAO’s
Governance, and how it affects your experience as a member`}
<ExternalLink
href="https://medium.com/element-finance/the-governance-steering-council-63aea7732262"
href="https://medium.com/delvtech/the-governance-steering-council-63aea7732262"
text="read more here"
/>
</div>
Expand Down Expand Up @@ -138,7 +138,7 @@ function getGSCStatusText(
chose to remove you from the Council. To appeal this decision please
follow protocol you can`}
<ExternalLink
href="https://medium.com/element-finance/the-governance-steering-council-63aea7732262"
href="https://medium.com/delvtech/the-governance-steering-council-63aea7732262"
text="read more here"
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/council-frontend/src/ui/gsc/GSCOverviewSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ const forumsLink = (
className="underline"
target="_blank"
rel="noopener noreferrer"
href="https://forum.element.fi/discussion/4146-introducing-the-call-for-delegates-members-of-the-governance-steering-council"
href="https://forum.website.com/discussion/4146-introducing-the-call-for-delegates-members-of-the-governance-steering-council"
>
{t`forums`}
</a>
Expand All @@ -330,7 +330,7 @@ const gscResponibilitiesLink = (
className="underline"
target="_blank"
rel="noopener noreferrer"
href="https://forum.element.fi/discussion/4146-introducing-the-call-for-delegates-members-of-the-governance-steering-council"
href="https://forum.website.com/discussion/4146-introducing-the-call-for-delegates-members-of-the-governance-steering-council"
>
{t`actively discussed at this time`}
</a>
Expand Down
2 changes: 1 addition & 1 deletion apps/council-frontend/src/ui/merkle/useMerkleInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { formatEther } from "ethers/lib/utils";
import { MerkleProof } from "src/merkle/MerkleProof";

const ELEMENT_REWARDS_URL =
"https://elementfi.s3.us-east-2.amazonaws.com/rewards";
"https://example.s3.us-east-2.amazonaws.com/rewards";

const chainName = process.env.NEXT_PUBLIC_CHAIN_NAME || "local";

Expand Down
2 changes: 1 addition & 1 deletion apps/council-frontend/src/ui/zkclaim/useZKProof.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if (CHAIN_NAME === "mainnet-fork") {
CHAIN_NAME = "mainnet";
}
// TODO: Move cdn base url to environment variable
const cdnUrl = `https://elementfi.s3.us-east-2.amazonaws.com/rewards/${
const cdnUrl = `https://example.s3.us-east-2.amazonaws.com/rewards/${
CHAIN_NAME || "testnet"
}/zkRetro`;

Expand Down
14 changes: 7 additions & 7 deletions apps/council-frontend/src/urls.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
export enum ElementUrl {
// apps
CORE_LANDING = "https://element.fi",
CORE_APP = "https://app.element.fi",
NFT_APP = "https://elfiverse.element.fi",
COUNCIL_UI = "https://governance.element.fi",
CORE_LANDING = "https://website.com",
CORE_APP = "https://app.website.com",
NFT_APP = "https://elfiverse.website.com",
COUNCIL_UI = "https://governance.website.com",
// socials
DISCORD = "https://element.fi/discord",
FORUM = "https://forum.element.fi",
DISCORD = "https://website.com/discord",
FORUM = "https://forum.website.com",
TELEGRAM = "",
TWITTER = "https://twitter.com/element_fi",
// resources
DOCS = "https://docs-delv.gitbook.io/element-developer-docs/governance-council",
GITHUB = "https://github.com/delvtech",
MEDIUM = "https://medium.com/element-finance",
MEDIUM = "https://medium.com/example",
}

export default ElementUrl;
2 changes: 1 addition & 1 deletion apps/council-testnet/src/tokenlist/testnet.tokenlist.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Council testnet token list",
"logoURI": "https://element.fi/logo.svg",
"logoURI": "https://website.com/logo.svg",
"timestamp": "2022-05-10T17:34:16.938Z",
"version": {
"major": 0,
Expand Down
10 changes: 5 additions & 5 deletions apps/liquiditymining/src/elf/urls.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
export enum ExternalUrls {
// apps
CORE_LANDING = "https://element.fi",
CORE_APP = "https://app.element.fi",
CORE_LANDING = "https://website.com",
CORE_APP = "https://app.website.com",

// socials
DISCORD = "https://element.fi/discord",
FORUM = "https://forum.element.fi",
DISCORD = "https://website.com/discord",
FORUM = "https://forum.website.com",
TWITTER = "https://twitter.com/element_fi",

// resources
DOCS = "https://docs-element-finance.gitbook.io/element-council",
DOCS = "https://docs-delv.gitbook.io/element-developer-docs/governance-council",
}

export default ExternalUrls;
Loading
Loading