diff --git a/.env.development b/.env.development
index 84a6bd5b71..042d0d85f1 100644
--- a/.env.development
+++ b/.env.development
@@ -9,7 +9,7 @@ REACT_APP_SECURITY_TOKENS=true
REACT_APP_GOOGLE_ANALYTICS_ID="UA-199572024-1"
NODE_ENV="test development env"
REACT_APP_STAKING_CONTRACT_KOVAN="0x2ddCfC409Ba3116d8d0a2224FfDF30042686eDe8"
-REACT_APP_SUPPORTED_TGE_CHAINS=[84532, 80002]
+REACT_APP_SUPPORTED_TGE_CHAINS=[84532, 80002, 1001, 7849306]
REACT_APP_IXSALE_ADDRESS_MUMBAI=0x34f23d97a59D3c579b71a70B000d06010ca4e93c
REACT_APP_IXSALE_ADDRESS_AMOY=0x48d37ee262617c385114B9b795B2e5c1779E570B
REACT_APP_IXSALE_ADDRESS_POLYGON=
@@ -25,4 +25,6 @@ REACT_APP_ALCHEMY_KEY="r6GxzZtusoypG9eNhpC41xNNzd5-V0ZJ"
REACT_APP_BRIDGE_URL=https://staging-bridge.ixswap.io
REACT_APP_BRIDGE_ADMIN_URL=https://staging-bridge-admin.ixswap.io
REACT_APP_JUMPTASK_SECURITY_TOKENS=69177dda8b86166a439d30b9bdbb7331
-REACT_APP_DEFAULT_CHAIN_ID=84532
\ No newline at end of file
+REACT_APP_DEFAULT_CHAIN_ID=84532
+REACT_APP_LINE_REWARD_API_URL=https://api.line.ixswap.io
+REACT_APP_LINE_REWARD_API_KEY=91b7c8d5-cf31-49cb-9bde-62363435394d
diff --git a/.env.line-next b/.env.line-next
new file mode 100644
index 0000000000..e64dcde0c2
--- /dev/null
+++ b/.env.line-next
@@ -0,0 +1,26 @@
+REACT_APP_PRODUCTION_APP_URL=app.ixswap.io
+REACT_APP_API_URL=https://api.staging.ixswap.io/v1/
+SKIP_PREFLIGHT_CHECK=true
+REACT_APP_INFURA_KEY="7f00ea5349e64a078e7a9533c9126cef"
+REACT_APP_INFURA_NETWORK_SUBDOMAIN='polygon-mumbai'
+REACT_APP_GOOGLE_ANALYTICS_ID="UA-199572024-1"
+NODE_ENV="test staging env"
+REACT_APP_STAKING_CONTRACT_KOVAN="0xf49A087aA48C0A4f0dEa6428F1175e1bB45CDAa2"
+REACT_APP_SUPPORTED_TGE_CHAINS=[8453,137,8217]
+REACT_APP_IXSALE_ADDRESS_MUMBAI=0x34f23d97a59D3c579b71a70B000d06010ca4e93c
+REACT_APP_IXSALE_ADDRESS_AMOY=0x48d37ee262617c385114B9b795B2e5c1779E570B
+REACT_APP_IXSALE_ADDRESS_POLYGON=0x1642d589EC33E8CD5FD4331ceD827b1ee6dAf242
+REACT_APP_IXSALE_ADDRESS_BASE=0x3af292B0963BF88A875dD10931d8b46560783779
+REACT_APP_WALLET_CONNECT_PROJECT_ID=fd50d8c55e847566ce7e873ba898467e
+ESLINT_NO_DEV_ERRORS=true
+DISABLE_ESLINT_PLUGIN=true
+REACT_APP_SENTRY_DNS=
+REACT_APP_TELEGRAM_VERIFICATION_BOT='ixs_sav_bot'
+REACT_APP_ENV=staging
+REACT_APP_ALCHEMY_KEY="r6GxzZtusoypG9eNhpC41xNNzd5-V0ZJ"
+REACT_APP_BRIDGE_URL=https://staging-bridge.ixswap.io
+REACT_APP_BRIDGE_ADMIN_URL=https://staging-bridge-admin.ixswap.io
+REACT_APP_DEFAULT_CHAIN_ID=8453
+REACT_APP_LIFF_MODE=mainnet
+REACT_APP_LINE_REWARD_API_URL=https://api.line.ixswap.io
+REACT_APP_LINE_REWARD_API_KEY=91b7c8d5-cf31-49cb-9bde-62363435394d
diff --git a/amplify.yml b/amplify.yml
index 9b3ab32f4c..f860abaf70 100644
--- a/amplify.yml
+++ b/amplify.yml
@@ -1,9 +1,7 @@
version: 0.1
resources:
build:
- spec: {
- "size": "BUILD_GENERAL1_MEDIUM"
- }
+ spec: { 'size': 'BUILD_GENERAL1_MEDIUM' }
frontend:
phases:
preBuild:
@@ -30,6 +28,7 @@ frontend:
- if [ "${AWS_BRANCH}" = "staging-client-demo" ]; then cp -fv .env.staging-client-demo .env.test; fi
- if [ "${AWS_BRANCH}" = "upgrade-wallet-connect" ]; then cp -fv .env.staging-client-demo .env.production; fi
- if [ "${AWS_BRANCH}" = "upgrade-wallet-connect" ]; then cp -fv .env.staging-client-demo .env.test; fi
+ - if [ "${AWS_BRANCH}" = "line-next" ]; then cp -fv .env.line-next .env.production; fi
- node -v
- yarn run build
artifacts:
diff --git a/e2e_tests/page-object/adminPage.ts b/e2e_tests/page-object/adminPage.ts
index 7a919b116c..9221683292 100644
--- a/e2e_tests/page-object/adminPage.ts
+++ b/e2e_tests/page-object/adminPage.ts
@@ -11,7 +11,7 @@ export class AdminPage extends WebPage {
readonly rejectAnnotationTextField: Locator;
readonly submitRejectAnnotationButton: Locator;
- kycAdminURL = config.use.baseURL + '#/admin/kyc';
+ kycAdminURL = config.use.baseURL + '/admin/kyc';
constructor(page: Page, context?: BrowserContext) {
super(page, context);
diff --git a/e2e_tests/page-object/kycPage.ts b/e2e_tests/page-object/kycPage.ts
index fbb96f6b60..26824094d2 100644
--- a/e2e_tests/page-object/kycPage.ts
+++ b/e2e_tests/page-object/kycPage.ts
@@ -46,7 +46,7 @@ export class KycPage extends WebPage {
readonly countryOfTaxDeclarationDropdown: Locator;
readonly taxIdentificationNumberField: Locator;
- kycURL = config.use.baseURL + '#/kyc';
+ kycURL = config.use.baseURL + '/kyc';
pendingApprovalText = 'Pending approval';
changesRequestedText = 'Changes Requested';
rejectedText = 'Rejected';
diff --git a/e2e_tests/page-object/liquidityPoolsPage.ts b/e2e_tests/page-object/liquidityPoolsPage.ts
index 7947a6bb94..020338093c 100644
--- a/e2e_tests/page-object/liquidityPoolsPage.ts
+++ b/e2e_tests/page-object/liquidityPoolsPage.ts
@@ -202,7 +202,7 @@ export class LiquidityPoolsPage extends WebPage {
}
async removeCreatedLiqudityPool(pool) {
- await this.page.goto(config.use.baseURL + '#/pool')
+ await this.page.goto(config.use.baseURL + '/pool')
await this.removeLiquidityPool(pool);
}
diff --git a/package.json b/package.json
index 959986e8cc..cc962104e5 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@ethersproject/experimental": "^5.2.0",
- "@ixswap1/default-token-list": "1.5.2",
+ "@ixswap1/default-token-list": "1.5.3",
"@ixswap1/sdk-core": "^1.3.6",
"@ixswap1/v2-core": "^1.0.11",
"@ixswap1/v2-periphery": "^1.0.10",
@@ -75,6 +75,7 @@
"cross-env": "^7.0.2",
"crypto-browserify": "^3.12.0",
"dayjs": "^1.10.5",
+ "eruda": "^3.4.1",
"eslint": "^8.47.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.0",
@@ -166,10 +167,13 @@
"last 1 safari version"
]
},
+ "homepage": "https://line-liff.ixswap.io/",
"license": "GPL-3.0-or-later",
"dependencies": {
"@cyntler/react-doc-viewer": "^1.14.1",
"@date-io/dayjs": "1.x",
+ "@line/liff": "^2.25.1",
+ "@linenext/dapp-portal-sdk": "^1.1.0",
"@material-ui/core": "^4.12.3",
"@material-ui/pickers": "4.0.0-alpha.12",
"@metamask/detect-provider": "^2.0.0",
diff --git a/public/favicon.png b/public/favicon.png
deleted file mode 100644
index ec1d87b6dd..0000000000
Binary files a/public/favicon.png and /dev/null differ
diff --git a/public/index.html b/public/index.html
index f816dec992..25150ec698 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,23 +1,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+