diff --git a/.eslintrc.js b/.eslintrc.js index f3f90fac7..cfdfc58bf 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -6,7 +6,7 @@ module.exports = { globals: { ENV_MOBILE_DEVICE: true, }, - ignorePatterns: ['dist', 'www'], + ignorePatterns: ['dist', 'platforms', 'plugins', 'www'], extends: [ 'plugin:vue/recommended', 'plugin:@intlify/vue-i18n/recommended', diff --git a/src/components/mobile/TabBar.vue b/src/components/mobile/TabBar.vue index 260491dea..1bf8d3032 100644 --- a/src/components/mobile/TabBar.vue +++ b/src/components/mobile/TabBar.vue @@ -3,10 +3,7 @@
- +
{{ $t('app.title') }}
@@ -16,14 +13,6 @@
{{ $t('transfer.title') }}
- - -
{{ $t('transfer.transaction.title') }}
-
- import AeButton from '../../components/AeButton.vue'; -import { DISABLED_BROWSER } from '../../lib/constants'; export default { components: { AeButton }, @@ -48,7 +47,7 @@ export default { stepRouteNames: [ 'onboarding', 'onboarding-send', - ...DISABLED_BROWSER ? [] : ['onboarding-aepps'], + 'onboarding-aepps', 'onboarding-subaccounts', ], }), diff --git a/src/pages/mobile/TransactionList.vue b/src/pages/mobile/TransactionList.vue index 99d5f16a5..468036c93 100644 --- a/src/pages/mobile/TransactionList.vue +++ b/src/pages/mobile/TransactionList.vue @@ -2,8 +2,8 @@
{ ]); // TODO: remove after updating sdk sdk.Ae.defaults.verify = false; + + // backported fix https://github.com/aeternity/aepp-sdk-js/pull/1980 + const { getWalletInfo } = sdk; + sdk.getWalletInfo = () => { + const { origin, ...info } = getWalletInfo.call(sdk); + return { + ...info, + origin: 'file://' === info.origin ? '*' : info.origin, + }; + } + sdk.selectNode(network.name); sdk.middleware = middleware; sdk.middleware2 = middleware2; diff --git a/src/ui-common.js b/src/ui-common.js index d0a6c2e9a..45b829c76 100644 --- a/src/ui-common.js +++ b/src/ui-common.js @@ -1,12 +1,11 @@ import Vue from 'vue'; import 'focus-visible'; import './components/icon.scss'; -import { IS_IOS, DISABLED_BROWSER, ROUTE_MOBILE_LOGGED_IN } from './lib/constants'; +import { IS_IOS, ROUTE_MOBILE_LOGGED_IN } from './lib/constants'; Vue.prototype.$globals = { ENV_MOBILE_DEVICE: ENV_MOBILE_DEVICE, // eslint-disable-line object-shorthand IS_IOS, VUE_APP_CORDOVA: process.env.VUE_APP_CORDOVA, - DISABLED_BROWSER, ROUTE_MOBILE_LOGGED_IN, };