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

# Conflicts: # components/pages/login/LoginForm.js
2023-01-11 14:48:17 -08:00
parent 4f15c4f146 b4bd988e4e
commit 53ec66e820
11 changed files with 67 additions and 53 deletions
--- a/components/pages/settings/users/UsersTable.js
+++ b/components/pages/settings/users/UsersTable.js
@@ -57,13 +57,11 @@ export default function UsersTable({ columns = defaultColumns, onLoading, onAddK

              row.action = (
                <div className={styles.actions}>
-                  <Link href={`/users/${row.id}`} shallow>
-                    <a>
-                      <Button>
-                        <Icon icon="arrow-right" />
-                        Settings
-                      </Button>
-                    </a>
+                  <Link href={`/settings/users/${row.id}`}>
+                    <Button>
+                      <Icon icon="arrow-right" />
+                      Settings
+                    </Button>
                  </Link>
                </div>
              );