Merge pull request #3 from Access-Labs-Inc/fix/typescript-and-js-fixes

fix/typescript and js fixes

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ on:
       - main
   pull_request:
     branches:
-      - main
+      - '**'
 
 jobs:
   build-ci:
@@ -23,6 +23,6 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --immutable --immutable-cache --check-cache
-      - run: yarn run lint
-      - run: yarn run build-staging-release
-      - run: yarn run test
+      - run: yarn lint
+      - run: yarn build-staging-release
+      - run: yarn test

html-production/index.html

@@ -25,8 +25,9 @@ <h2>The shown widget is for demonstration purpose only</h2>
       _acs_blink('init', {
         element: document.getElementById('acs-blink'),
         debug: true,
-        poolId: 'D9C7Yf5euSjpQ8Wo8XwJP7CWymm54oomeREkogiNf4yS',
-        poolName: "Coingecko",
+        poolName: "The Block",
+        poolId: 'Fxh4hDFHJuTfD3Eq4en36dTk8QvbsSMoTE5Y2hVX3qVt',
+        poolSlug: 'the-block',
       });
     </script>
   </body>

html-staging/index.html

@@ -25,7 +25,8 @@ <h2>The shown widget is for demonstration purpose only</h2>
       _acs_blink('init', {
         element: document.getElementById('acs-blink'),
         debug: true,
-        poolId: '2hQSDVwJLbtwHzi3CKj8pmiQzLyfKZs5ZDhT1QZdHXv3',
+        poolId: 'Fxh4hDFHJuTfD3Eq4en36dTk8QvbsSMoTE5Y2hVX3qVt',
+        poolSlug: 'the-block',
         poolName: "The Block",
       });
     </script>

jest.config.ts

@@ -1,8 +1,13 @@
-import type { Config } from 'jest';
+import type { Config } from '@jest/types';
 
-const config: Config = {
-  verbose: true,
+const config: Config.InitialOptions = {
+  preset: 'ts-jest',
   testEnvironment: 'jsdom',
+  globals: {
+    'ts-jest': {
+      tsconfig: './tsconfig.json',
+    },
+  },
 };
 
 export default config;

package.json

@@ -11,7 +11,7 @@
     "dev": "NODE_ENV=development PORT=3000 webpack serve --env TARGET_ENV=development",
     "lint": "tslint --project tsconfig.json ./src/**/*.tsx ./src/**/*.ts ./src/**/*.js",
     "lint-fix": "tslint --project tsconfig.json ./src/**/*.tsx ./src/**/*.ts ./src/**/*.js --fix",
-    "test": "jest",
+    "test": "tsc && jest",
     "stats": "NODE_ENV=production webpack --env TARGET_ENV=staging --profile --json > stats.json",
     "knip": "knip"
   },
@@ -28,9 +28,10 @@
     "@babel/preset-typescript": "^7.8.3",
     "@babel/runtime": "^7.19.4",
     "@statoscope/webpack-plugin": "^5.24.0",
-    "@tsconfig/recommended": "^1.0.1",
+    "@tsconfig/recommended": "^1.0.7",
     "@types/bn.js": "^5.1.1",
-    "@types/jest": "^25.2.1",
+    "@types/jest": "^29.5.12",
+    "@types/react": "^18.3.3",
     "@types/react-slider": "^1.3.1",
     "autoprefixer": "^10.4.19",
     "babel-loader": "^8.0.6",
@@ -45,7 +46,7 @@
     "dotenv-webpack": "^8.0.1",
     "glob": "^9.3.2",
     "inspectpack": "^4.7.1",
-    "jest": "^29.0.0",
+    "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.2.1",
     "knip": "^0.9.0",
     "mini-css-extract-plugin": "^2.7.5",
@@ -58,9 +59,10 @@
     "style-loader": "^1.1.3",
     "svg-url-loader": "^8.0.0",
     "tailwindcss": "^3.4.4",
+    "ts-jest": "^29.2.1",
     "ts-node": "^10.9.1",
     "tslint": "^5.20.1",
-    "typescript": "^4.6.2",
+    "typescript": "^5",
     "webpack": "^5",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.11.1"
@@ -70,9 +72,9 @@
     "@solana/wallet-adapter-react": "^0.15.35",
     "@solana/wallet-adapter-react-ui": "^0.9.35",
     "@solana/web3.js": "^1.66.1",
+    "@supercharge/promise-pool": "^3.2.0",
     "@tiplink/wallet-adapter": "^2.1.16",
     "@tiplink/wallet-adapter-react-ui": "^0.1.11",
-    "@supercharge/promise-pool": "^3.2.0",
     "bn.js": "^5.2.1",
     "borsh": "^0.7.0",
     "clsx": "^1.2.1",

src/App.tsx

@@ -1,5 +1,5 @@
-import { h } from "preact";
-import React from 'react';
+ // @ts-ignore
+import React, { h } from "preact";
 import { useMemo } from "preact/hooks";
 
 import {

src/components/dialect/ui/ActionContainer.tsx

@@ -1,5 +1,5 @@
-import { h } from 'preact';
-import * as React from 'preact';
+// @ts-ignore
+import React, { h } from 'preact';
 import { useEffect, useMemo, useReducer, useState, useContext } from 'preact/compat';
 import { Buffer } from 'buffer';
 import { ActionLayout, ButtonProps } from './ActionLayout';