Change initially displayed message
Change message from “Please enable metamask…” to “Loading…”. The reason behind this change is because the latest version of `embark-plasma` and `embarkjs-plasma` no longer requires metamask and can use locally configured embark accounts to sign transactions OR metamask can be used.
This commit is contained in:
parent
7a679f8fd3
commit
744056c44f
16
src/App.vue
16
src/App.vue
|
@ -15,7 +15,7 @@ limitations under the License.
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<div id="app">
|
<div id="app">
|
||||||
<div v-if="hasWeb3">
|
<div v-if="inited">
|
||||||
<md-toolbar class="md-transparent">
|
<md-toolbar class="md-transparent">
|
||||||
<img class="logo md-image" src="./assets/status_logo.png">
|
<img class="logo md-image" src="./assets/status_logo.png">
|
||||||
<img class="logo sink md-image" src="./assets/OmiseGO_Logo.svg">
|
<img class="logo sink md-image" src="./assets/OmiseGO_Logo.svg">
|
||||||
|
@ -153,7 +153,7 @@ limitations under the License.
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="load-wallet">
|
<div v-else class="load-wallet">
|
||||||
<h2>Enable MetaMask to continue...</h2>
|
<h2>Loading...</h2>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -178,7 +178,7 @@ export default {
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
hasWeb3: false,
|
inited: false,
|
||||||
isShowDeposit: false,
|
isShowDeposit: false,
|
||||||
isShowExit: false,
|
isShowExit: false,
|
||||||
isShowTransfer: false,
|
isShowTransfer: false,
|
||||||
|
@ -211,14 +211,7 @@ export default {
|
||||||
try {
|
try {
|
||||||
await pify(EmbarkJS.onReady)();
|
await pify(EmbarkJS.onReady)();
|
||||||
|
|
||||||
await EmbarkJS.Plasma.init(web3);
|
await EmbarkJS.Plasma.init(web3, false);
|
||||||
|
|
||||||
this.hasWeb3 =
|
|
||||||
EmbarkJS.Plasma.web3 &&
|
|
||||||
((EmbarkJS.Plasma.web3.currentProvider &&
|
|
||||||
EmbarkJS.Plasma.web3.currentProvider.isMetaMask) ||
|
|
||||||
(EmbarkJS.Plasma.web3.givenProvider &&
|
|
||||||
EmbarkJS.Plasma.web3.givenProvider.isMetaMask));
|
|
||||||
|
|
||||||
const {
|
const {
|
||||||
rootChain,
|
rootChain,
|
||||||
|
@ -228,6 +221,7 @@ export default {
|
||||||
this.rootChain = rootChain;
|
this.rootChain = rootChain;
|
||||||
this.childChain = childChain;
|
this.childChain = childChain;
|
||||||
this.plasmaContractAddress = plasmaContractAddress;
|
this.plasmaContractAddress = plasmaContractAddress;
|
||||||
|
this.inited = true;
|
||||||
|
|
||||||
this.refresh();
|
this.refresh();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|
Loading…
Reference in New Issue