feat: merge main

.github/workflows/dev.yml

@@ -10,7 +10,7 @@ jobs:
      secrets:
        secretBuildArgs: |
          SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-         GITHUB_TOKEN=${{ secrets.GH_AUTH_TOKEN }}
+         GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
      with:
        namespace: "solarswap-dev"
        ingressEnabled: "yes"
@@ -25,7 +25,7 @@ jobs:
         NEXT_PUBLIC_NODE_PRODUCTION=https://rpc.astranaut.dev
         NEXT_PUBLIC_HOST=https://defi.astranaut.dev
         NEXT_PUBLIC_EXPLORER=http://explorer.astranaut.dev
-        NEXT_PUBLIC_GTAG=''
+        NEXT_PUBLIC_GA_MEASUREMENT_ID=''
         NEXT_PUBLIC_FEE=100
         NEXT_PUBLIC_TITLE=SolarSwap
         NEXT_PUBLIC_WALLET_CONNECT_RELAY=relay.walletconnect.com

.github/workflows/integrationTests.yml

@@ -21,8 +21,7 @@ jobs:
                   node-version: 16.x
                   registry-url: 'https://npm.pkg.github.com'
                   scope: '@astraprotocol'
-                  token: ${{ secrets.GH_AUTH_TOKEN }}
-                  # token: ${{ secrets.PAT_ASTRAPROTOCOL }}
+                  token: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Get yarn cache directory path
               id: yarn-cache-dir-path
@@ -38,17 +37,15 @@ jobs:
                   restore-keys: |
                       ${{ runner.os }}-yarn-
             - name: Setup npm token
-              run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GH_AUTH_TOKEN}}"
-              # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}"
+              run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}"
 
             - name: Setup for cypress
               run: sudo apt-get update -y && sudo apt-get install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb -y
 
             - name: Cypress install
               run: yarn install --frozen-lockfile
               env:
-                  NODE_AUTH_TOKEN: ${{ secrets.GH_AUTH_TOKEN }}
-                  # NODE_AUTH_TOKEN: ${{ secrets.PAT_ASTRAPROTOCOL }}
+                  NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             - name: make env
               uses: canastro/copy-file-action@master
               with:
@@ -63,7 +60,6 @@ jobs:
                   wait-on: 'http://localhost:3000'
               env:
                   # pass the Cypress Cloud record key as an environment variable
-                  CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
                   # Recommended: pass the GitHub token lets this action correctly
                   # determine the unique run id necessary to re-run the checks
-                  GITHUB_TOKEN: ${{ secrets.GH_AUTH_TOKEN }}
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

@@ -27,8 +27,7 @@ jobs:
                   node-version: 16.x
                   registry-url: 'https://npm.pkg.github.com'
                   scope: '@astraprotocol'
-                  token: ${{ secrets.GH_AUTH_TOKEN }}
-                  # token: ${{ secrets.PAT_ASTRAPROTOCOL }}
+                  token: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Get yarn cache directory path
               id: yarn-cache-dir-path
@@ -45,8 +44,7 @@ jobs:
                       ${{ runner.os }}-yarn-
 
             - name: Setup npm token
-              run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GH_AUTH_TOKEN}}"
-              # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}"
+              run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}"
 
             - name: Install dependencies
               run: yarn install --frozen-lockfile

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
         NEXT_PUBLIC_NODE_PRODUCTION=https://rpc.astranaut.io
         NEXT_PUBLIC_HOST=https://solarswap.io
         NEXT_PUBLIC_EXPLORER=http://explorer.astranaut.io
-        NEXT_PUBLIC_GTAG=G-MK9VVY7GT5
+        NEXT_PUBLIC_GA_MEASUREMENT_ID=G-MK9VVY7GT5
         NEXT_PUBLIC_FEE=100
         NEXT_PUBLIC_TITLE=SolarSwap
         NEXT_PUBLIC_WALLET_CONNECT_RELAY=wc-relay.astranaut.io

.github/workflows/testConfig.yml

@@ -29,8 +29,7 @@ jobs:
                   node-version: 16.x
                   registry-url: 'https://npm.pkg.github.com'
                   scope: '@astraprotocol'
-                  token: ${{ secrets.GH_AUTH_TOKEN }}
-                  # token: ${{ secrets.PAT_ASTRAPROTOCOL }}
+                  token: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Get yarn cache directory path
               id: yarn-cache-dir-path
@@ -46,8 +45,7 @@ jobs:
                   restore-keys: |
                       ${{ runner.os }}-yarn-
             - name: Setup npm token
-              run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GH_AUTH_TOKEN}}"
-              # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}"
+              run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}"
 
             - name: Install dependencies
               run: yarn install --frozen-lockfile

.github/workflows/unitTests.yml

@@ -27,8 +27,7 @@ jobs:
                   node-version: 16.x
                   registry-url: 'https://npm.pkg.github.com'
                   scope: '@astraprotocol'
-                  token: ${{ secrets.GH_AUTH_TOKEN }}
-                  # token: ${{ secrets.PAT_ASTRAPROTOCOL }}
+                  token: ${{ secrets.GITHUB_TOKEN }}
 
             - name: Get yarn cache directory path
               id: yarn-cache-dir-path
@@ -45,8 +44,7 @@ jobs:
                       ${{ runner.os }}-yarn-
 
             - name: Setup npm token
-              run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GH_AUTH_TOKEN}}"
-              # run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.PAT_ASTRAPROTOCOL}}"
+              run: npm config set '//npm.pkg.github.com/:_authToken' "${{secrets.GITHUB_TOKEN}}"
 
             - name: Install dependencies
               run: yarn install --frozen-lockfile

Dockerfile

@@ -38,6 +38,7 @@ ARG NEXT_PUBLIC_SENTRY_DSN
 ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
 ARG NEXT_PUBLIC_GN_INFO_CLIENT
 ARG NEXT_PUBLIC_GN_BLOCK_CLIENT
+ARG NEXT_PUBLIC_GA_MEASUREMENT_ID
 
 COPY --from=deps /app/node_modules ./node_modules
 COPY --from=deps /app/src ./src
@@ -50,7 +51,7 @@ RUN SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN} \
     NEXT_PUBLIC_NODE_PRODUCTION=${NEXT_PUBLIC_NODE_PRODUCTION} \
     NEXT_PUBLIC_HOST=${NEXT_PUBLIC_HOST} \
     NEXT_PUBLIC_EXPLORER=${NEXT_PUBLIC_EXPLORER} \
-    NEXT_PUBLIC_GTAG=${NEXT_PUBLIC_GTAG} \
+    NEXT_PUBLIC_GA_MEASUREMENT_ID=${NEXT_PUBLIC_GA_MEASUREMENT_ID} \
     NEXT_PUBLIC_FEE=${NEXT_PUBLIC_FEE} \
     NEXT_PUBLIC_TITLE=${NEXT_PUBLIC_TITLE} \
     NEXT_PUBLIC_WALLET_CONNECT_RELAY=${NEXT_PUBLIC_WALLET_CONNECT_RELAY} \

package.json

@@ -42,7 +42,7 @@
 		"@astra-sdk/connector": "^2.0.0",
 		"@astra-sdk/wallet-connect": "^2.0.0",
 		"@astra-sdk/walletconnect-connector": "^2.0.0",
-		"@astraprotocol/astra-ui": "^1.0.44",
+		"@astraprotocol/astra-ui": "^1.0.46",
 		"@ethersproject/abi": "^5.5.0",
 		"@ethersproject/address": "^5.5.0",
 		"@ethersproject/bignumber": "^5.5.0",
@@ -77,14 +77,17 @@
 		"framer-motion": "^4.1.17",
 		"graphql": "^15.5.0",
 		"graphql-request": "^3.4.0",
-		"lightweight-charts": "^3.5.0",
+		"jotai": "2.2.3",
+		"lightweight-charts": "^4.0.1",
 		"lint-staged": "^12.3.4",
 		"local-storage": "^2.0.0",
 		"lodash": "^4.17.21",
 		"multicodec": "^2.0.0",
 		"multihashes": "^3.0.1",
 		"next": "^12.1.0",
+		"next-seo": "6.1.0",
 		"next-themes": "^0.1.1",
+		"nextjs-google-analytics": "2.3.3",
 		"numeral": "^2.0.6",
 		"react": "^18.2.0",
 		"react-countup": "^6.4.0",
@@ -100,7 +103,7 @@
 		"recharts": "2.7.2",
 		"redux-persist": "^6.0.0",
 		"sharp": "^0.31.3",
-		"swr": "^1.2.2",
+		"swr": "^2.1.5",
 		"typescript": "^4.5.4"
 	},
 	"devDependencies": {

public/locales/en-US.json

@@ -1608,5 +1608,15 @@
 	"Error importing list": "Error importing list",
 	"Enter valid list location": "Enter valid list location",
 	"Phishing warning: Please make sure you’re visiting": "Phishing warning: Please make sure you’re visiting",
-	"Check the URL carefully": "Check the URL carefully"
+	"Check the URL carefully": "Check the URL carefully",
+	"No pair has been created with this token yet. Create one": "No pair has been created with this token yet. Create one",
+	"Solarswap Info & Analytics": "Solarswap Info & Analytics",
+	"Pairs": "Pairs",
+	"Pair": "Pair",
+	"Token": "Token",
+	"Top Pair": "Top Pair",
+	"All Pairs": "All Pairs",
+	"Before trading any token, please DYOR, and pay attention to the risk scanner.": "Before trading any token, please DYOR, and pay attention to the risk scanner.",
+	"The markets for some of the newer and low-cap tokens displayed on the v2 info page are highly volatile, and as a result, token information may not be accurate.": "The markets for some of the newer and low-cap tokens displayed on the v2 info page are highly volatile, and as a result, token information may not be accurate.",
+	"Search liquidity pairs or tokens": "Search liquidity pairs or tokens"
 }

public/locales/vi-VN.json

@@ -1608,5 +1608,15 @@
 	"Error importing list": "Lỗi khi nhập danh sách",
 	"Enter valid list location": "Nhập địa chỉ danh sách không hợp lệ",
 	"Phishing warning: Please make sure you’re visiting": "Cảnh báo lừa đảo: Vui lòng đảm bảo bạn đang truy cập",
-	"Check the URL carefully": "Hãy kiểm tra URL cẩn thận"
+	"Check the URL carefully": "Hãy kiểm tra URL cẩn thận",
+	"No pair has been created with this token yet. Create one": "Chưa có cặp nào được tạo với điểm thưởng này. Hãy tạo một cặp",
+	"Solarswap Info & Analytics": "Solarswap Thông tin và Phân tích",
+	"Pairs": "Cặp",
+	"Pair": "Cặp",
+	"Token": "Điểm",
+	"Top Pairs": "Cặp hàng đầu",
+	"All Pairs": "Toàn bộ cặp",
+	"Before trading any token, please DYOR, and pay attention to the risk scanner.": "Trước khi giao dịch bất kỳ điểm nào, vui lòng DYOR và chú ý đến trình quét rủi ro.",
+	"The markets for some of the newer and low-cap tokens displayed on the v2 info page are highly volatile, and as a result, token information may not be accurate.": "Thị trường của một số điểm mới hơn và có vốn hóa thấp được hiển thị trên trang thông tin v2 rất biến động và do đó, thông tin về điểm có thể không chính xác.",
+	"Search liquidity pairs or tokens": "Tìm kiếm các cặp thanh khoản hoặc điểm"
 }

src/__tests__/views/info/utils/infoData.test.ts

@@ -1,94 +1,94 @@
 import {
 	getAmountChange,
-	getPercentChange,
 	getChangeForPeriod,
 	getLpFeesAndApr,
+	getPercentChange,
 } from 'views/Info/utils/infoDataHelpers'
 
 describe('info/utils/infoDataHelpers', () => {
 	test.todo('Add test back')
-		it.each`
-			valueNow     | valueBefore  | expected
-			${undefined} | ${undefined} | ${0}
-			${1234}      | ${undefined} | ${1234}
-			${1000}      | ${11}        | ${989}
-			${1234}      | ${123}       | ${1111}
-			${1234.69}   | ${123.45}    | ${1111.24}
-			${200}       | ${350}       | ${-150}
-		`('getAmountChange returns $expected for $valueNow and $valueBefore', ({ valueNow, valueBefore, expected }) => {
-			const actual = getAmountChange(valueNow, valueBefore)
-			expect(actual).toBe(expected)
-		})
+	it.each`
+		valueNow     | valueBefore  | expected
+		${undefined} | ${undefined} | ${0}
+		${1234}      | ${undefined} | ${1234}
+		${1000}      | ${11}        | ${989}
+		${1234}      | ${123}       | ${1111}
+		${1234.69}   | ${123.45}    | ${1111.24}
+		${200}       | ${350}       | ${-150}
+	`('getAmountChange returns $expected for $valueNow and $valueBefore', ({ valueNow, valueBefore, expected }) => {
+		const actual = getAmountChange(valueNow, valueBefore)
+		expect(actual).toBe(expected)
+	})
 
-		it.each`
-			valueNow     | valueBefore  | expected
-			${undefined} | ${undefined} | ${0}
-			${1234}      | ${undefined} | ${0}
-			${100}       | ${50}        | ${100}
-			${100}       | ${80}        | ${25}
-			${100}       | ${200}       | ${-50}
-			${100}       | ${400}       | ${-75}
-			${100}       | ${100}       | ${0}
-		`('getPercentChange returns $expected for $valueNow and $valueBefore', ({ valueNow, valueBefore, expected }) => {
-			const actual = getPercentChange(valueNow, valueBefore)
-			expect(actual).toBe(expected)
-		})
+	it.each`
+		valueNow     | valueBefore  | expected
+		${undefined} | ${undefined} | ${0}
+		${1234}      | ${undefined} | ${0}
+		${100}       | ${50}        | ${100}
+		${100}       | ${80}        | ${25}
+		${100}       | ${200}       | ${-50}
+		${100}       | ${400}       | ${-75}
+		${100}       | ${100}       | ${0}
+	`('getPercentChange returns $expected for $valueNow and $valueBefore', ({ valueNow, valueBefore, expected }) => {
+		const actual = getPercentChange(valueNow, valueBefore)
+		expect(actual).toBe(expected)
+	})
 
-		it.each`
-			valueNow     | valueOnePeriodAgo | valueTwoPeriodsAgo | expected
-			${undefined} | ${undefined}      | ${undefined}       | ${[0, 0]}
-			${100}       | ${undefined}      | ${undefined}       | ${[100, 0]}
-			${100}       | ${50}             | ${undefined}       | ${[50, 0]}
-			${100}       | ${20}             | ${undefined}       | ${[80, 300]}
-			${100}       | ${20}             | ${10}              | ${[80, 700]}
-			${100}       | ${90}             | ${70}              | ${[10, -50]}
-		`(
-			'getChangeForPeriod returns $expected for $valueNow, $valueOnePeriodAgo and $valueTwoPeriodsAgo',
-			({ valueNow, valueOnePeriodAgo, valueTwoPeriodsAgo, expected }) => {
-				const actual = getChangeForPeriod(valueNow, valueOnePeriodAgo, valueTwoPeriodsAgo)
-				expect(actual).toStrictEqual(expected)
-			},
-		)
+	it.each`
+		valueNow     | valueOnePeriodAgo | valueTwoPeriodsAgo | expected
+		${undefined} | ${undefined}      | ${undefined}       | ${[0, 0]}
+		${100}       | ${undefined}      | ${undefined}       | ${[100, 0]}
+		${100}       | ${50}             | ${undefined}       | ${[50, 0]}
+		${100}       | ${20}             | ${undefined}       | ${[80, 300]}
+		${100}       | ${20}             | ${10}              | ${[80, 700]}
+		${100}       | ${90}             | ${70}              | ${[10, -50]}
+	`(
+		'getChangeForPeriod returns $expected for $valueNow, $valueOnePeriodAgo and $valueTwoPeriodsAgo',
+		({ valueNow, valueOnePeriodAgo, valueTwoPeriodsAgo, expected }) => {
+			const actual = getChangeForPeriod(valueNow, valueOnePeriodAgo, valueTwoPeriodsAgo)
+			expect(actual).toStrictEqual(expected)
+		},
+	)
 
-		it.each`
-			volumeUSD | volumeUSDWeek | liquidityUSD | expected
-			${0} | ${0} | ${0} | ${{
-		totalFees24h: 0,
-		totalFees7d: 0,
-		lpFees24h: 0,
-		lpFees7d: 0,
-		lpApr7d: 0,
-	}}
-			${100} | ${0} | ${0} | ${{
-		totalFees24h: 1,
-		totalFees7d: 0,
-		lpFees24h: 0.7,
-		lpFees7d: 0,
-		lpApr7d: 0,
-	}}
-			${100} | ${1000} | ${0} | ${{
-		totalFees24h: 1,
-		totalFees7d: 10,
-		lpFees24h: 0.7,
-		lpFees7d: 7,
-		lpApr7d: 0,
-	}}
-			${1000} | ${10000} | ${1000} | ${{
-		totalFees24h: 10,
-		totalFees7d: 100,
-		lpFees24h: 7,
-		lpFees7d: 70,
-		lpApr7d: 365,
-	}}
-		`(
-			'getLpFeesAndApr returns expected fees and APR for $volumeUSD, $volumeUSDWeek and $liquidityUSD',
-			({ volumeUSD, volumeUSDWeek, liquidityUSD, expected }) => {
-				const actual = getLpFeesAndApr(volumeUSD, volumeUSDWeek, liquidityUSD)
-				// Round actual to avoid rounding errors during comparison
-				Object.keys(actual).forEach(key => {
-					actual[key] = parseFloat(actual[key].toFixed(2))
-				})
-				expect(actual).toStrictEqual(expected)
-			},
-		)
+	it.each`
+		volumeUSD | volumeUSDWeek | liquidityUSD | expected
+		${0} | ${0} | ${0} | ${{
+	totalFees24h: 0,
+	totalFees7d: 0,
+	lpFees24h: 0,
+	lpFees7d: 0,
+	lpApr7d: 0,
+}}
+		${100} | ${0} | ${0} | ${{
+	totalFees24h: 1,
+	totalFees7d: 0,
+	lpFees24h: 0.7,
+	lpFees7d: 0,
+	lpApr7d: 0,
+}}
+		${100} | ${1000} | ${0} | ${{
+	totalFees24h: 1,
+	totalFees7d: 10,
+	lpFees24h: 0.7,
+	lpFees7d: 7,
+	lpApr7d: 0,
+}}
+		${1000} | ${10000} | ${1000} | ${{
+	totalFees24h: 10,
+	totalFees7d: 100,
+	lpFees24h: 7,
+	lpFees7d: 70,
+	lpApr7d: 365,
+}}
+	`(
+		'getLpFeesAndApr returns expected fees and APR for $volumeUSD, $volumeUSDWeek and $liquidityUSD',
+		({ volumeUSD, volumeUSDWeek, liquidityUSD, expected }) => {
+			const actual = getLpFeesAndApr(volumeUSD, volumeUSDWeek, liquidityUSD)
+			// Round actual to avoid rounding errors during comparison
+			Object.keys(actual).forEach(key => {
+				actual[key] = parseFloat(actual[key].toFixed(2))
+			})
+			expect(actual).toStrictEqual(expected)
+		},
+	)
 })

src/__tests__/views/info/utils/infoQueryHelpers.test.ts

@@ -1,4 +1,4 @@
-import { getDeltaTimestamps } from 'views/Info/utils/infoQueryHelpers'
+import { getDeltaTimestamps } from 'utils/getDeltaTimestamps'
 
 const UTC_NOW_UNDER_TEST = 1624809600