Skip to content

Commit

Permalink
chore: update text
Browse files Browse the repository at this point in the history
  • Loading branch information
AricRedemption committed May 17, 2024
1 parent 8c8221c commit 9e68c60
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 69 deletions.
2 changes: 1 addition & 1 deletion src/components/PasswordInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const levelColors = computed(() => {
<div :class="['w-8 h-1.5 rounded-md', bgColor]" v-for="(bgColor, index) in levelColors" :key="index"></div>
</div>
<div v-if="password">
<span :class="[securityColor]">Password strength: {{ securityLevel }}</span>
<span :class="[securityColor]">{{ securityLevel }}</span>
</div>
</div>
<p v-if="error" class="absolute -bottom-8 left-0 text-sm text-red-500">{{ error }}</p>
Expand Down
12 changes: 6 additions & 6 deletions src/components/ResetModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,27 +60,27 @@ const close = () => {
<div class="flex flex-col gap-2 text-ss">
<div class="p-3.5 bg-gray-secondary rounded-lg flex items-center gap-x-3">
<Checkbox id="tips1" v-model:checked="checked1" />
<p>We neither retain nor furnish assistance in the retrieval of your password.</p>
<p>Metalet Wallet doesn't store your password andcan't help you retrieve it.</p>
</div>
<div class="p-3.5 bg-gray-secondary rounded-lg flex items-center gap-x-3">
<Checkbox id="tips1" v-model:checked="checked2" />
<p>
Should you misplace your password, you have the option to reset the wallet. Alternatively,
re-importation of the wallet utilizing the mnemonic phrase or private key is also feasible.
If you forget your password, you can reset it byresetting your wallet. You can re-import your wallet
with its seed phrase or private keywithout affecting your assets.
</p>
</div>
<div class="p-3.5 bg-gray-secondary rounded-lg flex items-center gap-x-3">
<Checkbox id="tips1" v-model:checked="checked3" />
<p>
Please be advised that the resetting of the wallet without a prior backup will result in the permanent
loss of all assets. Prior to undertaking the reset process, ensure to create backups of all wallets.
If you reset the wallet without backing it up,you'll permanently lose it and all assets. Be sureto
back up all wallets and keep your seed phraseor private key safe before resetting.
</p>
</div>
</div>

<div class="space-y-2">
<p class="text-sm">
Should you affirm your intent to reset your wallet, kindly input the following below:
To confirm wallet reset, please enter:
<span class="text-red-500">RESET</span>
</p>
<input
Expand Down
31 changes: 10 additions & 21 deletions src/pages/wallet/Backup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const next = async () => {
phase.value = 2
error.value = ''
} else {
error.value = 'Incorrect password. Try again.'
error.value = 'Incorrect. Try again.'
return
}
} else if (phase.value === 2) {
Expand All @@ -50,8 +50,7 @@ const next = async () => {
walletIds.push(currentWalletId)
await setBackupV3Wallet(walletIds)
toast({
title: 'Backup Success',
description: 'Your wallet has been backed up successfully',
title: 'Backed up successfully.',
toastType: 'success',
})
router.push('/wallet')
Expand Down Expand Up @@ -84,22 +83,15 @@ const back = () => {
<div class="grow">
<template v-if="phase === 1">
<div class="pt-4 space-y-2">
<h3 class="mt-4 text-2xl font-medium">Backup Mnemonic Phrase</h3>
<p class="mt-2 text-sm text-gray-primary">
Please enter the designated password for your wallet. Upon successful authentication, you will gain the
capability to generate a backup containing your wallet's mnemonic phrase.
</p>
<h3 class="mt-4 text-2xl font-medium">Verify password</h3>
</div>
<PasswordInput v-model:password="password" v-model:error="error" class="mt-12" />
<PasswordInput v-model:password="password" v-model:error="error" class="mt-4" />
</template>

<div v-else-if="phase === 2" class="space-y-8">
<div class="pt-4 space-y-2">
<h3 class="text-2xl font-medium">Please note down the mnemonic phrase below.</h3>
<p class="text-sm text-gray-primary">
Devices connected to the internet are potentially susceptible to information leakage. We emphatically advise
that you backup the mnemonic phrase by transcribing it onto physical paper and ensuring its safekeeping.
</p>
<h3 class="text-2xl font-medium">Write down the words in order.</h3>
<p class="text-sm text-gray-primary">Make sure the keep them stored safely.</p>
</div>
<div class="relative mt-2">
<SeedPhrase :words="mnemonic.split(' ')" :edit="false" :noCopied="true" />
Expand All @@ -114,10 +106,7 @@ const back = () => {
<EyeIcon class="h-5 w-5" />
<span>Show</span>
</button>
<div class="w-64 text-center">
Proceed to view your Mnemonic Phrase by clicking. At this juncture, ascertain that no other individuals
are surveying your screen.
</div>
<div class="w-48 text-center">View your seed phrase. Make sure no one else is looking at your screen.</div>
</div>
</div>
<div class="space-y-2">
Expand All @@ -128,8 +117,8 @@ const back = () => {

<div v-else-if="phase === 3">
<div class="pt-4 space-y-2">
<h3 class="text-2xl font-medium">Please Reconfirm Your Mnemonic Phrase</h3>
<p class="text-sm text-gray-primary">Please enter your mnemonic phrase according to the sequence number.</p>
<h3 class="text-2xl font-medium">Verify your seed phrase</h3>
<p class="text-sm text-gray-primary">Check if you remember these words from your seed phrase in order.</p>
</div>
<VerifySeedPhrase ref="verifySeedPhrase" :randomNum="4" :words="mnemonic.split(' ')" class="mt-8" />
</div>
Expand All @@ -145,7 +134,7 @@ const back = () => {
!password && 'opacity-50 saturate-50 cursor-not-allowed',
]"
>
{{ phase !== 3 ? 'Next' : 'Confirm' }}
{{ [1, 3].includes(phase) ? 'Continue' : phase === 2 ? "OK, I've noted them down." : 'Confirm' }}
</button>
<button @click="showResetModal = true" class="mt-4 text-ss text-gray-primary" v-if="phase === 1">
Forget password?
Expand Down
3 changes: 0 additions & 3 deletions src/pages/wallet/Receive.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ const logo = computed(() => getIcon(coinCategory, genesis || symbol) || '')
<div class="text-xs px-1.5 py-0.5 rounded inline-block bg-gray-light text-gray-primary" v-if="tag">
{{ tag }}
</div>
<div class="text-gray-primary text-xs text-center w-56">
Only supports receiving assets from the {{ network }} network.
</div>
<Divider class="w-[232px] my-4" />
<img :src="qrcode" alt="" class="w-[232px] h-[232px] rounded-lg" />
<div
Expand Down
12 changes: 6 additions & 6 deletions src/pages/wallet/SetPassword.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ const next = async () => {

<template>
<div class="flex h-full flex-col">
<div class="h-15 -my-3 flex items-center">
<div class="h-15 -my-3 flex items-center gap-3">
<ChevronLeftIcon class="w-6 h-6 cursor-pointer" @click="back" />
</div>
<div class="space-y-2 pt-4">
<h3 class="mt-4 text-2xl font-medium">Change Password</h3>
<h3 class="text-2xl font-medium">Change Password</h3>
<p class="mt-2 text-sm text-gray-primary">
This password is exclusively applicable for unlocking your Metalet wallet on this specific device, and please be
advised that Metalet does not possess the capability to retrieve it on your behalf.
Set a password to manage your wallet. Note thatwe don't store your password and can't restore itfor you. lf you
forget your password, you can set anew one by resetting your wallet and re-importing it.
</p>
</div>
<div class="grow">
Expand All @@ -76,8 +76,8 @@ const next = async () => {
/>

<div v-if="phase === 2" class="mt-9 space-y-9">
<PasswordInput v-model:password="password" title="New Password (at least 8 characters)" :validate="true" />
<PasswordInput v-model:password="confirmPassword" title="Confirm Password" v-model:error="error" />
<PasswordInput v-model:password="password" title="New Password" :validate="true" />
<PasswordInput v-model:password="confirmPassword" title="Confirm" v-model:error="error" />
</div>
</div>
<div class="flex items-center justify-center gap-2 my-6">
Expand Down
11 changes: 2 additions & 9 deletions src/pages/welcome/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,8 @@ getAccounts().then((accounts) => {
<FlexBox ai="center" jc="center" :gap="12" class="w-full h-full">
<FlexBox d="col" class="gap-y-15">
<FlexBox d="col" :gap="3">
<div class="text-2xl font-semibold">
Metalet ——
<br />
The Entrance to The Web3 Blockchain
</div>
<p class="text-gray-primary w-96">
Explore the limitless possibilities of blockchain and embark on a journey through the digital realm of the
future.
</p>
<div class="text-2xl font-semibold w-80">The Entrance to The Web3 Blockchain</div>
<p class="text-gray-primary w-96">Metalet is the way to explore your crypto journey.</p>
</FlexBox>
<FlexBox d="col" :gap="4">
<FlexBox :gap="2">
Expand Down
9 changes: 3 additions & 6 deletions src/pages/welcome/components/Activate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ const chains = [
const formSchema = toTypedSchema(
z.object({
chains: z.array(z.string()).refine((value) => value.some((item) => item), {
message: 'Please select at least one network service before launching.',
message: 'Choose at least one network.',
}),
})
)
const { handleSubmit, setFieldValue } = useForm({
const { handleSubmit } = useForm({
validationSchema: formSchema,
initialValues: {
chains: Object.values(Chain),
Expand Down Expand Up @@ -164,10 +164,7 @@ onMounted(async () => {
</span>
</h1>
<template v-if="!error">
<p class="mt-6">Please select a network:</p>
<p class="text-sm mt-2 text-gray-primary text-center w-96">
Metalet currently supports the following blockchain networks. (Supports multiple selections)
</p>
<p class="mt-6">Choose Networks</p>
<form @submit="onSubmit" class="mt-9 relative">
<FormField name="chains">
<FormItem class="flex items-center gap-8">
Expand Down
9 changes: 6 additions & 3 deletions src/pages/welcome/components/CreatePassword.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,14 @@ const submit = async () => {
<FlexBox d="col" class="w-82">
<FlexBox ai="center" :gap="3">
<ArrowLeftIcon @click="$router.go(-1)" class="cursor-pointer w-3.5" />
<div class="text-2xl font-medium">Create Password</div>
<div class="text-2xl font-medium">Set Password</div>
</FlexBox>
<p class="mt-2 font-medium">
Set a password to manage your wallet.
</p>
<p class="mt-2 text-sm text-gray-primary">
This password is solely used for unlocking your Metalet wallet on this device. Metalet cannot recover this
password for you.
It's important to note that we do not retain your password, thus if it is forgotten, you will need to reset your
wallet and re-import it to establish a new one.
</p>
<FlexBox d="col" class="mt-9 gap-y-10">
<PasswordInput v-model:password="password" title="New Password (at least 8 characters)" :validate="true" />
Expand Down
26 changes: 12 additions & 14 deletions src/pages/welcome/components/SelectMvcPath.vue
Original file line number Diff line number Diff line change
Expand Up @@ -133,34 +133,32 @@ const next = () => {
@click="!selectedMvcPath ? emit('preStep') : (selectedMvcPath = false)"
class="cursor-pointer w-3.5"
/>
<div class="text-2xl font-medium">MVC Management</div>
<div class="text-2xl font-medium">MVC</div>
</div>
<div v-if="!selectedMvcPath">
<div class="h-[416px] space-y-4">
<div class="text-xs font-semibold">Select MVC Address Type</div>
<div class="h-[416px]">
<div class="text-xs font-semibold">Choose MVC Address Type</div>
<p class="text-xs text-gray-primary mt-2">If you're unsure what this is, keep the default.</p>
<div
class="flex items-center justify-between bg-gray-secondary rounded-lg p-4 cursor-pointer"
class="flex items-center justify-between bg-gray-secondary rounded-lg p-4 cursor-pointer mt-[22px]"
@click="mvcPath = 10001"
>
<div class="flex flex-col gap-y-1.5 w-64">
<div class="text-sm font-semibold">Default</div>
<div class="text-xs">
The Metalet wallet utilizes a default address generation strategy. The derivation path will be
"m/44'/10001'/0".
</div>
<div class="text-xs">It's default strategy of MVC Address. Using "m/44'/10001'/0'" as derivation path.</div>
</div>
<SuccessIcon v-if="mvcPath === 10001" class="w-5 h-5" />
<div v-else class="w-4 h-4 border border-[#C5C5C5] rounded-full"></div>
</div>
<div
class="flex items-center justify-between bg-gray-secondary rounded-lg p-4 cursor-pointer"
class="flex items-center justify-between bg-gray-secondary rounded-lg p-4 cursor-pointer mt-4"
@click="mvcPath = 236"
>
<div class="flex flex-col gap-y-1.5 w-64">
<div class="text-sm font-semibold">MVC Custom</div>
<div class="text-sm font-semibold">Custom</div>
<div class="text-xs">
Using the custom derivation path with Metalet Wallet, mainly for backward compatibility. When importing
old accounts, please carefully select this option and ensure you know the derivation path.
The custom option is mostly used for backward compatibility. Make sure you know what a derivation path is
if you choose this.
</div>
</div>
<SuccessIcon v-if="mvcPath !== 10001" class="w-5 h-5" />
Expand All @@ -179,17 +177,17 @@ const next = () => {
<div class="flex flex-col gap-4" v-else>
<div class="flex flex-col gap-6 h-[416px]">
<div class="flex flex-col gap-3">
<div class="text-xs font-semibold">Customize your MVC address</div>
<div class="flex items-center justify-between gap-5">
<template v-if="mvcPath !== 10001">
<div class="text-xs font-semibold">MVC Custom</div>
<div class="text-sm tracking-wide">
<span>m/44'/</span>
<input type="text" class="pit-input mx-2 w-16" v-model="mvcPath" />
<span>'/0'</span>
</div>
<DeleteIcon class="cursor-pointer" v-if="false" />
</template>
<div v-else class="text-xs font-semibold">Default</div>
<div v-else class="text-xs font-semibold">Address for MVC</div>
</div>
<div class="flex items-center gap-2 bg-gray-secondary p-3 rounded-lg text-xs">
<Avatar :id="customAddress" />
Expand Down

0 comments on commit 9e68c60

Please sign in to comment.