Skip to content
This repository has been archived by the owner on Nov 21, 2019. It is now read-only.

Improve notification display when using fallback #2089

Merged
merged 6 commits into from
Oct 16, 2018
Merged

Improve notification display when using fallback #2089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b32e297
prevent notification if using fallback, update connect npm version
SteveMieskoski Oct 8, 2018
c8733db
fix gulp prep breaking travis build
SteveMieskoski Oct 9, 2018
4626261
changed 'connected via Mew Connect' to 'connected via MEWconnect'
SteveMieskoski Oct 11, 2018
7d0507d
changed 'connected via Mew Connect' to 'connected via MEWconnect'
SteveMieskoski Oct 11, 2018
35744bc
fix conflicts
SteveMieskoski Oct 16, 2018
342a524
fix merge conflicts
SteveMieskoski Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,154 changes: 584 additions & 570 deletions app/scripts/controllers/decryptWalletCtrl.js
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion app/scripts/directives/QRCodeDrtv.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ var QRCodeDrtv = function() {
colorLight: "#ffffff",
correctLevel: QRCode.CorrectLevel.M
});
element[0].title = ''
}, delay);
});
};
};
module.exports = QRCodeDrtv;
module.exports = QRCodeDrtv;
2,443 changes: 1,154 additions & 1,289 deletions chrome-extension/contest.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chrome-extension/css/etherwallet-master.min.css
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions chrome-extension/cx-wallet.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ <h2 class="modal-title text-info" translate="NODE_Title"> Set Up Your Custom Nod

<p class="small"><a href="https://myetherwallet.github.io/knowledge-base/networks/run-your-own-node-with-myetherwallet.html" target="_blank" rel="noopener noreferrer"> Instructions can be found here </a></p>

<div ng-show="browserProtocol=='https:'" class="alert alert-danger small" translate="NODE_Warning">
<div ng-show="browserProtocol!='https:'" class="alert alert-danger small" translate="NODE_Warning">
Your node must be HTTPS in order to connect to it via MyEtherWallet.com. You can [download the MyEtherWallet repo & run it locally](https://github.com/kvhnuke/etherwallet/releases/latest) to connect to your local node. Or, get free SSL certificate via [LetsEncrypt](https://letsencrypt.org/)</a>.
</div>

Expand Down Expand Up @@ -7373,7 +7373,7 @@ <h4 translate="tx_Details" class="cont-md">
TX Hash
</td>
<td>
<a href="https://etherscan.io/tx/{{ txInfo.hash }}" target="_blank" rel="noopener noreferrer">
<a href="{{ txInfo.txExplorerUrl }}" target="_blank" rel="noopener noreferrer">
{{ txInfo.hash }}
</a>
</td>
Expand All @@ -7383,7 +7383,7 @@ <h4 translate="tx_Details" class="cont-md">
From Address
</td>
<td>
<a href="https://etherscan.io/address/{{ txInfo.from }}" target="_blank" rel="noopener noreferrer">
<a href="{{ txInfo.fromExplorerUrl }}" target="_blank" rel="noopener noreferrer">
{{ txInfo.from }}
</a>
</td>
Expand All @@ -7393,7 +7393,7 @@ <h4 translate="tx_Details" class="cont-md">
To Address
</td>
<td>
<a href="https://etherscan.io/address/{{ txInfo.to }}" target="_blank" rel="noopener noreferrer">
<a href="{{ txInfo.toExplorerUrl }}" target="_blank" rel="noopener noreferrer">
{{ txInfo.to }}
</a>
</td>
Expand Down
Loading