Skip to content
Snippets Groups Projects
Commit f1436550 authored by Jason Salyers's avatar Jason Salyers
Browse files

Merge branch '69-profile-settings-are-broken' into 'develop'

Resolve "Profile settings are broken"

Closes #69

See merge request !79
parents 7fd23db7 965f7335
No related branches found
No related tags found
2 merge requests!80Pending changes from develop,!79Resolve "Profile settings are broken"
......@@ -285,7 +285,11 @@ class Settings extends React.Component {
//this one is always present even if the api config call fails
if (endpoint !== preferred_api_endpoint) {
const entry = <option value={endpoint}>{endpoint}</option>;
const entry = (
<option key={endpoint} value={endpoint}>
{endpoint}
</option>
);
entries.push(entry);
}
}
......@@ -737,7 +741,9 @@ function read_profile_v2(account) {
// use new `posting_json_md` if {version: 2} is present
let md = o2j.ifStringParseJSON(account.get('posting_json_metadata'));
md.profile.account_is_witness = accountIsWitness;
if (md && md.profile && md.profile.account_is_witness) {
md.profile.account_is_witness = accountIsWitness;
}
if (md && md.profile && md.profile.version) return md;
// otherwise, fall back to `json_metadata`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment