Merge branch 'max_dev' of Software_Engineering_I/greenvironment-frontend into master

src/app/services/register/register.service.ts

@@ -64,7 +64,7 @@ export class RegisterService {
       friendRequest.senderHandle = request.sender.handle;
       user.receivedRequests.push(friendRequest);
     }
-    if (JSON.parse(response.data.login.settings).darkmode === 'true') {
+    if (JSON.parse(response.data.register.settings).darkmode === 'true') {
       user.darkmode = true;
     }
     this.data.changeUserInfo(user);

src/app/services/selfservice/self.service.ts

@@ -69,7 +69,7 @@ export class SelfService {
       friendRequest.senderHandle = request.sender.handle;
       user.receivedRequests.push(friendRequest);
     }
-    if (JSON.parse(response.data.login.settings).darkmode === 'true') {
+    if (JSON.parse(response.data.getSelf.settings).darkmode === 'true') {
       user.darkmode = true;
     }
     this.data.changeUserInfo(user);