Skip to content

Commit

Permalink
Merge branch 'jordan/2170-explorer-mode-fixes' of https://github.com/…
Browse files Browse the repository at this point in the history
…cosmos/voyager into jordan/2170-explorer-mode-fixes
  • Loading branch information
jbibla committed Mar 6, 2019
2 parents b2925e7 + dd750d3 commit c74ce36
Show file tree
Hide file tree
Showing 63 changed files with 790 additions and 825 deletions.
25 changes: 22 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,35 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Changed

- [\#2043](https://github.com/cosmos/voyager/issues/2043) removed no-balance modals on staking page @fedekunze
- [\#2161](https://github.com/cosmos/voyager/pull/2161) fixed status dot position @jbibla

## [1.0.0-beta.14] - 2019-03-06

### Fixed

- [\#2138](https://github.com/cosmos/voyager/issues/2138) Non breaking space not renderer correctly on hardware state indicator @faboweb
- [\#1211](https://github.com/cosmos/voyager/issues/1211) Fixed thrown error on page validator when validator wasn't loaded yet @faboweb
- [\#2128](https://github.com/cosmos/voyager/pull/2128) remove loading status on validator page when disconnected from the network @fedekunze

### Added

- [\#1306](https://github.com/cosmos/voyager/issues/1306) Withdraw fee distribution rewards @fedekunze
- [\#1875](https://github.com/cosmos/voyager/issues/1875) optimistic updates for proposal creation @faboweb
- [\#1876](https://github.com/cosmos/voyager/issues/1876) optimistic updates for depositing on proposals @faboweb

### Fixed

### Changed

- [\#2128](https://github.com/cosmos/voyager/pull/2128) remove loading status on validator page when disconnected from the network @fedekunze
- [\#2170](https://github.com/cosmos/voyager/pull/2170) bug with card-signed-in and explorer mode @jbibla
- [\#2167](https://github.com/cosmos/voyager/pull/2167) fixed votes showing wrong tally @faboweb
- [\#2167](https://github.com/cosmos/voyager/pull/2167) fixed not being able to deposit less then 1 atom not possible @faboweb
- [\#2167](https://github.com/cosmos/voyager/pull/2167) fixed sorting of proposals @faboweb
- [\#1897](https://github.com/cosmos/voyager/issues/1897) made action modals smaller @jbibla
- [\#2179](https://github.com/cosmos/voyager/issues/2179) removed "to" field from undelegation action modal @jbibla

## [1.0.0-beta.13] - 2019-03-05

Expand All @@ -24,8 +45,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- [\#2151](https://github.com/cosmos/voyager/pull/2151) A "You need to sign in" card component @faboweb
- [\#2152](https://github.com/cosmos/voyager/pull/2152) Feedback button to collect feedback from users on the page @faboweb

### Changed

### Fixed

- [\#1982](https://github.com/cosmos/voyager/issues/1982) Session screens are proper modals @jbibla
Expand Down
59 changes: 37 additions & 22 deletions app/src/renderer/components/common/ActionModal.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
<template>
<transition v-if="show" name="slide-fade">
<div v-click-outside="close" class="action-modal">
<transition
v-if="show"
name="slide-fade"
>
<div
v-click-outside="close"
class="action-modal"
>
<div class="action-modal-header">
<img
class="icon action-modal-atom"
src="~assets/images/cosmos-logo.png"
>
/>
<span class="action-modal-title">
{{ session.signedIn ? title : `Sign in required` }}
</span>
Expand All @@ -17,10 +23,16 @@
<i class="material-icons">close</i>
</div>
</div>
<div v-if="!session.signedIn" class="action-modal-form">
<div
v-if="!session.signedIn"
class="action-modal-form"
>
<p>You need to sign in to submit a transaction.</p>
</div>
<div v-else-if="step === `txDetails`" class="action-modal-form">
<div
v-else-if="step === `txDetails`"
class="action-modal-form"
>
<slot />
<tm-form-group
v-if="signMethods.length > 1"
Expand Down Expand Up @@ -56,22 +68,20 @@
/>
</tm-form-group>
</div>

<div v-else-if="step === `sign`" class="action-modal-form">
<hardware-state
v-if="sending"
:loading="true"
value="Waiting for signature on app"
/>
<hardware-state
v-else
icon="usb"
value="Please unlock the Cosmos app on your Ledger Nano&nbsp;S"
/>
<hardware-state v-if="sending" :loading="true">
Waiting for signature on app
</hardware-state>
<hardware-state v-else icon="usb">
Please unlock the Cosmos app on your Ledger&nbsp;Nano&nbsp;S
</hardware-state>
</div>

<div class="action-modal-footer">
<slot name="action-modal-footer">
<tm-form-group class="action-modal-group">
<div class="action-modal-footer">
<div>
<tm-btn
v-if="!session.signedIn"
value="Go to Sign In"
Expand Down Expand Up @@ -222,6 +232,7 @@ export default {
this.$emit(`close`)
},
goToSession() {
this.close()
this.$store.commit(`setSessionModalView`, `welcome`)
this.$store.commit(`toggleSessionModal`, true)
},
Expand Down Expand Up @@ -285,11 +296,11 @@ export default {
flex-direction: column;
justify-content: space-between;
right: 2rem;
padding: 3rem;
padding: 1.5rem 1.5rem 2rem 1.5rem;
position: fixed;
bottom: 0;
width: 100%;
max-width: 664px;
max-width: 564px;
z-index: var(--z-modal);
border-top-left-radius: 0.25rem;
border-top-right-radius: 0.25rem;
Expand All @@ -299,7 +310,7 @@ export default {
.action-modal-header {
align-items: center;
display: flex;
padding-bottom: 2rem;
padding-bottom: 1.5rem;
}
.action-modal-atom {
Expand Down Expand Up @@ -335,18 +346,22 @@ export default {
.action-modal-form .tm-form-group {
display: block;
padding: 0.5rem 0 1rem;
padding: 0.75rem 0;
}
.action-modal-footer {
display: flex;
justify-content: flex-end;
padding: 2rem 0 0;
padding: 1.5rem 0 1rem;
}
.action-modal-footer .tm-form-group {
padding: 0;
}
.submission-error {
position: absolute;
right: 3rem;
left: 1.5rem;
bottom: 1rem;
}
Expand Down
6 changes: 2 additions & 4 deletions app/src/renderer/components/common/ShortBech32.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ export default {
.short-bech32 .address {
color: var(--link);
cursor: pointer;
font-size: 14px;
line-height: 14px;
font-size: var(--sm);
font-weight: 300;
}
.short-bech32 .address:hover {
Expand All @@ -73,8 +73,6 @@ export default {
opacity: 0;
padding-left: 10px;
transition: opacity 500ms ease;
position: relative;
top: -2px;
}
.short-bech32 .copied.active {
Expand Down
3 changes: 1 addition & 2 deletions app/src/renderer/components/common/TmBalance.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ export default {
display: flex;
flex-direction: column;
flex-grow: 1;
padding-top: 1rem;
padding-left: 2rem;
padding: 1rem 0 2rem 2rem;
}
.header-balance .top {
Expand Down
12 changes: 2 additions & 10 deletions app/src/renderer/components/common/TmBtn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,11 @@ export default {
border: none;
background: transparent;
text-decoration: none !important;
-webkit-appearance: none;
margin: 0;
display: inline-block;
font-size: 16px;
}
/* firefox fix - padding */
.tm-btn::-moz-focus-inner {
padding: 0;
border: 0;
}
.tm-btn__container {
font-family: var(--sans);
font-size: 1rem !important;
Expand All @@ -118,15 +111,14 @@ export default {
color: var(--bright, #333) !important;
padding: 0.5rem 2rem;
margin: 0;
background: var(--primary, #fff);
border: 1px solid var(--bc, #ddd);
background: var(--primary);
border: 1px solid var(--primary);
border-radius: 0.25rem;
cursor: pointer;
user-select: none;
display: flex;
justify-content: center;
align-items: center;
-webkit-appearance: none;
}
.tm-btn--secondary {
Expand Down
9 changes: 5 additions & 4 deletions app/src/renderer/components/common/TmConnectedNetwork.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
<div v-if="connected" id="tm-connected-network" class="tm-connected-network">
<div class="tm-connected-network__connection">
<div id="tm-connected-network__icon" class="tm-connected-network__icon">
<i class="material-icons">lock</i>
<span
v-tooltip.top="`Network is up and running`"
class="page-profile__status green"
/>
</div>
<div
id="tm-connected-network__string"
class="tm-connected-network__string"
>
<span v-tooltip.top="networkTooltip" class="chain-id">
{{
lastHeader.chain_id
}}
{{ lastHeader.chain_id }}
</span>
</div>
</div>
Expand Down
5 changes: 4 additions & 1 deletion app/src/renderer/components/common/TmField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,14 @@ export default {
line-height: 1.5rem;
min-width: 0;
padding: 0.1875rem 0.5rem;
vertical-align: top;
width: 100%;
-webkit-appearance: none;
}
.tm-field::placeholder {
color: var(--dim);
}
.tm-field:disabled {
background: var(--app-fg, #eee);
border: var(--app-fg, #eee);
Expand Down
8 changes: 2 additions & 6 deletions app/src/renderer/components/common/TmHardwareState.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<template>
<div class="tm-hardware-state">
<img v-if="loading" src="~assets/images/loader.svg">
<img v-if="loading" src="~assets/images/loader.svg" >
<i class="tm-hardware-state__icon material-icons">{{ icon }}</i>
<div class="tm-hardware-state__label">
{{ value }}
<slot />
</div>
</div>
</template>
Expand All @@ -15,10 +15,6 @@ export default {
type: String,
default: ``
},
value: {
type: String,
required: true
},
loading: {
type: Boolean,
default: false
Expand Down
11 changes: 4 additions & 7 deletions app/src/renderer/components/common/TmPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ export default {
background: var(--app-nav);
height: 8rem;
width: 8rem;
margin: 1rem 2rem 1rem 1rem;
margin: 1rem;
padding: 1rem;
}
Expand All @@ -192,26 +192,23 @@ export default {
}
.page-profile__status-and-title {
position: relative;
display: flex;
align-items: center;
}
.page-profile__status {
border-radius: 50%;
display: inline-block;
height: 0.5rem;
left: -1rem;
top: 1rem;
position: absolute;
width: 0.5rem;
}
.page-profile__title {
color: #fff;
display: inline-block;
font-size: var(--h1);
line-height: var(--h1);
font-weight: 400;
padding: 0 0.5rem 0.5rem 0;
padding: 0 0.5rem;
}
.page-profile__header__actions {
Expand Down
2 changes: 2 additions & 0 deletions app/src/renderer/components/common/TmPageHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ export default {
.header-buttons {
align-self: flex-start;
margin-left: auto;
position: relative;
bottom: 4px;
}
.tm-page-header-title {
Expand Down
13 changes: 8 additions & 5 deletions app/src/renderer/components/common/TmSessionHardware.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@
<hardware-state
v-if="status == 'connect'"
icon="usb"
value="Please plug in your Ledger Nano S and open the Cosmos app"
@click.native="connectLedger()"
/>
>
Please plug in your Ledger&nbsp;Nano&nbsp;S and open the Cosmos app
</hardware-state>
<hardware-state
v-if="status == 'detect'"
:loading="true"
value="Connecting..."
@click.native="setStatus('connect')"
/>
>
Connecting...
</hardware-state>
<p class="ledger-install">
Don't have the Cøsmos Ledger App yet? Install it
<a
Expand All @@ -33,7 +35,8 @@
rel="noopener noreferrer"
>
here
</a>.
</a>
.
</p>
</div>
<div class="tm-session-footer">
Expand Down
Loading

0 comments on commit c74ce36

Please sign in to comment.