Commit 50debe44 authored by Jason Salyers's avatar Jason Salyers
Browse files

[JES] Try and bring this older branch back to life with current develop. Final...

[JES] Try and bring this older branch back to life with current develop. Final testing is also still needed
parent 6f675e21
......@@ -1043,9 +1043,6 @@ class Settings extends React.Component {
</div>
</div>
)}
<div>
<h4>Blacklisted Users</h4>
</div>
</div>
);
}
......@@ -1057,6 +1054,7 @@ function read_profile_v2(account) {
// use new `posting_json_md` if {version: 2} is present
let md = o2j.ifStringParseJSON(account.get('posting_json_metadata'));
console.log('*****debug***** md is: ', md);
if (md && md.profile && md.profile.account_is_witness) {
md.profile.account_is_witness = accountIsWitness;
}
......
......@@ -494,6 +494,10 @@ class ListManagement extends React.Component {
</center>
);
console.log(
'*****DEBUG***** profile is: ',
this.props.profile.get('metadata')
);
let blacklist_description = this.props.profile
.get('metadata')
.get('profile')
......
......@@ -154,7 +154,7 @@
padding: 0px 10px;
border-left: 1px solid #CCC;
&:first-child {border-left: none;}
&:nth-child(6) {border-left: none;}
&:nth-child(5) {border-left: none; border-right: 1px solid #CCC}
}
}
}
......
......@@ -858,7 +858,7 @@
"all": "All",
"replies": "Replies",
"follows": "Follows",
"resteems": "Resteems",
"resteems": "Reblogs",
"upvotes": "Upvotes",
"mentions": "Mentions"
},
......
......@@ -55,7 +55,9 @@ export function* getAccount(username, force = false) {
account.account_is_witness = true;
}
console.log('*****DEBUG***** raw account:', account);
account = fromJS(account);
console.log('*****DEBUG***** account fromJS: ', account);
yield put(globalActions.receiveAccount({ account }));
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment