Merge pull request #80 from jediswaplabs/retroboy/swap-ui

ui fixes

.eslintrc.js

@@ -85,6 +85,7 @@ module.exports = {
     'jsx-a11y/tabindex-no-positive': 'off',
     '@typescript-eslint/ban-ts-ignore': 'off',
     '@typescript-eslint/ban-ts-comment': 'off',
+    '@typescript-eslint/no-empty-function': 'off',
     'react/jsx-filename-extension': 'off',
     'max-len': 'off',
     'max-params': ['error', 3],
@@ -97,13 +98,15 @@ module.exports = {
     'no-extra-boolean-cast': 0,
     'no-plusplus': 'off',
     'no-prototype-builtins': 'off',
+    'no-nested-ternary': 'off',
     'no-restricted-properties': 'off',
     'no-restricted-syntax': 'off',
     'no-promise-executor-return': 'off',
-    'no-unused-vars': ['error', {
+    'no-unused-vars': ['off', {
       varsIgnorePattern: 'Fragment', ignoreRestSiblings: true,
     }],
-    '@typescript-eslint/no-unused-vars': 'error',
+    'linebreak-style': 0,
+    '@typescript-eslint/no-unused-vars': 'off',
     'no-use-before-define': 'off',
     'object-curly-newline': ['error', {
       ObjectExpression: { consistent: true },

.github/workflows/jediswap-mainnet.yml

@@ -106,4 +106,8 @@ jobs:
       - name: Run Cache Invalidation
         run: aws cloudfront create-invalidation --distribution-id $CDN_DISTRIBUTION_ID --paths /\*
         env:
+<<<<<<< HEAD
           CDN_DISTRIBUTION_ID: ${{ secrets.AWS_CDN_DISTRIBUTION_ID }}
+=======
+          CDN_DISTRIBUTION_ID: ${{ secrets.AWS_CDN_DISTRIBUTION_ID }}
+>>>>>>> d2a7f2f5a171ea0ae113d50e1bf5b40cdd8891df

.github/workflows/jediswap-testnet.yml

@@ -43,4 +43,8 @@ jobs:
       - name: Run Cache Invalidation
         run: aws cloudfront create-invalidation --distribution-id $CDN_DISTRIBUTION_ID --paths /\*
         env:
+<<<<<<< HEAD
           CDN_DISTRIBUTION_ID: ${{ secrets.AWS_CDN_DISTRIBUTION_ID }}
+=======
+          CDN_DISTRIBUTION_ID: ${{ secrets.AWS_CDN_DISTRIBUTION_ID }}
+>>>>>>> d2a7f2f5a171ea0ae113d50e1bf5b40cdd8891df

.vscode/settings.json

@@ -2,13 +2,6 @@
   "npm.packageManager": "yarn",
   "typescript.updateImportsOnFileMove.enabled": "always",
   "javascript.updateImportsOnFileMove.enabled": "always",
-  "editor.formatOnSaveMode": "file",
-  "editor.tabCompletion": "on",
-  "editor.tabSize": 2,
-  "editor.inlineSuggest.enabled": true,
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "editor.formatOnSave": true,
-  "editor.formatOnPaste": false,
   "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
@@ -18,5 +11,10 @@
   "files.eol": "\n",
   "eslint.enable": true,
   "eslint.debug": true,
-  "prettier.trailingComma": "none",
-}
+  "extensions.disabled": [
+    "ms-vscode.jscs",
+    "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode",
+    "rvest.vs-code-prettier-eslint"
+  ]
+}

package.json

@@ -69,7 +69,7 @@
     "@cloudflare/workers-types": "^4.20230710.1",
     "@craco/craco": "^7.1.0",
     "@ethersproject/experimental": "^5.4.0",
-    "@lingui/cli": "^4.3.0",
+    "@lingui/cli": "^4.5.0",
     "@lingui/swc-plugin": "^4.0.4",
     "@swc/core": "^1.3.72",
     "@swc/jest": "^0.2.27",
@@ -155,6 +155,7 @@
     "yarn-deduplicate": "^6.0.0"
   },
   "dependencies": {
+    "@argent/starknet-react-webwallet-connector": "^6.4.2",
     "@apollo/client": "^3.7.2",
     "@coinbase/wallet-sdk": "^3.6.4",
     "@fontsource/ibm-plex-mono": "^4.5.1",