Skip to content

Commit

Permalink
Merge pull request #864 from telosnetwork/develop
Browse files Browse the repository at this point in the history
Develop to Master - UAL and Cleos, Wax Precision and Pagination
  • Loading branch information
rozzaswap authored Jul 11, 2024
2 parents 75eaa49 + 0e7f2e8 commit 64817cc
Show file tree
Hide file tree
Showing 52 changed files with 678 additions and 1,920 deletions.
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@
"test:coverage": "jest --coverage"
},
"dependencies": {
"@greymass/eosio": "^0.6.8",
"@quasar/extras": "^1.13.4",
"@telosnetwork/ual-cleos": "^1.13.1",
"@wharfkit/session": "^1.2.8",
"@wharfkit/transact-plugin-resource-provider": "^1.1.1",
"@wharfkit/wallet-plugin-anchor": "^1.3.4",
"@wharfkit/wallet-plugin-cleos": "^1.1.1",
"@wharfkit/wallet-plugin-privatekey": "^1.1.0",
"@wharfkit/web-renderer": "^1.2.4",
"axios": "^0.21.1",
"core-js": "^3.6.5",
"csvtojson": "^2.0.10",
Expand All @@ -26,8 +30,6 @@
"ol": "^6.14.1",
"pinia": "^2.1.6",
"quasar": "^2.6.2",
"ual-anchor": "1.3.0",
"universal-authenticator-library": "^0.3.0",
"vue": "^3.3.0",
"vue-json-viewer": "^3.0.4",
"vue-router": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion quasar.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module.exports = configure(function (ctx) {
// app boot file (/src/boot)
// --> boot files are part of "main.js"
// https://quasar.dev/quasar-cli/boot-files
boot: ['config', 'fathom', 'api', 'ual', 'fuel'],
boot: ['config', 'fathom', 'api', 'wharf'],

// https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css
css: ['app.sass'],
Expand Down
2 changes: 1 addition & 1 deletion src/api/eosio_core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
Serializer,
PublicKey,
Name,
} from '@greymass/eosio';
} from '@wharfkit/session';
import { GetTableRowsParams } from 'src/types';
import { Chain } from 'src/types/Chain';
import { getChain } from 'src/config/ConfigManager';
Expand Down
Loading

0 comments on commit 64817cc

Please sign in to comment.