Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # src/app/(main)/websites/[id]/reports/WebsiteReports.js
2023-10-14 22:00:36 -07:00
parent 012d31e010 30139d65e4
commit 096484ebe4
9 changed files with 97 additions and 103 deletions
--- a/src/app/(main)/settings/users/UserWebsites.js
+++ b/src/app/(main)/settings/users/UserWebsites.js
@@ -22,7 +22,7 @@ export function UserWebsites({ userId }) {
    <Page loading={isLoading} error={error}>
      {hasData && (
        <WebsitesTable
-          data={data}
+          data={data.data}
          onFilterChange={handleFilterChange}
          onPageChange={handlePageChange}
          onPageSizeChange={handlePageSizeChange}