diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index fac5b42fc..1853c239f 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -102,10 +102,7 @@
"copy-link": "Copy Link",
"count-memos-in-date": "{{count}} memos in {{date}}",
"delete-confirm": "Are you sure you want to delete this memo? THIS ACTION IS IRREVERSIBLE",
- "delete-memo": "Delete Memo",
- "embed": "Embed",
- "fetch-more": "Click to fetch more",
- "fetching-data": "Fetching data…",
+ "load-more": "Load more",
"no-archived-memos": "No archived memos.",
"search-placeholder": "Search memos",
"show-more": "Show more",
diff --git a/web/src/pages/Archived.tsx b/web/src/pages/Archived.tsx
index 18369d60c..02d630815 100644
--- a/web/src/pages/Archived.tsx
+++ b/web/src/pages/Archived.tsx
@@ -132,25 +132,25 @@ const Archived = () => {
))}
- {isRequesting ? (
-
-
-
{t("memo.fetching-data")}
-
- ) : !nextPageToken ? (
- sortedMemos.length === 0 && (
-
-
-
{t("message.no-data")}
-
- )
- ) : (
+ {nextPageToken && (
- } onClick={() => fetchMemos(nextPageToken)}>
- {t("memo.fetch-more")}
+ }
+ onClick={() => fetchMemos(nextPageToken)}
+ >
+ {t("memo.load-more")}
)}
+ {!nextPageToken && sortedMemos.length === 0 && (
+
+
+
{t("message.no-data")}
+
+ )}
diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx
index 9fced6506..d19a1f88f 100644
--- a/web/src/pages/Explore.tsx
+++ b/web/src/pages/Explore.tsx
@@ -78,25 +78,25 @@ const Explore = () => {
{sortedMemos.map((memo) => (
))}
- {isRequesting ? (
-
-
-
{t("memo.fetching-data")}
-
- ) : !nextPageToken ? (
- sortedMemos.length === 0 && (
-
-
-
{t("message.no-data")}
-
- )
- ) : (
+ {nextPageToken && (
- } onClick={() => fetchMemos(nextPageToken)}>
- {t("memo.fetch-more")}
+ }
+ onClick={() => fetchMemos(nextPageToken)}
+ >
+ {t("memo.load-more")}
)}
+ {!nextPageToken && sortedMemos.length === 0 && (
+
+
+
{t("message.no-data")}
+
+ )}
{md && (
diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx
index 22add5e82..811ac3dfc 100644
--- a/web/src/pages/Home.tsx
+++ b/web/src/pages/Home.tsx
@@ -94,25 +94,25 @@ const Home = () => {
{sortedMemos.map((memo) => (
))}
- {isRequesting ? (
-
-
-
{t("memo.fetching-data")}
-
- ) : !nextPageToken ? (
- sortedMemos.length === 0 && (
-
-
-
{t("message.no-data")}
-
- )
- ) : (
+ {nextPageToken && (
- } onClick={() => fetchMemos(nextPageToken)}>
- {t("memo.fetch-more")}
+ }
+ onClick={() => fetchMemos(nextPageToken)}
+ >
+ {t("memo.load-more")}
)}
+ {!nextPageToken && sortedMemos.length === 0 && (
+
+
+
{t("message.no-data")}
+
+ )}
{md && (
diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsx
index 7b698fd39..3afb0f89e 100644
--- a/web/src/pages/UserProfile.tsx
+++ b/web/src/pages/UserProfile.tsx
@@ -134,29 +134,25 @@ const UserProfile = () => {
{sortedMemos.map((memo) => (
))}
- {isRequesting ? (
-
-
-
{t("memo.fetching-data")}
-
- ) : !nextPageToken ? (
- sortedMemos.length === 0 && (
-
-
-
{t("message.no-data")}
-
- )
- ) : (
+ {nextPageToken && (
}
+ color="neutral"
+ loading={isRequesting}
+ endDecorator={}
onClick={() => fetchMemos(nextPageToken)}
>
- {t("memo.fetch-more")}
+ {t("memo.load-more")}
)}
+ {!nextPageToken && sortedMemos.length === 0 && (
+
+
+
{t("message.no-data")}
+
+ )}
>
) : (
Not found