fix merge conflicts

.eslintrc

@@ -20,7 +20,6 @@
     "prettier/prettier": [
       "warn"
     ],
-    "@typescript-eslint/no-empty-interface": "warn",
     "@typescript-eslint/typedef": [
       "warn",
       {

package.json

@@ -29,9 +29,11 @@
   },
   "author": "hide-on-bush",
   "dependencies": {
-    "@masa-finance/masa-sdk": "^1.2.0",
+    "@masa-finance/masa-sdk": "^1.4.3",
+    "@metamask/providers": "^10.2.1",
     "react": "^18.2.0",
     "react-query": "^3.39.3",
+    "react-spinners": "^0.13.8",
     "rodal": "^2.0.0"
   },
   "devDependencies": {
@@ -40,6 +42,7 @@
     "@babel/plugin-transform-react-jsx": "^7.14.9",
     "@size-limit/preset-big-lib": "^8.1.0",
     "@size-limit/webpack-why": "^8.1.0",
+    "@storybook/react": "^6.5.16",
     "@types/jest": "^29.4.0",
     "@types/node": "^16.18.11",
     "@types/react": "^18.0.25",
@@ -53,7 +56,7 @@
     "eslint-plugin-flowtype": "^8.0.3",
     "eslint-plugin-prettier": "^4.2.1",
     "fork-ts-checker-webpack-plugin": "^7.3.0",
-    "glob": "^7.1.6",
+    "glob": "^8.1.0",
     "husky": "^8.0.2",
     "jest": "^29.4.1",
     "mini-css-extract-plugin": "^2.7.2",

stories/masa.stories.tsx

@@ -1,9 +1,5 @@
 // @ts-ignore
 import React, { useCallback } from 'react';
-import { MasaProvider } from '../src/common/helpers/provider/masa-provider';
-import { Meta, Story } from '@storybook/react';
-import { useMasa } from '../src/common/helpers/provider/use-masa';
-import { queryClient } from '../src/common/helpers/provider/masa-query-client';
 import { MasaProvider, queryClient, useMasa } from '../src';
 import { Args, Meta, Story } from '@storybook/react';
 

tsconfig.json

@@ -16,6 +16,7 @@
     "sourceMap": true,
     // match output dir to input dir. e.g. dist/index instead of dist/src/index
     "rootDir": "./src",
+    "outDir": "./dist",
     // stricter type-checking for stronger correctness. Recommended by TS
     "strict": true,
     // linter checks for common issues
@@ -28,10 +29,8 @@
     "moduleResolution": "Node",
     // transpile JSX to React.createElement
     "jsx": "react",
-    "noImplicitAny": false
-  },
-  "include": [
-    "src/**/*",
-    "package.json"
-  ]
+    "noImplicitAny": false,
+    "allowSyntheticDefaultImports": true,
+    "noEmit": false
+  }
 }