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

[TAS-2568]🐛 Fix login issue on claimed book pages #1941

Merged
merged 2 commits into from
Nov 8, 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
1 change: 1 addition & 0 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@
"nft_claim_claim_header_title": "Claimed Ebook",
"nft_claim_claimed_button_start_reading": "Start reading",
"nft_claim_claimed_button_view_collection": "View collection",
"nft_claim_claimed_button_view_collection_sign_in": "Sign in to continue",
"nft_claim_claimed_content_autoDelivery": "{publisher} has just sent you {name}, Visit your dashboard to start reading.",
"nft_claim_claimed_content_manualDelivery": "Please wait for the author to sign and send the eBook, which may take about 1-3 days. Any update will be notified via email. Thank you for your support!",
"nft_claim_claimed_content_mixedDelivery": "Some of the book requires author to sign and send the eBook, which may take about 1-3 days. Any update will be notified via email. For auto delivered books, visit your dashboard to start reading. Thank you for your support!",
Expand Down
1 change: 1 addition & 0 deletions src/locales/zh-Hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@
"nft_claim_claim_header_title": "領取的電子書",
"nft_claim_claimed_button_start_reading": "開始閱讀",
"nft_claim_claimed_button_view_collection": "檢視收藏",
"nft_claim_claimed_button_view_collection_sign_in": "登入以繼續",
"nft_claim_claimed_content_autoDelivery": "{publisher} 已發送 {name} 。你可到 Liker Land 個人主頁查看你的收藏,及閱讀內容",
"nft_claim_claimed_content_manualDelivery": "請等候創作者簽署及發送電子書,大概需約 1-3 天時間,我們將會電郵通知你。感謝支持!",
"nft_claim_claimed_content_mixedDelivery": "部份簽名版書籍需要由創作者親自簽署及發送,大概需約 1-3 天時間,屆時我們將會以電郵通知。你可到 Liker Land 個人主頁查看收藏,及閱讀內容。感謝支持!",
Expand Down
55 changes: 37 additions & 18 deletions src/pages/nft/claim/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@
@click="handleStartReading"
/>
<ButtonV2
v-if="claimingAddress"
:content-class="['px-[48px]']"
class="phoneLg:w-full phoneLg:max-w-[480px]"
:preset="isViewCollectionLoading ? 'plain' : 'tertiary'"
Expand All @@ -543,6 +544,15 @@
"
@click="handleViewCollection"
/>
<ProgressIndicator v-else-if="isLoginLoading" />
<ButtonV2
v-else
:content-class="['px-[48px]']"
class="phoneLg:w-full phoneLg:max-w-[480px]"
preset="tertiary"
:text="$t('nft_claim_claimed_button_view_collection_sign_in')"
@click="handleClickSignIn"
/>
</template>
</NFTClaimMainSection>
</div>
Expand Down Expand Up @@ -783,6 +793,11 @@ export default {
},
watch: {
claimingAddress(newValue) {
if (this.state === NFT_CLAIM_STATE.CLAIMED) {
// For the case where the user is already claimed and went back to the page
this.navigateToState(NFT_CLAIM_STATE.CLAIMED);
return;
}
if (
!newValue &&
!(
Expand Down Expand Up @@ -1299,18 +1314,23 @@ export default {
this.productId,
1
);
this.isLoginLoading = true;
if (!this.claimingAddress) {
const isConnected = await this.connectWallet({
isOpenAuthcore: true,
isSignUp: true,
});
if (isConnected || this.loginAddress) {
this.navigateToState(NFT_CLAIM_STATE.ID_CONFIRMATION);
try {
this.isLoginLoading = true;
if (!this.claimingAddress) {
const isConnected = await this.connectWallet({
isOpenAuthcore: true,
isSignUp: true,
});
if (isConnected || this.loginAddress) {
this.navigateToState(NFT_CLAIM_STATE.ID_CONFIRMATION);
}
} else {
await this.initIfNecessary();
}
} else {
await this.initIfNecessary();
} finally {
this.isLoginLoading = false;
}

this.isLoginLoading = false;
},
async handleClickSignIn() {
Expand All @@ -1325,15 +1345,14 @@ export default {
this.navigateToState(NFT_CLAIM_STATE.ID_CONFIRMATION);
return;
}
this.isLoginLoading = true;
if (!this.claimingAddress) {
const isConnected = await this.connectWallet();
if (isConnected || this.loginAddress) {
this.navigateToState(NFT_CLAIM_STATE.ID_CONFIRMATION);
}
} else {
await this.initIfNecessary();
if (this.loginAddress) {
this.isLoginLoading = true;
await this.connectWallet();
Comment on lines +1349 to +1350
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrap in try finally?

if (this.claimingAddress) {
if (this.state === NFT_CLAIM_STATE.CLAIMED) {
this.navigateToState(NFT_CLAIM_STATE.CLAIMED);
return;
}
this.navigateToState(NFT_CLAIM_STATE.ID_CONFIRMATION);
}
}
Expand Down
Loading