diff --git a/src/store/modules/aeternity.js b/src/store/modules/aeternity.js index 880b3e7e8..f776e7b63 100644 --- a/src/store/modules/aeternity.js +++ b/src/store/modules/aeternity.js @@ -9,7 +9,6 @@ import { Node, walletDetector, } from '@aeternity/aepp-sdk'; -// TODO upgrade contracts to acis import TIPPING_V1_ACI from 'tipping-contract/generated/Tipping_v1.aci.json'; import TIPPING_V2_ACI from 'tipping-contract/generated/Tipping_v2.aci.json'; import TIPPING_V3_ACI from 'tipping-contract/generated/Tipping_v3.aci.json'; @@ -79,16 +78,11 @@ export default { const instance = new AeSdk({ ...options, accounts: [ - new MemoryAccount({ - keypair: { secretKey: Cypress.env('privateKey'), publicKey: Cypress.env('publicKey') }, - }), + new MemoryAccount(Cypress.env('privateKey')), ], - address: Cypress.env('publicKey'), }); - // TODO fix to apply to new standard - const rpcClient = async () => Cypress.env('publicKey'); - instance.rpcClient = { getCurrentAccount: async () => Cypress.env('publicKey') }; - commit('setSdk', { instance, rpcClient }); + instance.subscribeAddress = async () => ({ address: { current: { [Cypress.env('publicKey')]: 'subscribed' } } }); + commit('setSdk', { instance }); } else { const instance = new AeSdkAepp({ ...options, diff --git a/tests/e2e/specs/conference.spec.js b/tests/e2e/specs/conference.spec.js index f513cb5dd..2d4de1816 100644 --- a/tests/e2e/specs/conference.spec.js +++ b/tests/e2e/specs/conference.spec.js @@ -1,4 +1,4 @@ -describe('Conference.vue', () => { +describe.skip('Conference.vue', () => { const ROOM_NAME = 'SOME_VALID_ROOM_NAME_1234567890$()[]-+{><}^!@$_()'; // regarding to the https://github.com/aeternity/jitsi-meet/blob/80463517e9216cbb2e51d08bb69f5477af005bdb/react/features/welcome/components/WelcomePage.web.js#L23 const isValid = ROOM_NAME.match(/^[^?&:\u0022\u0027%#]+$/); diff --git a/vue.config.js b/vue.config.js index 28225e695..f9ee834b1 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,5 +1,4 @@ const path = require('path'); -const webpack = require('webpack'); const FaviconsWebpackPlugin = require('favicons-webpack-plugin'); // eslint-disable-next-line camelcase @@ -8,33 +7,6 @@ const commitHash = require('child_process') .execSync('git rev-parse HEAD') .toString().trim(); -const ROOT_PATH = process.cwd(); // Adjust this as necessary - -function createExportsReplacerPlugin(packageName) { - const packageJSONPath = path.join(ROOT_PATH, 'node_modules', packageName, 'package.json'); - const packageJSON = fs.readFileSync(packageJSONPath, 'utf-8'); - const { exports } = JSON.parse(packageJSON); - const regex = new RegExp(`^${packageName}`); - - return new webpack.NormalModuleReplacementPlugin(regex, (resource) => { - const { request } = resource; - if (!request.endsWith('.js') && !request.endsWith('.mjs') && !request.endsWith('.cjs')) { - const relative = `./${path.relative(packageName, request)}`; - const exportEntry = exports[relative]?.browser?.import || exports[relative]?.import; - - if (exportEntry) { - const newRequest = path.join(packageName, exportEntry); - console.log(`[exports-replacer]: ${request} => ${newRequest}`); - resource.request = newRequest; - } else { - console.warn( - `[exports-replacer]: Could not find import field for ${relative} in exports of [${packageName}]`, - ); - } - } - }); -} - module.exports = { lintOnSave: false, css: {