Merge branch 'master' into prod

2 files changed, 6 insertions, 1 deletions

diff --git a/routes/payments.js b/routes/payments.js
index d60d4e2e..dc298c1a 100644
--- a/routes/payments.js
+++ b/routes/payments.js
@@ -125,6 +125,11 @@ app.get("/payments", auth, async (req, res) => {
       model: db.Account,
       as: "account"
     },
+    include: {
+      attrs: ["username", "profile"],
+      model: db.User,
+      as: "with"
+    },
     limit,
     offset
   });
diff --git a/routes/users.js b/routes/users.js
index da8dfca0..b142eb3a 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -57,7 +57,7 @@ app.get("/users/:username", async (req, res) => {
   const { username } = req.params;
 
   const user = await db.User.findOne({
-    attributes: ["username", "banner", "profile", "address"],
+    attributes: ["username", "banner", "profile", "address", "currency"],
     where: Sequelize.where(
       Sequelize.fn("lower", Sequelize.col("username")),
       username.toLowerCase()