Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: run lint, ignore e on mew input type number #315

Merged
merged 9 commits into from
Oct 26, 2022
22 changes: 20 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,40 @@
### Release 1.3.8

### fix

- mew notification arrow on swap alignment [#319](https://github.com/MyEtherWallet/mew-components/pull/319)
- address hook horizontal alignment [#317](https://github.com/MyEtherWallet/mew-components/pull/317)
- token selector horizontal alignment [#316](https://github.com/MyEtherWallet/mew-components/pull/316)

### devop

- ignore e on mew-input type number [#315](https://github.com/MyEtherWallet/mew-components/pull/315)

### Release 1.3.7

### devop

- remove dapp btn capitalization [#313](https://github.com/MyEtherWallet/mew-components/pull/313)
- swap notification arrow alignment [#312](https://github.com/MyEtherWallet/mew-components/pull/312)
- address selector showing invalid identicon [#311](https://github.com/MyEtherWallet/mew-components/pull/311)
- tooltip alignment [#304](https://github.com/MyEtherWallet/mew-components/pull/304)


### Release 1.3.5

### devop

- Remove text capital style from mew button [#306](https://github.com/MyEtherWallet/mew-components/pull/306)

### fix

- use token container for notification swap tokens [#307](https://github.com/MyEtherWallet/mew-components/pull/307)
- ledger back button [#308](https://github.com/MyEtherWallet/mew-components/pull/308)
- token display on tablet view [#309](https://github.com/MyEtherWallet/mew-components/pull/309)


### Release 1.3.4

### devop

- allow users to hide address select save icon [#302](https://github.com/MyEtherWallet/mew-components/pull/302)
- fix persistent hint [#303](https://github.com/MyEtherWallet/mew-components/pull/303)

@@ -34,6 +51,7 @@
### fix

- mew-address-select showing wrong identicon bug [#296](https://github.com/MyEtherWallet/mew-components/pull/296)

### Release 1.1.0

### devop
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@myetherwallet/mew-components",
"version": "1.3.7",
"version": "1.3.8",
"description": "MEW Components",
"main": "dist/mew-components.umd.js",
"module": "dist/mew-components.esm.js",
11 changes: 8 additions & 3 deletions src/components/MewAddressSelect/MewAddressSelect.vue
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@
<v-combobox
ref="mewAddressSelect"
v-model="addressValue"
height="62"
class="address-select pa-0 rounded-lg"
color="primary"
:items="items"
@@ -87,7 +86,9 @@
class="dropdown-icon-container d-flex align-center justify-center cursor-pointer full-height"
@click="toggle"
>
<v-icon class="mew-heading-1 mx-5"> mdi-chevron-down </v-icon>
<v-icon class="mew-heading-1 mx-5">
mdi-chevron-down
</v-icon>
</div>
</template>

@@ -113,7 +114,10 @@
v-if="!item.resolvedAddr || item.resolvedAddr === ''"
:hash="item.address"
/>
<span v-else class="mew-address">{{ item.address }}</span>
<span
v-else
class="mew-address"
>{{ item.address }}</span>
</div>
<div class="overline primary--text font-weight-medium ml-3">
{{ item.nickname }}
@@ -344,6 +348,7 @@ export default {
* Address select input.
*/
.address-select {
min-height: 62px;
&.v-text-field {
input {
font-family: 'PT Mono';
14 changes: 11 additions & 3 deletions src/components/MewBlockie/MewBlockie.vue
Original file line number Diff line number Diff line change
@@ -10,16 +10,24 @@
:src="blockieImg"
alt="Blockie Image"
style="display: block; border-radius: 50%"
/>
>

<!--
=====================================================================
Inset shadow on edge of blockie image
=====================================================================
-->
<div v-if="!flat" class="inset-shadow" />
<div
v-if="!flat"
class="inset-shadow"
/>
</div>
<img v-if="currency" alt="icon" class="currency-icon" :src="currency" />
<img
v-if="currency"
alt="icon"
class="currency-icon"
:src="currency"
>
</div>
</template>

4 changes: 4 additions & 0 deletions src/components/MewInput/MewInput.vue
Original file line number Diff line number Diff line change
@@ -24,6 +24,7 @@
:append-icon="showPasswordIcon"
:readonly="isReadOnly"
@click:append="onPasswordIconClick"
@keydown.native="preventCharE($event)"
validate-on-blur
height="62"
>
@@ -328,6 +329,9 @@ export default {
clear(val) {
this.inputValue = val ? val : '';
},
preventCharE(e) {
if (this.type === 'number' && e.key === 'e') e.preventDefault();
},
},
};
</script>
54 changes: 24 additions & 30 deletions src/components/MewNotification/MewNotification.vue
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
class="px-2 py-0"
:color="backgroundColor"
>
<v-container
<v-container
fluid
class="px-0"
>
@@ -32,9 +32,7 @@
<!-- ===================================================================================== -->
<div
v-if="
$vuetify.breakpoint.smAndUp &&
!notification.read &&
showIndicator
$vuetify.breakpoint.smAndUp && !notification.read && showIndicator
"
:class="[
getClasses(notification.status.value.toLowerCase()),
@@ -59,14 +57,16 @@
<!-- ===================================================================================== -->
<!-- Displays swap icons if it is a swap notification -->
<!-- ===================================================================================== -->
<div
<div
v-else
class="d-flex flex-column currency-symbol ml-2"
>
<MewTokenContainer
:img=" notification.fromObj.icon
? notification.fromObj.icon
: ethTokenPlaceholder"
:img="
notification.fromObj.icon
? notification.fromObj.icon
: ethTokenPlaceholder
"
token-border
/>
<MewTokenContainer
@@ -124,7 +124,7 @@
</div>
</div>
</v-col>
<v-col
<v-col
cols="4"
class="text-right pr-2"
>
@@ -143,17 +143,17 @@
</v-expansion-panel-header>

<v-expansion-panel-content
class="pa-0"
class="pa-0"
:color="backgroundColor"
>
<div class="expanded-container capitalize">
<v-container>
<v-row
<v-row
v-for="(detail, idx) in getDetails"
:key="idx"
>
<v-col
cols="6"
<v-col
cols="6"
class="textPrimary--text"
>
{{ detail.string }}:
@@ -178,7 +178,7 @@
top
>
<template #activator="{ on }">
<a
<a
:href="detail.link"
target="_blank"
v-on="on"
@@ -205,7 +205,6 @@ import MewBadge from '@/components/MewBadge/MewBadge.vue';
import MewBlockie from '@/components/MewBlockie/MewBlockie.vue';
import MewTransformHash from '@/components/MewTransformHash/MewTransformHash.vue';
import ethTokenPlaceholder from '@/assets/images/icons/eth.svg';
export default {
name: 'MewNotification',
components: {
@@ -287,6 +286,10 @@ export default {
showIndicator: {
type: Boolean,
default: true
},
activeOnToggle: {
type: Boolean,
default: true
}
},
data() {
@@ -341,6 +344,11 @@ export default {
return this.notification.type.value.toLowerCase() === this.txTypes.swap;
}
},
watch: {
activeOnToggle() {
this.onToggle();
}
},
methods: {
isHash(type) {
return type === this.hashType;
@@ -397,74 +405,61 @@ export default {
.primary {
border-radius: 0 !important;
}
.v-expansion-panel {
overflow: hidden;
}
.notification-container {
.detail-container {
max-width: 85%;
.detail-hash {
max-width: 60%;
}
}
.indicator {
border-radius: 50% !important;
display: table;
height: 6px;
width: 6px;
}
.expanded-container {
.container {
border-top: 1px solid var(--v-inputBorder-base);
}
}
}
.success-type {
//background-color: var(--v-superPrimary-base);
border: 1px solid var(--v-primary-base);
&.expanded {
border: 1px solid var(--v-superPrimary-base);
}
&.read {
border: 1px solid var(--v-superPrimary-base);
}
}
.pending-type {
//background-color: var(--v-warning-base);
border: 1px solid var(--v-warning-darken1);
&.expanded {
border: 1px solid var(--v-warning-base);
}
&.read {
border: 1px solid var(--v-warning-base);
}
}
.failed-type {
//background-color: var(--v-error-lighten1);
border: 1px solid var(--v-error-base);
&.expanded {
border: 1px solid var(--v-error-lighten1);
}
&.read {
border: 1px solid var(--v-error-lighten1);
}
}
.currency-symbol {
position: relative;
width: 35px;
img {
border-radius: 50%;
}
@@ -473,8 +468,7 @@ export default {
left: 15px;
}
}
.line-height-initial {
line-height: initial;
}
</style>
</style>
2 changes: 1 addition & 1 deletion src/components/MewSelect/MewSelect.vue
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
-->
<v-select
v-model="selectModel"
height="62"
class="mew-select rounded-lg"
color="primary"
append-icon="mdi-chevron-down"
@@ -442,6 +441,7 @@ export default {
* Mew Select styles
*/
.mew-select {
height: 62px;
.mdi-chevron-down {
color: var(--v-titlePrimary-base);
cursor: pointer;
12 changes: 10 additions & 2 deletions src/components/MewTooltip/MewTooltip.vue
Original file line number Diff line number Diff line change
@@ -9,10 +9,18 @@
>
<!-- Popover trigger -->
<template #trigger>
<v-icon v-if="!hideIcon" class="cursor-pointer" color="searchText" small>
<v-icon
v-if="!hideIcon"
class="cursor-pointer"
color="searchText"
small
>
mdi-information
</v-icon>
<slot name="activatorSlot" class="d-flex" />
<slot
name="activatorSlot"
class="d-flex"
/>
</template>
<!-- Popover content -->
<slot name="contentSlot" />