merge main

DeFiCh · Nov 9, 2023 · 1b1327a · 1b1327a
2 parents 65d90ad + e54a76b
commit 1b1327a
Show file tree

Hide file tree

Showing 5 changed files with 294 additions and 23 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,19 +1,19 @@
 # Define individuals that are responsible for code in a repository.
 # More details are here: https://help.github.com/articles/about-codeowners/
 
-/.github/                                       @thedoublejay @kyleleow @pierregee
-/.husky/                                        @thedoublejay @kyleleow @pierregee
+/.github/                                       @pierregee @fullstackninja864 @lykalabrada
+/.husky/                                        @pierregee @fullstackninja864 @lykalabrada
 
-/src                                            @thedoublejay @kyleleow @pierregee @fullstackninja864 @lykalabrada
-/public                                         @thedoublejay @kyleleow @pierregee @fullstackninja864 @lykalabrada
+/src                                            @pierregee @fullstackninja864 @lykalabrada
+/public                                         @pierregee @fullstackninja864 @lykalabrada
 
-netlify.toml                                    @thedoublejay @kyleleow @pierregee
-tsconfig.json                                   @thedoublejay @kyleleow @pierregee
+netlify.toml                                    @pierregee @fullstackninja864 @lykalabrada
+tsconfig.json                                   @pierregee @fullstackninja864 @lykalabrada
 
-package.json                                    @thedoublejay @kyleleow @pierregee
-package-lock.json                               @thedoublejay @kyleleow @pierregee
-/docker-compose.yml                             @thedoublejay @kyleleow @pierregee
+package.json                                    @pierregee @fullstackninja864 @lykalabrada
+package-lock.json                               @pierregee @fullstackninja864 @lykalabrada
+/docker-compose.yml                             @pierregee @fullstackninja864 @lykalabrada
 
-CONTRIBUTING.md                                 @thedoublejay @kyleleow @pierregee
-README.md                                       @thedoublejay @kyleleow @pierregee
-LICENSE                                         @thedoublejay @kyleleow @pierregee
+CONTRIBUTING.md                                 @pierregee @fullstackninja864 @lykalabrada
+README.md                                       @pierregee @fullstackninja864 @lykalabrada
+LICENSE                                         @pierregee @fullstackninja864 @lykalabrada
diff --git a/.github/workflows/ci-e2e.yml b/.github/workflows/ci-e2e.yml
@@ -39,12 +39,11 @@ jobs:
           install: false
           record: true
           parallel: true
-          build: pnpm run cypress:build
-          start: pnpm run start
-          wait-on: "http://localhost:3000"
+          start: pnpm dev
           browser: chrome
           spec: cypress/e2e/**
           tag: ${{ github.event_name }}
+          working-directory: ./apps/web
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/apps/web/src/pages/tx/[tid].tsx b/apps/web/src/pages/tx/[tid].tsx
@@ -33,7 +33,6 @@ export default function Transaction({
   const gasUsedPercentage = new BigNumber(txDetails.gasUsed)
     .dividedBy(txDetails.gasLimit)
     .multipliedBy(100)
-    .toFixed(2);
   const timeDuration = getDuration(Number(txDetails.timeInSec));
   const timeInUTC = formatDateToUTC(txDetails.timestamp);
 
@@ -226,7 +225,7 @@ export default function Transaction({
             gasPrice={gasPrice}
             gasLimit={txDetails.gasLimit}
             gasUsed={txDetails.gasUsed}
-            gasUsedPercentage={gasUsedPercentage}
+            gasUsedPercentage={gasUsedPercentage.isNaN() ? "0" : gasUsedPercentage.toFixed(2)}
             nonce={txDetails.nonce}
             from={txDetails.from}
             to={txDetails.to}

diff --git a/package.json b/package.json
@@ -15,10 +15,10 @@
     "write": "turbo run write"
   },
   "dependencies": {
+    "@waveshq/standard-defichain-jellyfishsdk": "^1.9.3",
     "@floating-ui/react-dom": "^1.3.0",
     "@headlessui/react": "^1.7.15",
     "@reduxjs/toolkit": "^1.9.5",
-    "@waveshq/standard-defichain-jellyfishsdk": "^2.4.1",
     "@waveshq/standard-web": "^1.0.4",
     "@waveshq/walletkit-core": "^1.3.8",
     "bignumber.js": "^9.1.1",