Skip to content

Commit

Permalink
Merge pull request #151 from OctoFi/v4.2
Browse files Browse the repository at this point in the history 
Release of Milestone v4.2
  • Loading branch information
@nathanjessen
nathanjessen authored Jun 19, 2021
2 parents 30ba38e + b645c14 commit 08fc353
Show file tree
Hide file tree
Showing 47 changed files with 986 additions and 970 deletions.
148 changes: 76 additions & 72 deletions edit.env.production
View file
Original file line number Diff line number Diff line change
@@ -1,87 +1,91 @@
REACT_APP_NETWORK_URL="https://mainnet.infura.io/v3/1d1f24e8c84a361712757187d"
REACT_APP_WSS_URL=wss://mainnet.infura.io/ws/v3/1f4e8c84a361712757187d
REACT_APP_INFURA_PROJECT_ID=18f4dff24e8c712757187d
REACT_APP_INFURA_PROJECT_SECRET=202b64c912aabc82f5dd
REACT_APP_MANIFEST_EMAIL=hello@octo.fi
REACT_APP_MANIFEST_URL=http://localhost:1234
REACT_APP_CHAIN_ID="1"
REACT_APP_PORTIS_ID="c0e2b-4fd5-ac7b-8e26b58cd236"

REACT_APP_HOME_TOP10=octofi,bitcoin,ethereum,usd-coin,compound,ren,1inch,uniswap,0x,aave,synthetix

REACT_APP_TOKEN_SET_BASE_URL="https://api.tokensets.com/"

REACT_APP_BALANCE_CHECK_TOKEN_ADDRESS="0x7240aC91f01233BaAf8b064248E80feaA5912BA3"
REACT_APP_BALANCE_CHECK_TOKEN_DECIMAL=18
REACT_APP_BALANCE_CHECK_TOKEN_SYMBOL="OCTO"
REACT_APP_BALANCE_CHECK_TOKEN_NAME="OctoFi"

REACT_APP_API_KEY=0511a600b7d3a2a27e0dbba21971a818efce97f2d8730b290cfa98

####
## General Config
####
REACT_APP_BRAND="OctoFi"
REACT_APP_NAME="Defi Dashboard"
REACT_APP_MANIFEST_EMAIL="hello@octo.fi"
# dark / light
REACT_APP_DEFAULT_THEME="dark"
REACT_APP_BRAND="OctoFi"
REACT_APP_RAMP_HOST_API_KEY="cs67nbag2enpu5q5ugr2jjuubazvnjzpfz"

REACT_APP_HUB_URL=https://hub.snapshot.page
REACT_APP_IPFS_NODE=ipfs.io

REACT_APP_NOMICS_API_KEY=ebf70131f1e3fb96253e36c8c6e

REACT_APP_GOVERNANCE_PINNED=octofi

REACT_APP_TRANSAK_API_KEY=5b3-c9cd-4853-b869-f4f89bd40d03
#STAGING/PRODUCTION
REACT_APP_TRANSAK_ENVIRONMENT=PRODUCTION

REACT_APP_TRANSAK_CRYPTO_SYMBOL=ETH
REACT_APP_TRANSAK_FIAT_SYMBOL=USD

REACT_APP_COINSWITCH_API_KEY=1H6pGJGmlkTW6DsqTXgXORzn1EuUdKws90

REACT_APP_OPENSEA_API_KEY='6565604163a583da0dc2210e66'

REACT_APP_RELAYER_URL='https://clickbackend.cloud/v3'
REACT_APP_RELAYER_WS_URL='wss://clickbackend.cloud/websocket/'
REACT_APP_USE_RELAYER_MARKET_UPDATES='true'

REACT_APP_SIMPLESWAP_API_KEY='779b-5979-44d5-85fe-4e3de610d6b9'
REACT_APP_SIMPLESWAP_FIXED_RATE=false

REACT_APP_STEALTHEX_API_KEY='243-1ddb-4f77-9a63-8e53255970b6'
REACT_APP_STEALTHEX_FIXED_RATE=false
REACT_APP_HOME_TOP10=octofi,bitcoin,ethereum,usd-coin,compound,ren,1inch,uniswap,0x,aave,synthetix
REACT_APP_GOVERNANCE_PINNED="octofi"
REACT_APP_MANIFEST_URL="http://localhost:1234"
REACT_APP_CHAIN_ID="1"
REACT_APP_IPFS_NODE="ipfs.io"
REACT_APP_RELAYER_URL="https://clickbackend.cloud/v3"
REACT_APP_RELAYER_WS_URL="wss://clickbackend.cloud/websocket/"
REACT_APP_USE_RELAYER_MARKET_UPDATES="true"

####
## Token
####
REACT_APP_BALANCE_CHECK_TOKEN_NAME="OctoFi"
REACT_APP_BALANCE_CHECK_TOKEN_SYMBOL="OCTO"
REACT_APP_BALANCE_CHECK_TOKEN_ADDRESS="0x7240aC91f01233BaAf8b064248E80feaA5912BA3"
REACT_APP_BALANCE_CHECK_TOKEN_DECIMAL=18

REACT_APP_CHANGE_NOW_API_KEY="ae2e87e50b5663bf4801b77d5ea7c001247aabb847d7e670af862a00"
####
## Infura
####
REACT_APP_NETWORK_URL="https://mainnet.infura.io/v3/18f4df06d1f24e8c84a361712757187d"
REACT_APP_WSS_URL="wss://mainnet.infura.io/ws/v3/18f4df06d1f24e8c84a361712757187d"
REACT_APP_INFURA_PROJECT_ID="18f4df06d1f24e8c84a361712757187d"
# REACT_APP_INFURA_PROJECT_SECRET=

####
## Partners / Apis
####
REACT_APP_API_KEY="050c7ad811a600b7d3a2a27e0dbba21971a818efce97f2d8730b290cfa98"
REACT_APP_CHANGE_NOW_API_KEY="ae2e603c6e9187e50b5663bf4801b77d5ea7c001247aabb847d7e670af862a00"
# standard/fixed-rate
REACTA_APP_CHANGE_NOW_FLOW="standard"
REACT_APP_CHANGE_NOW_FLOW="standard"
REACT_APP_COINSWITCH_API_KEY="1H6pd5JXZMGJGmlkTW6DsqTXgXORzn1EuUdKws90"
REACT_APP_HUB_URL="https://hub.snapshot.page"
REACT_APP_NOMICS_API_KEY="ebf7fa8460131f1e3fb96253e36c8c6e"
REACT_APP_OPENSEA_API_KEY="65378b6dd5604163a583da0dc2210e66"
REACT_APP_PORTIS_ID="c0e2bf01-4b08-4fd5-ac7b-8e26b58cd236"
REACT_APP_RAMP_HOST_API_KEY="cs67nhcoynmbag2enpu5q5ugr2jjuubazvnjzpfz"

# variable/fixed
REACT_APP_SIDE_SHIFT_TYPE="variable"
REACT_APP_TOKEN_SET_BASE_URL="https://api.tokensets.com/"

# launchpad
REACT_APP_PRESALE_SETTINGS=0xd1f0ef21bdf40351c5be3d1d4e1873a6c412bf90
REACT_APP_PRESALE_FACTORY=0x727ee25289f03ceec5fa9ea6dc56386828cbe42b
REACT_APP_PRESALE_GENERATOR=0x9b2a97f5495a66074c3a6b0f4dbfe4ff9c0a78bf
REACT_APP_LAUNCHPAD_WETH=0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2
# separate with ","
REACT_APP_PRESALE_WHITELIST_CONTRACTS="0xFffFFFFfFFffFFffFffFfFFfffFFffFf014f80c9,0xFffFFFFfFFffFFffFffFfFFfffFFffFf014f80c8"

REACT_APP_SIMPLESWAP_API_KEY="72b1679b-5979-44d5-85fe-4e3de610d6b9"
REACT_APP_SIMPLESWAP_FIXED_RATE=false

#Fee
REACT_APP_FEE_RECIPIENT='0x73F29805198cCE93015bC960F47885CF6268ce85'
REACT_APP_SPOT_FEE_PERCENTAGE='0.05'
REACT_APP_REFERRER_ACCOUNT='0x73F29805198cCE93015bC960F47885CF6268ce85'
REACT_APP_NFT_REFERRER_ACCOUNT='0x73F29805198cCE93015bC960F47885CF6268ce85'
REACT_APP_PARASWAP_REFERRER='0x73F29805198cCE93015bC960F47885CF6268ce85'
REACT_APP_BITREFILL_REF_TOKEN='0x0000000000000000000000000000000000000000'
REACT_APP_STEALTHEX_API_KEY="2423ae13-1ddb-4f77-9a63-8e53255970b6"
REACT_APP_STEALTHEX_FIXED_RATE=false

REACT_APP_1INCH_REFERRER_ACCOUNT='0x73F29805198cCE93015bC960F47885CF6268ce85
REACT_APP_TRANSAK_API_KEY="55a25eb3-c9cd-4853-b869-f4f89bd40d03"
# STAGING/PRODUCTION
REACT_APP_TRANSAK_ENVIRONMENT="PRODUCTION"
REACT_APP_TRANSAK_CRYPTO_SYMBOL="ETH"
REACT_APP_TRANSAK_FIAT_SYMBOL="USD"

####
## Fees
####
REACT_APP_FEE_RECIPIENT="0x73F29805198cCE93015bC960F47885CF6268ce85"
REACT_APP_SPOT_FEE_PERCENTAGE="0.05"
REACT_APP_REFERRER_ACCOUNT="0x73F29805198cCE93015bC960F47885CF6268ce85"
REACT_APP_BITREFILL_REF_TOKEN="0x0000000000000000000000000000000000000000"
REACT_APP_NFT_REFERRER_ACCOUNT="0x73F29805198cCE93015bC960F47885CF6268ce85"
REACT_APP_PARASWAP_REFERRER="0x73F29805198cCE93015bC960F47885CF6268ce85"
# this must be between 0 and 3
REACT_APP_1INCH_REFERRER_FEE_PERCENTAGE='1'

REACT_APP_1INCH_REFERRER_ACCOUNT="0x73F29805198cCE93015bC960F47885CF6268ce85"
REACT_APP_1INCH_REFERRER_FEE_PERCENTAGE="1"

####
## Launchpad
####
REACT_APP_LAUNCHPAD_WETH="0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
REACT_APP_PRESALE_GENERATOR="0x9b2a97f5495a66074c3a6b0f4dbfe4ff9c0a78bf"
REACT_APP_PRESALE_FACTORY="0x727ee25289f03ceec5fa9ea6dc56386828cbe42b"
REACT_APP_PRESALE_SETTINGS="0xd1f0ef21bdf40351c5be3d1d4e1873a6c412bf90"
# separate with ","
REACT_APP_PRESALE_WHITELIST_CONTRACTS="0xFffFFFFfFFffFFffFffFfFFfffFFffFf014f80c9,0xFffFFFFfFFffFFffFffFfFFfffFFffFf014f80c8"

####
## Other
####
SKIP_PREFLIGHT_CHECK=true


PORT=3060
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "octofi-app-aquafarm",
"version": "4.1.0",
"version": "4.2.0",
"private": true,
"homepage": "https://app.octo.fi",
"dependencies": {
Expand Down
11 changes: 7 additions & 4 deletions public/locales/en/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"menu": {
"Account": "Account",
"menu": "Menu",
"buy": "Buy",
"crypto": "Crypto",
"buy": "Buy / Swap",
"crypto": "Crypto with fiat",
"giftCards": "Gift Cards & more",
"swap": "Swaptopus",
"aggregator": "Aggregator",
Expand All @@ -53,7 +53,7 @@
"launchpad": "INKubator",
"cross": "Crosstopus",
"bridges": "Bridges",
"anySwap": "AnySwap",
"anySwap": "Swap",
"crossBalance": "Balance"
},
"wallet": {
Expand Down Expand Up @@ -100,6 +100,7 @@
"notEnoughGas": "Not enough ETH for the gas",
"noAssets": "There are no assets",
"noTransaction": "There are no transactions",
"noRecentTransaction": "Your transactions will appear here",
"noTransactionDesc": "Please make some transactions first.",
"noPlatform": "There is no Platform",
"noPlatformDesc": "Please make some transactions on investment platforms first.",
Expand Down Expand Up @@ -216,7 +217,7 @@
"portfolios": "Portfolios",
"rebalancingSets": "Rebalancing Sets",
"oneDay": "1 Day",
"week": "A Week",
"week": "1 Week",
"month": "1 Month",
"sixMonth": "6 Month",
"year": "1 Year"
Expand Down Expand Up @@ -322,6 +323,7 @@
"seeAllTransactions": "See all Transactions",
"pendingTransactions": "Pending Transactions",
"confirmedTransactions": "Confirmed Transactions",
"recentTransactions": "Recent Transactions",
"showMore": "Show More",
"invest": "Invest",
"openOrders": "Open Orders",
Expand Down Expand Up @@ -365,6 +367,7 @@
"amount": "Amount",
"time": "Time",
"markets": "Markets",
"last7Days": "Last 7 Days",
"noWallet": "No Ethereum wallet found",
"installWeb3MobileBrowser": "Please visit us from a web3-enabled mobile browser such as Trust Wallet or Coinbase Wallet.",
"installMetamask": "Please visit us after installing Metamask on Chrome or Brave.",
Expand Down
Loading

0 comments on commit 08fc353

Please sign in to comment.