Skip to content

Commit 415aa51

Browse files
authored
Merge pull request #952 from bcgov/4153-acc-info-flickering
flickering issue in address fields in account info page
2 parents a5f59c4 + 92c6398 commit 415aa51

File tree

1 file changed

+24
-14
lines changed

1 file changed

+24
-14
lines changed

auth-web/src/components/auth/AccountInfo.vue

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,23 @@
8282
</div>
8383
</div>
8484

85-
<div class="nv-list-item" v-if="baseAddress && (isAddressViewable || isAddressEditable)">
86-
<div class="name">
87-
Mailing Address
88-
</div>
89-
<div class="value">
90-
<base-address-form
91-
ref="mailingAddress"
92-
:editing="isBaseAddressEditMode"
93-
:schema="baseAddressSchema"
94-
:address="baseAddress"
95-
@update:address="updateAddress"
96-
@valid="checkBaseAddressValidity"
97-
/>
98-
</div>
85+
<div class="nv-list-item" v-if="(isAddressEditable || isAddressViewable)">
86+
<!-- template warpper is required here inorder to keep the placement of divs correctly(to resolve flickering issue when updating the address) -->
87+
<template v-if="baseAddress">
88+
<div class="name">
89+
Mailing Address
90+
</div>
91+
<div class="value">
92+
<base-address-form
93+
ref="mailingAddress"
94+
:editing="isBaseAddressEditMode"
95+
:schema="baseAddressSchema"
96+
:address="baseAddress"
97+
@update:address="updateAddress"
98+
@valid="checkBaseAddressValidity"
99+
/>
100+
</div>
101+
</template>
99102
</div>
100103

101104
<div v-if="editEnabled">
@@ -215,6 +218,10 @@ export default class AccountInfoEdit extends Mixins(AccountChangeMixin) {
215218
return this.currentOrgAddress
216219
}
217220
221+
private set baseAddress (address) {
222+
this.setCurrentOrganizationAddress(address)
223+
}
224+
218225
private updateAddress (address: Address) {
219226
this.setCurrentOrganizationAddress(address)
220227
this.enableBtn()
@@ -226,6 +233,9 @@ export default class AccountInfoEdit extends Mixins(AccountChangeMixin) {
226233
if (this.isPremiumAccount) {
227234
await this.syncPaymentSettings(accountSettings.id)
228235
await this.syncAddress()
236+
} else {
237+
// inorder to hide the address if not premium account
238+
this.baseAddress = null
229239
}
230240
}
231241

0 commit comments

Comments
 (0)