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

Aeddaqqa/fix wallet switcher name #424

Merged
merged 4 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 21 additions & 9 deletions src/components/modals/SaveAccount/SaveAccountModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
<b>private key</b>
saved.
</p>
<Alert
v-for="(error, index) in errors"
variant="negative"
:title="error"
:key="index"
></Alert>
<CamBtn
variant="primary"
:disabled="!canSubmit"
Expand All @@ -48,7 +54,7 @@
</template>
<script lang="ts">
import 'reflect-metadata'
import { Vue, Component, Prop } from 'vue-property-decorator'
import { Vue, Component, Prop, Watch } from 'vue-property-decorator'

import Modal from '../Modal.vue'
import { SaveAccountInput } from '@/store/types'
Expand Down Expand Up @@ -77,23 +83,29 @@ export default class SaveAccountModal extends Vue {
accountName = ''
existsInLocalStorage: boolean = false
index: number = 0
errors: string[] = []
foundAccount: iUserAccountEncrypted | null = null
$refs!: {
modal: Modal
}

get canSubmit() {
if (this.error !== null) return false
if (this.errors.length !== 0) return false
return true
}

get error() {
if (!this.password) return this.$t('keys.password_validation')
if (!this.password_confirm) return this.$t('keys.password_validation2')
if (this.accountName.length < 1) return this.$t('keys.account_name_required')
if (this.password.length < 9) return this.$t('keys.password_validation')
if (this.password !== this.password_confirm) return this.$t('keys.password_validation2')

@Watch('password_confirm')
@Watch('accountName')
@Watch('password')
checkError() {
this.errors = []
if (this.password && this.password !== this.password_confirm)
this.errors.push(this.$t('keys.password_validation2') as string)
if (!this.password || this.password.length < 9)
this.errors.push(this.$t('keys.password_validation') as string)

if (this.accountName.length < 1)
this.errors.push(this.$t('keys.account_name_required') as string)
return null
}

Expand Down
40 changes: 39 additions & 1 deletion src/components/wallet/manage/KeyRow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@
<div class="header_cols">
<div class="detail">
<div class="edit-wallet-name-container">
<h3 v-show="!isEditable" class="addressVal" style="max-width: 300px">
<h3
v-show="!isEditable"
class="addressVal"
:style="isSuite ? { maxWidth: '395px' } : { maxWidth: 'none' }"
>
{{ walletName }}
</h3>
<input
Expand Down Expand Up @@ -166,6 +170,7 @@ import { privateToPublic } from '@ethereumjs/util'
},
})
export default class KeyRow extends Vue {
@Prop() isSuite?: boolean
@Prop() wallet!: WalletType
@Prop({ default: false }) is_default?: boolean

Expand Down Expand Up @@ -514,12 +519,45 @@ export default class KeyRow extends Vue {
margin-right: 6px;
}

@include mixins.medium-device {
.addressVal {
max-width: 395px !important;
}
}

@include mixins.large-device {
.addressVal {
max-width: 395px !important;
}
}

@include mixins.large-device {
.addressVal {
max-width: 500px !important;
}
}

@include mixins.xl-device {
.addressVal {
max-width: 500px !important;
}
}

@include mixins.largest-device {
.addressVal {
max-width: 800px !important;
}
}

@include mixins.mobile-device {
.addressVal-value {
white-space: normal;
word-break: break-all;
text-align: left;
}
.addressVal {
max-width: 395px !important;
}
.header_cols {
display: flex;
flex-direction: column;
Expand Down
5 changes: 4 additions & 1 deletion src/components/wallet/manage/MyKeys.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
:wallet="activeWallet"
class="key_row"
:is_default="true"
:isSuite="isSuite"
></key-row>
<hr v-if="inactiveWallets.length > 0" />
<p class="label" v-if="hasOtherKeys">
Expand All @@ -30,6 +31,7 @@
</div>
<transition-group name="fade" class="other-keys">
<key-row
:isSuite="isSuite"
v-for="wallet in inactiveWallets"
:wallet="wallet"
:key="wallet.id"
Expand All @@ -43,7 +45,7 @@

<script lang="ts">
import 'reflect-metadata'
import { Component, Vue, Watch } from 'vue-property-decorator'
import { Component, Vue, Watch, Prop } from 'vue-property-decorator'

import { bintools } from '@/AVA'
import RememberKey from '@/components/misc/RememberKey.vue'
Expand All @@ -62,6 +64,7 @@ import Alert from '@/components/Alert.vue'
},
})
export default class MyKeys extends Vue {
@Prop() isSuite?: boolean
error: string = ''
isLoading: boolean = false
imported: boolean = false
Expand Down
2 changes: 1 addition & 1 deletion src/components/wallet/manage/mountKyesComponent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Vue.use(BootstrapVue)
Vue.component('datetime', Datetime)

export const mountKyesComponent = (el: string, props: any) => {
const { dispatchNotification, dispatchSetNewName, setAccount } = props
const { dispatchNotification, dispatchSetNewName, setAccount, isSuite: boolean } = props
const MyPlugin = {
install(Vue) {
Vue.prototype.globalHelper = () => {
Expand Down
Loading