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.

Sign up for GitHub

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

Fix phone inputs #953

Merged
merged 6 commits into from
Feb 10, 2023
Merged

Fix phone inputs #953

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a18bac0
Fix phone inputs
stefashkaa Feb 10, 2023
eff8408
Update Email.vue
RustemYuzlibaev Feb 10, 2023
3fa3874
add const
RustemYuzlibaev Feb 10, 2023
fb1c842
Update Phone.vue
stefashkaa Feb 10, 2023
4121096
Merge branch 'fix/phone' of https://github.com/sora-xor/polkaswap-exc…
stefashkaa Feb 10, 2023
db83fe8
Update Phone.vue
stefashkaa Feb 10, 2023
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
4 changes: 3 additions & 1 deletion src/components/SoraCard/steps/Email.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ export default class SmsCode extends Mixins(TranslationMixin, mixins.LoadingMixi
this.authLogin.SendVerificationEmail().catch(function (error) {
console.error(error);
});

this.emailSent = true;
}

get emailInputDescription(): string {
Expand All @@ -88,7 +90,7 @@ export default class SmsCode extends Mixins(TranslationMixin, mixins.LoadingMixi

if (this.emailResendCount < 0) {
this.emailSent = false;
this.emailResendCount = 30;
this.emailResendCount = 59;
clearInterval(interval);
}
}, 1000);
Expand Down
58 changes: 36 additions & 22 deletions src/components/SoraCard/steps/Phone.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,39 +53,42 @@
</template>

<script lang="ts">
import { Component, Mixins, Prop, Watch } from 'vue-property-decorator';
import TranslationMixin from '@/components/mixins/TranslationMixin';
import { Component, Mixins, Prop, Watch, Ref } from 'vue-property-decorator';
import { XOR } from '@sora-substrate/util/build/assets/consts';
import { mixins, WALLET_CONSTS } from '@soramitsu/soraneo-wallet-web';

import TranslationMixin from '@/components/mixins/TranslationMixin';
import { action, getter, state } from '@/store/decorators';
import { VerificationStatus } from '@/types/card';
import { XOR } from '@sora-substrate/util/build/assets/consts';

const MIN_PHONE_LENGTH_WITH_CODE = 8;

@Component
export default class Phone extends Mixins(TranslationMixin, mixins.LoadingMixin) {
@state.soraCard.authLogin authLogin!: any;
@state.wallet.settings.soraNetwork soraNetwork!: WALLET_CONSTS.SoraNetwork;
@state.soraCard.authLogin private authLogin!: any;
@state.wallet.settings.soraNetwork private soraNetwork!: WALLET_CONSTS.SoraNetwork;

@getter.soraCard.currentStatus private currentStatus!: VerificationStatus;
@getter.soraCard.isEuroBalanceEnough isEuroBalanceEnough!: boolean;
@getter.soraCard.isEuroBalanceEnough private isEuroBalanceEnough!: boolean;

@action.soraCard.getUserStatus private getUserStatus!: AsyncFnWithoutArgs;
@action.soraCard.initPayWingsAuthSdk initPayWingsAuthSdk!: () => Promise<void>;
@action.soraCard.initPayWingsAuthSdk private initPayWingsAuthSdk!: AsyncFnWithoutArgs;

@Prop({ default: false, type: Boolean }) readonly userApplied!: boolean;

phoneNumber = '';
phoneCode = '';
@Ref('code') private readonly inputCode!: HTMLInputElement;
@Ref('phone') private readonly inputPhone!: HTMLInputElement;
@Ref('otp') private readonly inputOtp!: HTMLInputElement;

private countryCodeInternal = '';
private phoneNumberInternal = '';
private smsResendText = '';
private smsResendCount = 59;
private notPassedKycAndNotHasXorEnough = false; // may be removed and `isEuroBalanceEnough` used instead?

verificationCode = '';
smsSent = false;
smsResendTimer = null;
smsResendCount = 59;
smsResendText = '';
sendOtpBtnLoading = false;
notPassedKycAndNotHasXorEnough = false;

loginApi: any = null;

@Watch('smsResendCount', { immediate: true })
private handleSmsCountChange(value: number): void {
Expand Down Expand Up @@ -122,15 +125,25 @@ export default class Phone extends Mixins(TranslationMixin, mixins.LoadingMixin)
}

get countryCode(): string {
return this.phoneCode;
return this.countryCodeInternal;
}

set countryCode(numChar: string) {
if (numChar.length > 3) {
(this.$refs.phone as HTMLInputElement).focus();
set countryCode(value: string) {
if (value.length > 3) {
this.inputPhone.focus();
}
this.countryCodeInternal = value;
}

this.phoneCode = numChar;
get phoneNumber(): string {
return this.phoneNumberInternal;
}

set phoneNumber(value: string) {
if (!value.length) {
this.inputCode.focus();
}
this.phoneNumberInternal = value;
}

/** Real example when `countryCode` is empty */
Expand Down Expand Up @@ -206,7 +219,8 @@ export default class Phone extends Mixins(TranslationMixin, mixins.LoadingMixin)
}

async mounted(): Promise<void> {
(this.$refs.code as HTMLInputElement).focus();
await this.$nextTick();
this.inputCode.focus();

await this.initPayWingsAuthSdk();

Expand All @@ -216,7 +230,7 @@ export default class Phone extends Mixins(TranslationMixin, mixins.LoadingMixin)
.on('SendOtp-Success', () => {
this.smsSent = true;
this.$nextTick(() => {
(this.$refs.otp as HTMLInputElement).focus();
this.inputOtp.focus();
});
})
.on('MinimalRegistrationReq', () => {
Expand Down