Skip to content

Commit 35cada6

Browse files
authored
Merge pull request #456 from persistenceOne/fix/keystore_login
multi coin type login
2 parents 7f40845 + aa2f007 commit 35cada6

File tree

22 files changed

+691
-468
lines changed

22 files changed

+691
-468
lines changed

package-lock.json

Lines changed: 213 additions & 278 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"version": "3.1.1",
44
"private": true,
55
"dependencies": {
6-
"@cosmjs/crypto": "^v0.27.1",
7-
"@cosmjs/encoding": "^v0.27.1",
8-
"@cosmjs/ledger-amino": "^v0.27.1",
9-
"@cosmjs/math": "^v0.27.1",
10-
"@cosmjs/proto-signing": "^v0.27.1",
11-
"@cosmjs/stargate": "^v0.27.1",
12-
"@cosmjs/tendermint-rpc": "^v0.27.1",
6+
"@cosmjs/crypto": "^0.28.11",
7+
"@cosmjs/encoding": "^0.28.11",
8+
"@cosmjs/ledger-amino": "^0.28.11",
9+
"@cosmjs/math": "^0.28.11",
10+
"@cosmjs/proto-signing": "^0.28.11",
11+
"@cosmjs/stargate": "^0.28.11",
12+
"@cosmjs/tendermint-rpc": "^0.28.11",
1313
"@ledgerhq/hw-transport-webusb": "^5.53.1",
1414
"@material-ui/core": "^4.11.3",
1515
"@material-ui/icons": "^4.11.2",

src/App.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ import { KEPLR_ADDRESS, LOGIN_INFO} from "./constants/localStorage";
2222
import {updateFee} from "./utils/helper";
2323
import {ledgerDisconnect} from "./utils/ledger";
2424
import ReactGA from 'react-ga';
25-
import {userLogout} from "./store/actions/logout";
26-
import TransportWebUSB from "@ledgerhq/hw-transport-webusb";
2725
import packageJson from "../package.json";
2826

2927
const SENTRY_API = process.env.REACT_APP_SENTRY_API;
@@ -109,18 +107,6 @@ const App = () => {
109107
};
110108
});
111109

112-
window.addEventListener('storage', () => {
113-
if (JSON.parse(localStorage.getItem(LOGIN_INFO)) === null){
114-
dispatch(userLogout());
115-
localStorage.clear();
116-
history.push('/');
117-
window.location.reload();
118-
if(loginInfo && loginInfo.loginMode==="ledger"){
119-
TransportWebUSB.close();
120-
}
121-
}
122-
});
123-
124110
window.addEventListener("keplr_keystorechange", () => {
125111
if (loginInfo && loginInfo.loginMode === "keplr") {
126112
const keplr = KeplrWallet();

src/assets/images/icons.svg

Lines changed: 3 additions & 0 deletions
Loading

src/assets/scss/_common.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ html, body {
7979
border: 0px solid;
8080
width: 28px;
8181
height: 28px;
82-
background: #EAEBF6;
82+
background: none;
8383
display: flex;
8484
display: -webkit-flex;
8585
align-items: center;

src/assets/scss/index.css

Lines changed: 81 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/assets/scss/index.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)