Experimental pull request: don't merge

.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
+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

.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

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:

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);

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';

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);
   }
 

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",

public/index.html

@@ -1,23 +1,22 @@
 <!DOCTYPE html>
 <html lang="en">
-
-<head>
-  <meta charset="utf-8" />
-  <!-- <link rel="icon" href="%PUBLIC_URL%/images/32x32_App_Icon_rounded.png" sizes="32x32">
+  <head>
+    <meta charset="utf-8" />
+    <!-- <link rel="icon" href="%PUBLIC_URL%/images/32x32_App_Icon_rounded.png" sizes="32x32">
   <link rel="icon" href="%PUBLIC_URL%/images/192x192_App_Icon_rounded.png" sizes="192x192"> -->
-  <link rel="apple-touch-icon" href="%PUBLIC_URL%/images/180x180_App_Icon_rounded.png" />
-
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta name="theme-color" content="#0d0415" />
-  <meta name="fortmatic-site-verification" content="j93LgcVZk79qcgyo" />
-  <meta http-equiv="Pragma" content="no-cache" />
-  <meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate" />
-  <!--
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/images/180x180_App_Icon_rounded.png" />
+
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#0d0415" />
+    <meta name="fortmatic-site-verification" content="j93LgcVZk79qcgyo" />
+    <meta http-equiv="Pragma" content="no-cache" />
+    <meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate" />
+    <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-  <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-  <!--
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
@@ -26,102 +25,110 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-  <!-- Google Tag Manager -->
-  <script>
-    ; (function (w, d, s, l, i) {
-      w[l] = w[l] || []
-      w[l].push({
-        'gtm.start': new Date().getTime(),
-        event: 'gtm.js',
-      })
-      var f = d.getElementsByTagName(s)[0],
-        j = d.createElement(s),
-        dl = l != 'dataLayer' ? '&l=' + l : ''
-      j.async = true
-      j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl
-      f.parentNode.insertBefore(j, f)
-    })(window, document, 'script', 'dataLayer', 'GTM-NXWCR4X')
-  </script>
-  <!-- End Google Tag Manager -->
-  <!-- <title>IX Swap</title> -->
-
-  <script>
-    var script = document.createElement('script')
-    // script.src = 'https://tag.safary.club/stag-0.1.5.js'
-    script.defer = true
-    script.setAttribute('data-name', 'safary-sdk')
-    script.setAttribute('data-product-id', 'prd_z2suvagAL5')
-    script.integrity = 'sha256-sFvG3ANXkfEJBbfj+oozHwPgzQSoq4uDCv3xrLblnmM='
-    script.crossOrigin = 'anonymous'
-    var target = document.head || document.body
-    target.appendChild(script)
-  </script>
-
-  <!-- End Safary Tag Manager -->
-</head>
-
-<body style="overflow: auto !important; margin-right: 0 !important;">
-  <!-- Google Tag Manager (noscript) -->
-  <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NXWCR4X" height="0" width="0"
-      style="display: none; visibility: hidden"></iframe></noscript>
-  <!-- End Google Tag Manager (noscript) -->
-
-  <!-- Yandex.Metrika counter -->
-  <script type="text/javascript">
-      ; (function (m, e, t, r, i, k, a) {
-        m[i] =
-          m[i] ||
-          function () {
-            ; (m[i].a = m[i].a || []).push(arguments)
-          }
-        m[i].l = 1 * new Date()
-          ; (k = e.createElement(t)),
-            (a = e.getElementsByTagName(t)[0]),
-            (k.async = 1),
-            (k.src = r),
-            a.parentNode.insertBefore(k, a)
-      })(window, document, 'script', 'https://mc.yandex.ru/metrika/tag.js', 'ym')
-
-    ym(84960586, 'init', {
-      clickmap: true,
-      trackLinks: true,
-      accurateTrackBounce: true,
-      webvisor: true,
-    })
-  </script>
-  <!-- Start of ixshelp Zendesk Widget script -->
-  <script id="ze-snippet"
-    src="https://static.zdassets.com/ekr/snippet.js?key=4d547246-9c3f-4783-bbfa-13a71f7344e5"></script>
-  <!-- End of ixshelp Zendesk Widget script -->
-
-  <noscript>
-    <div><img src="https://mc.yandex.ru/watch/84960586" style="position: absolute; left: -9999px" alt="" /></div>
-  </noscript>
-  <!-- /Yandex.Metrika counter -->
-
-  <!-- Global site tag (gtag.js) - Google Analytics -->
-  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-199572024-1"></script>
-  <script>
-    window.dataLayer = window.dataLayer || []
-    function gtag() {
-      dataLayer.push(arguments)
-    }
-    gtag('js', new Date())
-
-    gtag('config', 'UA-199572024-1')
-  </script>
-  <!-- /Global site tag (gtag.js) - Google Analytics -->
-
-  <noscript>You need to enable JavaScript to run this app.</noscript>
-
-  <!-- The root is the container of the app -->
-  <div id="root">
-    <!-- Triggers the font to load immediately and then is replaced by the app -->
-    <div style="visibility: hidden">X</div>
-  </div>
-  <div id="fake-approval"></div>
-
-  <!--
+    <!-- Google Tag Manager -->
+    <script>
+      ;(function (w, d, s, l, i) {
+        w[l] = w[l] || []
+        w[l].push({
+          'gtm.start': new Date().getTime(),
+          event: 'gtm.js',
+        })
+        var f = d.getElementsByTagName(s)[0],
+          j = d.createElement(s),
+          dl = l != 'dataLayer' ? '&l=' + l : ''
+        j.async = true
+        j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl
+        f.parentNode.insertBefore(j, f)
+      })(window, document, 'script', 'dataLayer', 'GTM-NXWCR4X')
+    </script>
+    <!-- End Google Tag Manager -->
+    <!-- <title>IX Swap</title> -->
+
+    <script>
+      var script = document.createElement('script')
+      // script.src = 'https://tag.safary.club/stag-0.1.5.js'
+      script.defer = true
+      script.setAttribute('data-name', 'safary-sdk')
+      script.setAttribute('data-product-id', 'prd_z2suvagAL5')
+      script.integrity = 'sha256-sFvG3ANXkfEJBbfj+oozHwPgzQSoq4uDCv3xrLblnmM='
+      script.crossOrigin = 'anonymous'
+      var target = document.head || document.body
+      target.appendChild(script)
+    </script>
+
+    <!-- End Safary Tag Manager -->
+  </head>
+
+  <body style="overflow: auto !important; margin-right: 0 !important">
+    <!-- Google Tag Manager (noscript) -->
+    <noscript
+      ><iframe
+        src="https://www.googletagmanager.com/ns.html?id=GTM-NXWCR4X"
+        height="0"
+        width="0"
+        style="display: none; visibility: hidden"
+      ></iframe
+    ></noscript>
+    <!-- End Google Tag Manager (noscript) -->
+
+    <!-- Yandex.Metrika counter -->
+    <!-- <script type="text/javascript"> -->
+    <!--   ;(function (m, e, t, r, i, k, a) { -->
+    <!--     m[i] = -->
+    <!--       m[i] || -->
+    <!--       function () { -->
+    <!--         ;(m[i].a = m[i].a || []).push(arguments) -->
+    <!--       } -->
+    <!--     m[i].l = 1 * new Date() -->
+    <!--     ;(k = e.createElement(t)), -->
+    <!--       (a = e.getElementsByTagName(t)[0]), -->
+    <!--       (k.async = 1), -->
+    <!--       (k.src = r), -->
+    <!--       a.parentNode.insertBefore(k, a) -->
+    <!--   })(window, document, 'script', 'https://mc.yandex.ru/metrika/tag.js', 'ym') -->
+
+    <!--   ym(84960586, 'init', { -->
+    <!--     clickmap: true, -->
+    <!--     trackLinks: true, -->
+    <!--     accurateTrackBounce: true, -->
+    <!--     webvisor: true, -->
+    <!--   }) -->
+    <!-- </script> -->
+    <!-- Start of ixshelp Zendesk Widget script -->
+    <script
+      id="ze-snippet"
+      src="https://static.zdassets.com/ekr/snippet.js?key=4d547246-9c3f-4783-bbfa-13a71f7344e5"
+    ></script>
+    <!-- End of ixshelp Zendesk Widget script -->
+
+    <!-- <noscript> -->
+    <!--   <div><img src="https://mc.yandex.ru/watch/84960586" style="position: absolute; left: -9999px" alt="" /></div> -->
+    <!-- </noscript> -->
+    <!-- /Yandex.Metrika counter -->
+
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-199572024-1"></script>
+    <script>
+      window.dataLayer = window.dataLayer || []
+      function gtag() {
+        dataLayer.push(arguments)
+      }
+      gtag('js', new Date())
+
+      gtag('config', 'UA-199572024-1')
+    </script>
+    <!-- /Global site tag (gtag.js) - Google Analytics -->
+
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+
+    <!-- The root is the container of the app -->
+    <div id="root">
+      <!-- Triggers the font to load immediately and then is replaced by the app -->
+      <div style="visibility: hidden">X</div>
+    </div>
+    <div id="fake-approval"></div>
+
+    <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
 
@@ -131,6 +138,6 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
-</body>
+  </body>
+</html>
 
-</html>