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

Style enhancement and upgrading CaminoJS #443

Merged
merged 33 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7700978
feat(transfer): add x chain bulk transfer
aeddaqqa Jul 29, 2024
918c1c4
fix(network): fix issue with storing selected network name in lowercase
Ysrbolles Aug 3, 2024
95291ad
chore: Update docker-compose commands to use 'docker compose' instead…
Ysrbolles Aug 5, 2024
ee5017d
fix(style): fix Wallet Switcher Name Shrinks Despite Available Space
aeddaqqa Aug 9, 2024
b5e7799
feat(save-account): add error handling to save account
aeddaqqa Aug 9, 2024
2c7eb16
feat(mint): add bulk X-Chain NFT mint
aeddaqqa Aug 9, 2024
dd4f814
Merge branch 'suite' into addaqqa/bulktransfer
aeddaqqa Aug 9, 2024
d8d1f4b
chore: Refactor code to remove unnecessary refresh div in Earn.vue an…
Ysrbolles Sep 3, 2024
e50f7df
Merge branch 'suite' into saved-network-reload-issue
Ysrbolles Sep 3, 2024
cc0e470
fix: Update docker-compose commands to use 'docker compose'
Ysrbolles Sep 3, 2024
8a17766
Merge branch 'suite' into aeddaqqa/fix-wallet-switcher-name
Ysrbolles Sep 3, 2024
f0e30e0
Merge pull request #424 from chain4travel/aeddaqqa/fix-wallet-switche…
Ysrbolles Sep 3, 2024
e7f1c92
Merge branch 'suite' into saved-network-reload-issue
Ysrbolles Sep 3, 2024
584f6c5
chore: Update docker-compose commands to use 'docker compose' instead…
Ysrbolles Sep 3, 2024
d4bea53
Merge branch 'suite' into aeddaqqa/bulk-xchain-mint
Ysrbolles Sep 3, 2024
7e68e1a
Merge branch 'suite' into addaqqa/bulktransfer
Ysrbolles Sep 3, 2024
61b5d71
Merge branch 'suite' into claim-rewards
Ysrbolles Sep 3, 2024
1b2d14e
Merge pull request #423 from chain4travel/saved-network-reload-issue
Ysrbolles Sep 3, 2024
d7224d5
Merge branch 'suite' into aeddaqqa/bulk-xchain-mint
Ysrbolles Sep 3, 2024
c63570b
Merge branch 'suite' into addaqqa/bulktransfer
Ysrbolles Sep 3, 2024
8b5d4e5
Merge branch 'suite' into claim-rewards
Ysrbolles Sep 3, 2024
8cc41d2
Merge pull request #433 from chain4travel/claim-rewards
Ysrbolles Sep 3, 2024
5a6470b
Merge branch 'suite' into addaqqa/bulktransfer
Ysrbolles Sep 4, 2024
437ef49
Merge pull request #420 from chain4travel/addaqqa/bulktransfer
Ysrbolles Sep 4, 2024
42420ee
Merge branch 'suite' into aeddaqqa/bulk-xchain-mint
Ysrbolles Sep 4, 2024
5294f8c
Merge pull request #425 from chain4travel/aeddaqqa/bulk-xchain-mint
Ysrbolles Sep 4, 2024
1118202
fix(multisignatures): fix notification of editing multisig wallet
aeddaqqa Nov 5, 2024
291ec1a
Merge branch 'suite' into aeddaqqa/fix-notifications
aeddaqqa Nov 5, 2024
42af654
Merge pull request #437 from chain4travel/aeddaqqa/fix-notifications
aeddaqqa Nov 5, 2024
4ea48f0
fix(portfolio): make asset element width 100% in Fungibles component
Ysrbolles Nov 10, 2024
57bd935
Merge pull request #440 from chain4travel/assets-misalignment
Ysrbolles Nov 11, 2024
b040f16
chore(submodule): update caminojs
aeddaqqa Nov 14, 2024
6de1235
Merge pull request #442 from chain4travel/update-caminojs
aeddaqqa Nov 14, 2024
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
2 changes: 1 addition & 1 deletion caminojs
Submodule caminojs updated 284 files
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@
"vue": "^2.6.11",
"vue-cli-plugin-vuetify": "^2.0.3",
"vuetify": "^2.6.14",
"vuetify-loader": "^1.9.2"
"vuetify-loader": "^1.9.2",
"xss": "1.0.14"
}
}
27 changes: 25 additions & 2 deletions src/components/CamOfferCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,23 @@
</div>
</div>
</template>
<template v-else-if="isTreasuryRewards">
<div class="offer_detail">
<div class="offer_detail_left">
<p>
{{ $t('earn.rewards.pending_rewards.description') }}
</p>
</div>
<div class="offer_detail_right">
<div class="reward_row">
<label>{{ $t('earn.rewards.pending_rewards.pending_reward') }}:</label>
<p class="reward">
{{ cleanAvaxBN(treasuryRewards.amountToClaim) }} {{ nativeAssetSymbol }}
</p>
</div>
</div>
</div>
</template>
<slot></slot>
</CamCard>
</template>
Expand All @@ -113,7 +130,7 @@ import { cleanAvaxBN, formatDuration } from '@/helpers/helper'
import { WalletHelper } from '@/helpers/wallet_helper'
import AvaAsset from '@/js/AvaAsset'
import { WalletType } from '@/js/wallets/types'
import { PlatformRewardDeposit } from '@/store/modules/platform/types'
import { PlatformRewardDeposit, PlatformRewardTreasury } from '@/store/modules/platform/types'
import { MultisigTx as SignavaultTx } from '@/store/modules/signavault/types'
import { BN, Buffer } from '@c4tplatform/caminojs/dist'
import { ClaimTx, UnsignedTx } from '@c4tplatform/caminojs/dist/apis/platformvm'
Expand All @@ -126,9 +143,10 @@ import CamCard from './CamCard.vue'
})
export default class CamOfferCard extends Vue {
@Prop() readonly title!: string
@Prop() readonly type!: 'offer' | 'reward'
@Prop() readonly type!: 'offer' | 'reward' | 'treasuryRewards'
@Prop() readonly offer!: DepositOffer
@Prop() readonly reward!: PlatformRewardDeposit
@Prop() readonly treasuryRewards!: PlatformRewardTreasury

get isOffer() {
return this.type === 'offer'
Expand All @@ -138,6 +156,10 @@ export default class CamOfferCard extends Vue {
return this.type === 'reward'
}

get isTreasuryRewards() {
return this.type === 'treasuryRewards'
}

get activeWallet(): WalletType {
return this.$store.state.activeWallet
}
Expand Down Expand Up @@ -326,6 +348,7 @@ label {
display: grid;
grid-template-columns: 1fr 1fr;
grid-gap: 1rem;
height: 100%;
.offer_detail_left {
border-right: 2px solid var(--border-color);
}
Expand Down
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
Loading
Loading