Skip to content

fix: specify which mailbox to load more from #11350

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: specify which mailbox to load more from #11350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d54d3d0
fix: specify which mailbox to load more from
hamza221 Jul 2, 2025
db11c25
fixup! fix: specify which mailbox to load more from
hamza221 Jul 2, 2025
d9008a8
fixup! fix: specify which mailbox to load more from
hamza221 Jul 2, 2025
a37a488
fixup! fix: specify which mailbox to load more from
hamza221 Jul 15, 2025
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
6 changes: 5 additions & 1 deletion src/components/EnvelopeList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
class="load-more"
@click="$emit('load-more')">
<AddIcon :size="16" />
{{ t('mail', 'Load more') }}
{{ loadMoreLabel }}
</div>
<div id="load-more-mail-messages" key="loadingMore" :class="{'icon-loading-small': loadingMore}" />
</transition-group>
Expand Down Expand Up @@ -196,6 +196,10 @@ export default {
type: Object,
required: true,
},
loadMoreLabel: {
type: String,
default: '',
Copy link
Member

Choose a reason for hiding this comment

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

nit: fallback to t('mail', 'Load more')?

},
mailbox: {
type: Object,
required: true,
Expand Down
5 changes: 5 additions & 0 deletions src/components/Mailbox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<EmptyMailbox v-else-if="!hasMessages" key="empty" />
<EnvelopeList v-else
:account="account"
:load-more-label="loadMoreLabel"
:mailbox="mailbox"
:search-query="searchQuery"
:envelopes="envelopesToShow"
Expand Down Expand Up @@ -61,6 +62,10 @@ export default {
},
mixins: [isMobile],
props: {
loadMoreLabel: {
type: String,
default: '',
Copy link
Member

Choose a reason for hiding this comment

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

nit: default undefined so the EnvelopeList default is used when nothing is passed?

},
account: {
type: Object,
required: true,
Expand Down
3 changes: 3 additions & 0 deletions src/components/MailboxThread.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
</Popover>
</div>
<Mailbox v-show="hasFollowUpEnvelopes"
:load-more-label="t('mail', 'Load more follow ups')"
:account="unifiedAccount"
:mailbox="followUpMailbox"
:search-query="appendToSearch(followUpQuery)"
Expand Down Expand Up @@ -81,6 +82,7 @@
</div>
<Mailbox v-show="hasImportantEnvelopes"
class="nameimportant"
:load-more-label="t('mail', 'Load more important messages')"
:account="unifiedAccount"
:mailbox="unifiedInbox"
:search-query="appendToSearch(priorityImportantQuery)"
Expand All @@ -93,6 +95,7 @@
class="app-content-list-item section-title other"
:name="t('mail', 'Other')" />
<Mailbox class="nameother"
:load-more-label="t('mail', 'Load more other messages')"
:account="unifiedAccount"
:mailbox="unifiedInbox"
:search-query="appendToSearch(priorityOtherQuery)"
Expand Down
Loading