Skip to content

Commit 4be6131

Browse files
kvhnukekvhnuke
authored
Merge pull request #121 from enkryptcom/ui/bug-fix-1.0.0
UI/bug fix 1.0.0
2 parents b680317 + e2c2a10 commit 4be6131

54 files changed

Lines changed: 404 additions & 278 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/extension/src/providers/ethereum/ui/eth-connect-dapp.vue‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@
99
</template>
1010

1111
<template #content>
12-
<h2>Connect to {{ Options.title }}</h2>
12+
<h2>Connect with Enkrypt</h2>
1313

1414
<div class="common-popup__block no-inset">
1515
<div class="common-popup__account">
1616
<img :src="Options.faviconURL" />
1717
<div class="common-popup__account-info">
18-
<h4>{{ Options.title }}</h4>
19-
<p>{{ Options.domain }}</p>
18+
<h4>{{ Options.domain }}</h4>
2019
</div>
2120
</div>
2221
</div>

‎packages/extension/src/providers/ethereum/ui/eth-decrypt.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
<div class="common-popup__info">
2323
<img :src="Options.faviconURL" />
2424
<div class="common-popup__info-info">
25-
<h4>{{ Options.title }}</h4>
26-
<p>{{ Options.domain }}</p>
25+
<h4>{{ Options.domain }}</h4>
2726
</div>
2827
</div>
2928

‎packages/extension/src/providers/ethereum/ui/eth-get-encryption-key.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
<div class="common-popup__info">
2323
<img :src="Options.faviconURL" />
2424
<div class="common-popup__info-info">
25-
<h4>{{ Options.title }}</h4>
26-
<p>{{ Options.domain }}</p>
25+
<h4>{{ Options.domain }}</h4>
2726
</div>
2827
</div>
2928

‎packages/extension/src/providers/ethereum/ui/eth-sign-message.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
<div class="common-popup__info">
2323
<img :src="Options.faviconURL" />
2424
<div class="common-popup__info-info">
25-
<h4>{{ Options.title }}</h4>
26-
<p>{{ Options.domain }}</p>
25+
<h4>{{ Options.domain }}</h4>
2726
</div>
2827
</div>
2928

‎packages/extension/src/providers/ethereum/ui/eth-sign-typedata.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
<div class="common-popup__info">
2323
<img :src="Options.faviconURL" />
2424
<div class="common-popup__info-info">
25-
<h4>{{ Options.title }}</h4>
26-
<p>{{ Options.domain }}</p>
25+
<h4>{{ Options.domain }}</h4>
2726
</div>
2827
</div>
2928

‎packages/extension/src/providers/ethereum/ui/eth-verify-transaction.vue‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
<div class="provider-verify-transaction__info">
3737
<img :src="Options.faviconURL" />
3838
<div class="provider-verify-transaction__info-info">
39-
<h4>{{ Options.title }}</h4>
40-
<p>{{ Options.domain }}</p>
39+
<h4>{{ Options.domain }}</h4>
4140
</div>
4241
</div>
4342

@@ -82,8 +81,6 @@
8281
@open-popup="toggleSelectFee"
8382
/>
8483

85-
<!-- <best-offer-error :not-enough-verify="true"></best-offer-error> -->
86-
8784
<div class="provider-verify-transaction__data">
8885
<a
8986
class="provider-verify-transaction__data-link"

‎packages/extension/src/providers/ethereum/ui/send-transaction/components/send-input-amount.vue‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<template>
22
<div class="send-input-amount" :class="{ focus: isFocus }">
33
<input
4+
ref="inputRef"
45
v-model="amount"
56
type="number"
6-
placeholder="0.0"
7+
placeholder="0"
78
:style="{ color: !hasEnoughBalance ? 'red' : 'black' }"
89
@focus="changeFocus"
910
@blur="changeFocus"
@@ -14,14 +15,14 @@
1415
<span>${{ $filters.formatFiatValue(fiatEquivalent).value }}</span>
1516
</div>
1617

17-
<a class="send-input-amount__max" @click="emit('update:inputSetMax')"
18-
>Max</a
19-
>
18+
<a class="send-input-amount__max" @click="emit('update:inputSetMax')">
19+
Max
20+
</a>
2021
</div>
2122
</template>
2223

2324
<script setup lang="ts">
24-
import { ref, computed } from "vue";
25+
import { ref, computed, ComponentPublicInstance } from "vue";
2526
import SwitchArrowIcon from "@action/icons/send/switch-arrow-icon.vue";
2627
import BigNumber from "bignumber.js";
2728
@@ -31,6 +32,9 @@ const emit = defineEmits<{
3132
}>();
3233
3334
const isFocus = ref(false);
35+
const inputRef = ref<ComponentPublicInstance<HTMLInputElement>>();
36+
37+
defineExpose({ inputRef });
3438
3539
const props = defineProps({
3640
hasEnoughBalance: {
@@ -51,7 +55,9 @@ const fiatEquivalent = computed(() => {
5155
});
5256
const amount = computed({
5357
get: () => props.amount,
54-
set: (value) => emit("update:inputAmount", value.toString()),
58+
set: (value) => {
59+
emit("update:inputAmount", value.toString());
60+
},
5561
});
5662
5763
const changeFocus = () => {

‎packages/extension/src/providers/ethereum/ui/styles/common-popup.less‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010

1111
&__content {
12-
height: calc(~"100% - 52px");
12+
height: calc(~"100% - 55px");
1313
box-sizing: border-box;
1414
display: flex;
1515
flex-direction: row;
@@ -56,6 +56,7 @@
5656
letter-spacing: 0.25px;
5757
color: @primaryLabel;
5858
margin: 0 0 16px 0;
59+
word-break: break-all;
5960
}
6061

6162
&__block {
@@ -65,7 +66,7 @@
6566
border-radius: 12px;
6667
padding: 10px 16px;
6768
width: 100%;
68-
margin: 0 0 16px 0;
69+
margin: 0 0 12px 0;
6970

7071
&.no-inset {
7172
margin: 0;
@@ -112,6 +113,7 @@
112113
letter-spacing: 0.25px;
113114
color: @primaryLabel;
114115
margin: 0;
116+
word-break: break-all;
115117
}
116118

117119
p {

‎packages/extension/src/providers/ethereum/ui/styles/verify-transaction.less‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
letter-spacing: 0.25px;
4242
color: @primaryLabel;
4343
margin: 0 0 16px 0;
44+
word-break: break-all;
4445
}
4546
&__block {
4647
background: @lightBg;
@@ -73,6 +74,7 @@
7374
line-height: 32px;
7475
color: @primaryLabel;
7576
margin: 0;
77+
word-break: break-all;
7678

7779
span {
7880
font-variant: small-caps;
@@ -115,6 +117,7 @@
115117
letter-spacing: 0.25px;
116118
color: @primaryLabel;
117119
margin: 0;
120+
word-break: break-all;
118121
}
119122

120123
h6 {
@@ -125,6 +128,7 @@
125128
letter-spacing: 0.5px;
126129
color: @secondaryLabel;
127130
margin: 0;
131+
word-break: break-all;
128132
}
129133

130134
div {
@@ -219,6 +223,7 @@
219223
letter-spacing: 0.25px;
220224
color: @primaryLabel;
221225
margin: 0;
226+
word-break: break-all;
222227
}
223228

224229
p {
@@ -230,6 +235,7 @@
230235
color: @tertiaryLabel;
231236
margin: 0;
232237
word-break: break-all;
238+
word-break: break-all;
233239
}
234240
}
235241
}
@@ -251,6 +257,7 @@
251257
line-height: 16px;
252258
letter-spacing: 0.8px;
253259
color: @primaryLabel;
260+
word-break: break-all;
254261

255262
&:hover {
256263
background: rgba(0, 0, 0, 0.04);
@@ -296,6 +303,7 @@
296303
line-height: 16px;
297304
letter-spacing: 0.5px;
298305
color: @secondaryLabel;
306+
word-break: break-all;
299307

300308
p {
301309
font-family: 'SF Mono', 'Segoe UI Mono', 'Menlo', 'Consolas';
@@ -306,6 +314,7 @@
306314
letter-spacing: 0.5px;
307315
color: @secondaryLabel;
308316
margin: 0;
317+
word-break: break-all;
309318

310319
a {
311320
color: @secondaryLabel;

‎packages/extension/src/providers/polkadot/ui/dot-accounts.vue‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@
99
</template>
1010

1111
<template #content>
12-
<h2>Connect to {{ Options.title }}</h2>
12+
<h2>Connect with Enkrypt</h2>
1313

1414
<div class="common-popup__block no-inset">
1515
<div class="common-popup__account">
1616
<img :src="Options.faviconURL" />
1717
<div class="common-popup__account-info">
18-
<h4>{{ Options.title }}</h4>
19-
<p>{{ Options.domain }}</p>
18+
<h4>{{ Options.domain }}</h4>
2019
</div>
2120
</div>
2221
</div>
@@ -25,6 +24,15 @@
2524
<link-icon />
2625
</div>
2726

27+
<div class="common-popup__block no-inset">
28+
<div class="common-popup__account">
29+
<img :src="require('@/ui/action/icons/raw/account.png')" />
30+
<div class="common-popup__account-info">
31+
<h4>All accounts</h4>
32+
</div>
33+
</div>
34+
</div>
35+
2836
<div class="provider-connect-dapp__info">
2937
<info-icon-gray />
3038
<p>

0 commit comments

Comments
 (0)