diff --git a/src/app/components/pages/CommunitiesIndex.jsx b/src/app/components/pages/CommunitiesIndex.jsx
index 014f043b003d7bc6adf4cc93ed959577ed76f7d5..bd9b52eaec39477ac23924d154a79acfee591c8c 100644
--- a/src/app/components/pages/CommunitiesIndex.jsx
+++ b/src/app/components/pages/CommunitiesIndex.jsx
@@ -21,31 +21,26 @@ export default class CommunitiesIndex extends React.Component {
}
componentWillMount = () => {
- this.props.performSearch(
- this.props.username,
- this.state.searchQuery,
- this.state.searchOrder
- );
+ const { performSearch, username, searchQuery, searchOrder } = this.props;
+ performSearch(username, searchQuery, searchOrder);
};
- componentDidUpdate = (prevProps, prevState) => {
- if (prevProps.username !== this.props.username) {
- this.props.performSearch(
- this.props.username,
- this.state.searchQuery,
- this.state.searchOrder
- );
+
+ componentDidUpdate = prevProps => {
+ const { performSearch, username, searchQuery, searchOrder } = this.props;
+
+ if (prevProps.username !== username) {
+ performSearch(username, searchQuery, searchOrder);
}
};
render() {
- const {
- communities,
- communities_idx,
- username,
- walletUrl,
- performSearch,
- } = this.props;
- const ordered = communities_idx.map(name => communities.get(name));
+ const { communities, communities_idx, username, walletUrl, performSearch } = this.props;
+ const ordered =
+ communities_idx !== null
+ ? communities_idx.map(name => {
+ return communities.get(name);
+ })
+ : [];
const sortOptions = [
{
@@ -62,31 +57,18 @@ export default class CommunitiesIndex extends React.Component {
},
];
- if (communities_idx.size === 0) {
+ const role = comm => {
return (
- <center>
- <LoadingIndicator
- style={{ marginBottom: '2rem' }}
- type="circle"
- />
- </center>
- );
- }
-
- const role = comm =>
- comm.context &&
- comm.context.role !== 'guest' && (
- <span className="user_role">{comm.context.role}</span>
+ comm.context && comm.context.role !== 'guest' && <span className="user_role">{comm.context.role}</span>
);
+ };
const communityAdmins = admins => {
- if (!admins || admins.length === 0) return;
+ if (!admins || admins.length === 0) return null;
return (
<div>
- {admins.length === 1
- ? `${tt('g.administrator')}: `
- : `${tt('g.administrators')}: `}
+ {admins.length === 1 ? `${tt('g.administrator')}: ` : `${tt('g.administrators')}: `}
<UserNames names={admins} />
</div>
);
@@ -104,9 +86,8 @@ export default class CommunitiesIndex extends React.Component {
<br />
{comm.about}
<small>
- {comm.subscribers} subscribers •{' '}
- {comm.num_authors} posters • {comm.num_pending}{' '}
- posts
+ {comm.subscribers}
+ subscribers • {comm.num_authors} posters • {comm.num_pending} posts
{admins}
</small>
</th>
@@ -117,18 +98,14 @@ export default class CommunitiesIndex extends React.Component {
);
};
+ const { searchQuery, searchOrder } = this.state;
+
return (
- <PostsIndexLayout
- category={null}
- enableAds={false}
- blogmode={false}
- >
+ <PostsIndexLayout category={null} enableAds={false} blogmode={false}>
<div className="CommunitiesIndex c-sidebar__module">
{username && (
<div style={{ float: 'right' }}>
- <a href={`${walletUrl}/@${username}/communities`}>
- Create a Community
- </a>
+ <a href={`${walletUrl}/@${username}/communities`}>Create a Community</a>
</div>
)}
@@ -139,16 +116,12 @@ export default class CommunitiesIndex extends React.Component {
<div className="articles__header row">
<div className="small-8 medium-7 large-8 column">
<ElasticSearchInput
- expanded={true}
+ expanded
handleSubmit={q => {
this.setState({
searchQuery: q,
});
- performSearch(
- username,
- q,
- this.state.searchOrder
- );
+ performSearch(username, q, searchOrder);
}}
redirect={false}
/>
@@ -156,24 +129,34 @@ export default class CommunitiesIndex extends React.Component {
<div className="small-4 medium-3 large-4 column">
<NativeSelect
options={sortOptions}
- currentlySelected={this.state.searchOrder}
+ currentlySelected={searchOrder}
onChange={opt => {
this.setState({
searchOrder: opt.value,
});
- performSearch(
- username,
- this.state.searchQuery,
- opt.value
- );
+ performSearch(username, searchQuery, opt.value);
}}
/>
</div>
</div>
<hr />
- <table>
- <tbody>{ordered.map(comm => row(comm.toJS()))}</tbody>
- </table>
+ {ordered.size > 0 && (
+ <div>
+ <table>
+ <tbody>
+ {ordered.map(comm => {
+ return row(comm.toJS());
+ })}
+ </tbody>
+ </table>
+ </div>
+ )}
+ {ordered.size === 0 && <div>{tt('g.community_search_no_result')}</div>}
+ {communities === null && (
+ <center>
+ <LoadingIndicator style={{ marginBottom: '2rem' }} type="circle" />
+ </center>
+ )}
</div>
</PostsIndexLayout>
);
@@ -195,6 +178,7 @@ module.exports = {
dispatch => {
return {
performSearch: (observer, query, sort = 'rank') => {
+ console.log('search', query);
dispatch(
fetchDataSagaActions.listCommunities({
observer,
diff --git a/src/app/components/pages/CommunitiesIndex.scss b/src/app/components/pages/CommunitiesIndex.scss
index 53cf96f78d9a18632070aa4d16c8859874d834a6..3f12667f84c1e06d7711a50d2b29182d61f43bee 100644
--- a/src/app/components/pages/CommunitiesIndex.scss
+++ b/src/app/components/pages/CommunitiesIndex.scss
@@ -15,6 +15,16 @@
}
}
+ table tbody {
+ border: none;
+ }
+
+ table tr {
+ @include themify($themes) {
+ border: themed('border');
+ }
+ }
+
table th {
width: 600px;
diff --git a/src/app/locales/en.json b/src/app/locales/en.json
index 6946e3eb269fe83deb985afc6061b936f8c96395..0a112473fd839a004ba8efc9ef78d853e0616c0a 100644
--- a/src/app/locales/en.json
+++ b/src/app/locales/en.json
@@ -8,8 +8,7 @@
"are_you_sure": "Are you sure?",
"ask": "Ask",
"badges_and_achievements": "Badges and achievements",
- "badges_and_achievements_description":
- "These are badges received by the author via the third-party apps",
+ "badges_and_achievements_description": "These are badges received by the author via the third-party apps",
"badges_and_achievements_none": "You haven't received any badges yet.",
"balance": "Balance: %(balanceValue)s",
"balances": "Balances",
@@ -30,21 +29,18 @@
"collapse_or_expand": "Collapse/Expand",
"communities": "Communities",
"community_subscriptions": "Community Subscriptions",
- "community_subscriptions_description":
- "The author has subscribed to the following Hive Communities",
+ "community_subscriptions_description": "The author has subscribed to the following Hive Communities",
"community_settings_header": "Community Settings",
"community_settings_description": "What does your community stand for?",
"community_list_header": "Communities",
- "community_user_role_add_description":
- "Set the role of a user in this community.",
- "community_user_role_edit_description":
- "Changing @%(username)s's role.",
+ "community_search_no_result": "No results for your search",
+ "community_user_role_add_description": "Set the role of a user in this community.",
+ "community_user_role_edit_description": "Changing @%(username)s's role.",
"community_user_role_add_header": "Add User Role",
"community_user_role_edit_header": "Change User Role",
"community_user_title_edit_header": "Change User Title",
"community_user_title_edit_description": "Set Title for @%(username)s",
- "community_no_subscriptions":
- "Welcome! You don't have any subscriptions yet.",
+ "community_no_subscriptions": "Welcome! You don't have any subscriptions yet.",
"comments": "Comments",
"confirm": "Confirm",
"convert": "Convert",
@@ -93,8 +89,7 @@
"password": "Password",
"payouts": "Payouts",
"permissions": "Permissions",
- "phishy_message":
- "Link expanded to plain text; beware of a potential phishing attempt",
+ "phishy_message": "Link expanded to plain text; beware of a potential phishing attempt",
"pin": "Pin",
"post": "Post",
"post_as_user": "Post as %(username)s",
@@ -135,11 +130,9 @@
"share_this_post": "Share this post",
"social": "Social",
"mute_this_post": "Mute post/comment",
- "mute_this_post_description":
- "Please provide a note regarding your decision to mute this content.",
+ "mute_this_post_description": "Please provide a note regarding your decision to mute this content.",
"unmute_this_post": "Unmute this post/comment",
- "unmute_this_post_description":
- "Please provide a note regarding your decision to unmute this content.",
+ "unmute_this_post_description": "Please provide a note regarding your decision to unmute this content.",
"show": "Show",
"sign_in": "Sign in",
"sign_up": "Sign up",
@@ -179,20 +172,14 @@
"account_name": "Account Name",
"recover_your_account": "recover your account",
"reset_usernames_password": "Reset %(username)s's Password",
- "this_will_update_usernames_authtype_key":
- "This will update %(username)s %(authType)s key",
+ "this_will_update_usernames_authtype_key": "This will update %(username)s %(authType)s key",
"passwords_do_not_match": "Passwords do not match",
- "you_need_private_password_or_key_not_a_public_key":
- "You need a private password or key (not a public key)",
+ "you_need_private_password_or_key_not_a_public_key": "You need a private password or key (not a public key)",
"the_rules_of_APP_NAME": {
- "one":
- "The first rule of %(APP_NAME)s is: Do not lose your password.",
- "second":
- "The second rule of %(APP_NAME)s is: Do not lose your password.",
- "third":
- "The third rule of %(APP_NAME)s is: We cannot recover your password.",
- "fourth":
- "The fourth rule: If you can remember the password, it's not secure.",
+ "one": "The first rule of %(APP_NAME)s is: Do not lose your password.",
+ "second": "The second rule of %(APP_NAME)s is: Do not lose your password.",
+ "third": "The third rule of %(APP_NAME)s is: We cannot recover your password.",
+ "fourth": "The fourth rule: If you can remember the password, it's not secure.",
"fifth": "The fifth rule: Use only randomly-generated passwords.",
"sixth": "The sixth rule: Do not tell anyone your password.",
"seventh": "The seventh rule: Always back up your password."
@@ -200,10 +187,8 @@
"recover_password": "Recover Account",
"current_password": "Current Password",
"generated_password": "Generated Password",
- "backup_password_by_storing_it":
- "Back it up by storing in your password manager or a text file",
- "enter_account_show_password":
- "Enter a valid account name to show the password",
+ "backup_password_by_storing_it": "Back it up by storing in your password manager or a text file",
+ "enter_account_show_password": "Enter a valid account name to show the password",
"click_to_generate_password": "Click to generate password",
"re_enter_generate_password": "Re-enter Generated Password",
"understand_that_APP_NAME_cannot_recover_password":
@@ -212,16 +197,13 @@
"update_password": "Update Password",
"confirm_password": "Confirm Password",
"account_updated": "Account Updated",
- "password_must_be_characters_or_more":
- "Password must be %(amount)s characters or more",
- "need_password_or_key":
- "You need a private password or key (not a public key)",
+ "password_must_be_characters_or_more": "Password must be %(amount)s characters or more",
+ "need_password_or_key": "You need a private password or key (not a public key)",
"login_to_see_memo": "login to see memo",
"new_password": "New Password",
"incorrect_password": "Incorrect password",
"username_does_not_exist": "Username does not exist",
- "account_name_should_start_with_a_letter":
- "Account name should start with a letter.",
+ "account_name_should_start_with_a_letter": "Account name should start with a letter.",
"account_name_should_be_shorter": "Account name should be shorter.",
"account_name_should_be_longer": "Account name should be longer.",
"account_name_should_have_only_letters_digits_or_dashes":
@@ -246,8 +228,7 @@
"sorry_your_reddit_account_doesnt_have_enough_karma":
"Sorry, your Reddit account doesn't have enough Reddit Karma to qualify for a free sign up. Please add your email for a place on the waiting list",
"register_with_facebook": "Register with Facebook",
- "or_click_the_button_below_to_register_with_facebook":
- "Or click the button below to register with Facebook",
+ "or_click_the_button_below_to_register_with_facebook": "Or click the button below to register with Facebook",
"server_returned_error": "server returned error",
"APP_NAME_support": "%(APP_NAME)s Support",
"please_email_questions_to": "Please email your questions to",
@@ -330,27 +311,23 @@
"reply_editor": {
"shorten_title": "Shorten title",
"exceeds_maximum_length": "Exceeds maximum length (%(maxKb)sKB)",
- "including_the_category":
- " (including the category '%(rootCategory)s')",
+ "including_the_category": " (including the category '%(rootCategory)s')",
"use_limited_amount_of_tags":
"You have %(tagsLength)s tags total%(includingCategory)s. Please use only 5 in your post and category line.",
- "are_you_sure_you_want_to_clear_this_form":
- "Are you sure you want to exit the comment editor?",
+ "are_you_sure_you_want_to_clear_this_form": "Are you sure you want to exit the comment editor?",
"uploading": "Uploading...",
"draft_saved": "Draft saved.",
"editor": "Enable WYSIWYG Editor",
"enable_markdown_editor": "Enable Markdown Editor",
"view_html_source": "View HTML source",
- "insert_images_by_dragging_dropping":
- "Insert images by dragging & dropping, ",
+ "insert_images_by_dragging_dropping": "Insert images by dragging & dropping, ",
"pasting_from_the_clipboard": "pasting from the clipboard, ",
"selecting_them": "selecting them",
"image_upload": "Image upload",
"power_up_100": "Power Up 100%%",
"default_50_50": "50%% HBD / 50%% HP",
"decline_payout": "Decline Payout",
- "check_this_to_auto_upvote_your_post":
- "Check this to auto-upvote your post",
+ "check_this_to_auto_upvote_your_post": "Check this to auto-upvote your post",
"markdown_styling_guide": "Markdown Styling Guide",
"or_by": "or by",
"title": "Title of your story",
@@ -375,32 +352,26 @@
"exceeds_max_beneficiaries": "Can have at most 8 beneficiaries",
"beneficiary_cannot_be_self": "Cannot specify self as beneficiary",
"beneficiary_cannot_be_duplicate": "Beneficiary cannot be duplicate",
- "beneficiary_percent_invalid":
- "Beneficiary percentage must be from 1-100",
- "beneficiary_percent_total_invalid":
- "Beneficiary total percentage must be less than 100"
+ "beneficiary_percent_invalid": "Beneficiary percentage must be from 1-100",
+ "beneficiary_percent_total_invalid": "Beneficiary total percentage must be less than 100"
},
"post_template_selector_jsx": {
"templates": "Post templates",
- "templates_description":
- "Manage your post templates, other settings here will also be saved/loaded.",
+ "templates_description": "Manage your post templates, other settings here will also be saved/loaded.",
"choose_template": "-- Choose a template to load --",
"create_template_first": "Please create a template first",
"new_template_name": "Name of a new template",
"template_saved": "Template saved successfully"
},
"category_selector_jsx": {
- "tag_your_story":
- "Tag (up to 8 tags), the first tag is your main category.",
+ "tag_your_story": "Tag (up to 8 tags), the first tag is your main category.",
"select_a_tag": "Select a tag",
- "maximum_tag_length_is_24_characters":
- "Maximum tag length is 24 characters",
+ "maximum_tag_length_is_24_characters": "Maximum tag length is 24 characters",
"use_limited_amount_of_categories": "Please use only %(amount)s tags",
"use_only_lowercase_letters": "Use only lowercase letters",
"use_one_dash": "Use only one dash",
"use_spaces_to_separate_tags": "Use spaces to separate tags",
- "use_only_allowed_characters":
- "Use only lowercase letters, digits and one dash",
+ "use_only_allowed_characters": "Use only lowercase letters, digits and one dash",
"must_start_with_a_letter": "Must start with a letter",
"must_end_with_a_letter_or_number": "Must end with a letter or number",
"must_not_include_hivemind_community_owner":
@@ -408,21 +379,18 @@
},
"post_advanced_settings_jsx": {
"payout_option_header": "Author rewards",
- "payout_option_description":
- "What type of tokens do you want as rewards from this post?",
+ "payout_option_description": "What type of tokens do you want as rewards from this post?",
"current_default": "Default",
"update_default_in_settings": "Update",
"load_template": "Load template",
"delete_template": "Delete template",
"max_accepted_payout": "Maximum Accepted Payout",
- "max_accepted_payout_description":
- "HBD value of the maximum payout this post will receive.",
+ "max_accepted_payout_description": "HBD value of the maximum payout this post will receive.",
"unlimited": "No limit",
"custom_value": "Custom value"
},
"postfull_jsx": {
- "this_post_is_not_available_due_to_a_copyright_claim":
- "This post is not available due to a copyright claim.",
+ "this_post_is_not_available_due_to_a_copyright_claim": "This post is not available due to a copyright claim.",
"share_on_facebook": "Share on Facebook",
"share_on_twitter": "Share on Twitter",
"share_on_reddit": "Share on Reddit",
@@ -432,8 +400,7 @@
"In 3.5 days, convert %(amount)s %(DEBT_TOKEN)s into %(LIQUID_TOKEN)s",
"view_the_full_context": "View the full context",
"view_the_direct_parent": "View the direct parent",
- "you_are_viewing_a_single_comments_thread_from":
- "You are viewing a single comment's thread from",
+ "you_are_viewing_a_single_comments_thread_from": "You are viewing a single comment's thread from",
"authored_by": "Authored by"
},
"recoveraccountstep1_jsx": {
@@ -442,17 +409,13 @@
},
"user_profile": {
"unknown_account": "Unknown Account",
- "user_hasnt_made_any_posts_yet":
- "Looks like %(name)s hasn't made any posts yet!",
- "user_hasnt_started_bloggin_yet":
- "Looks like %(name)s hasn't started blogging yet!",
+ "user_hasnt_made_any_posts_yet": "Looks like %(name)s hasn't made any posts yet!",
+ "user_hasnt_started_bloggin_yet": "Looks like %(name)s hasn't started blogging yet!",
"user_hasnt_followed_anything_yet":
"Looks like %(name)s might not be following anyone yet! If %(name)s recently added new users to follow, their personalized feed will populate once new content is available.",
"user_hasnt_had_any_replies_yet": "%(name)s hasn't had any replies yet",
- "user_hasnt_had_any_notifications_yet":
- "%(name)s hasn't had any notifications yet",
- "looks_like_you_havent_posted_anything_yet":
- "Looks like you haven't posted anything yet.",
+ "user_hasnt_had_any_notifications_yet": "%(name)s hasn't had any notifications yet",
+ "looks_like_you_havent_posted_anything_yet": "Looks like you haven't posted anything yet.",
"create_a_post": "Create a Post",
"explore_trending_articles": "Explore Trending Articles",
"read_the_quick_start_guide": "Read The Quick Start Guide",
@@ -477,15 +440,12 @@
},
"hide_reblogs": "Hide Reblogs",
"show_all": "Show All",
- "hivebuzz_level_badge":
- "This is %(name)s's level badged earned from Hivebuzz programs"
+ "hivebuzz_level_badge": "This is %(name)s's level badged earned from Hivebuzz programs"
},
"post_jsx": {
- "now_showing_comments_with_low_ratings":
- "Now showing comments with low ratings",
+ "now_showing_comments_with_low_ratings": "Now showing comments with low ratings",
"sort_order": "Sort",
- "comments_were_hidden_due_to_low_ratings":
- "Comments were hidden due to low ratings",
+ "comments_were_hidden_due_to_low_ratings": "Comments were hidden due to low ratings",
"comment_sort_order": {
"trending": "Trending",
"votes": "Votes",
@@ -499,8 +459,7 @@
"disagreement_on_rewards": "Disagreement on rewards",
"fraud_or_plagiarism": "Fraud or Plagiarism",
"hate_speech_or_internet_trolling": "Hate Speech or Internet Trolling",
- "intentional_miss_categorized_content_or_spam":
- "Intentional miss-categorized content or Spam",
+ "intentional_miss_categorized_content_or_spam": "Intentional miss-categorized content or Spam",
"pending_payout": "Pending payout amount: $%(value)s",
"payout_declined": "Payout Declined",
"max_accepted_payout": "Max accepted payout: $%(value)s",
@@ -528,8 +487,7 @@
"breakdown": "Breakdown"
},
"votesandcomments_jsx": {
- "no_responses_yet_click_to_respond":
- "No responses yet. Click to respond.",
+ "no_responses_yet_click_to_respond": "No responses yet. Click to respond.",
"response_count_tooltip": {
"zero": "no responses. Click to respond.",
"one": "1 response. Click to respond.",
@@ -554,17 +512,14 @@
"The owner key is the master key for the account and is required to change the other keys.",
"the_private_key_or_password_should_be_kept_offline":
"The private key or password for the owner key should be kept offline as much as possible.",
- "the_memo_key_is_used_to_create_and_read_memos":
- "The memo key is used to create and read memos."
+ "the_memo_key_is_used_to_create_and_read_memos": "The memo key is used to create and read memos."
},
"suggestpassword_jsx": {
"APP_NAME_cannot_recover_passwords_keep_this_page_in_a_secure_location":
"%(APP_NAME)s cannot recover passwords. Keep this page in a secure location, such as a fireproof safe or safety deposit box.",
"APP_NAME_password_backup": "%(APP_NAME)s Password Backup",
- "APP_NAME_password_backup_required":
- "%(APP_NAME)s Password Backup (required)",
- "after_printing_write_down_your_user_name":
- "After printing, write down your user name"
+ "APP_NAME_password_backup_required": "%(APP_NAME)s Password Backup (required)",
+ "after_printing_write_down_your_user_name": "After printing, write down your user name"
},
"converttohive_jsx": {
"your_existing_DEBT_TOKEN_are_liquid_and_transferable":
@@ -580,8 +535,7 @@
"Tradeable tokens that may be transferred anywhere at anytime.<br/>%(LIQUID_TOKEN)s can be converted to %(VESTING_TOKEN)s in a process called powering up.",
"influence_token":
"Influence tokens which give you more control over post payouts and allow you to earn on curation rewards.",
- "estimated_value":
- "The estimated value is based on an average value of %(LIQUID_TOKEN)s in US dollars.",
+ "estimated_value": "The estimated value is based on an average value of %(LIQUID_TOKEN)s in US dollars.",
"non_transferable":
"%(VESTING_TOKEN)s is non-transferable and requires 3 months (13 payments) to convert back to %(LIQUID_TOKEN)s.",
"converted_VESTING_TOKEN_can_be_sent_to_yourself_but_can_not_transfer_again":
@@ -593,10 +547,8 @@
"promote_post": "Promote Post",
"spend_your_DEBT_TOKEN_to_advertise_this_post":
"Spend your %(DEBT_TOKEN)s's to advertise this post in the promoted content section",
- "you_successfully_promoted_this_post":
- "You successfully promoted this post",
- "this_post_was_hidden_due_to_low_ratings":
- "This post was hidden due to low ratings"
+ "you_successfully_promoted_this_post": "You successfully promoted this post",
+ "this_post_was_hidden_due_to_low_ratings": "This post was hidden due to low ratings"
},
"about_jsx": {
"about_app": "About %(APP_NAME)s",
@@ -606,8 +558,7 @@
"resources": "Resources"
},
"markdownviewer_jsx": {
- "images_were_hidden_due_to_low_ratings":
- "Images were hidden due to low ratings."
+ "images_were_hidden_due_to_low_ratings": "Images were hidden due to low ratings."
},
"postsummary_jsx": {
"reblogged": "reblogged",
@@ -650,14 +601,11 @@
"comments_by": "Comments by %(username)s"
},
"loginform_jsx": {
- "you_need_a_private_password_or_key":
- "You need a private password or key (not a public key)",
+ "you_need_a_private_password_or_key": "You need a private password or key (not a public key)",
"cryptography_test_failed": "Cryptography test failed",
- "unable_to_log_you_in":
- "We will be unable to log you in with this browser.",
+ "unable_to_log_you_in": "We will be unable to log you in with this browser.",
"the_latest_versions_of": "The latest versions of ",
- "are_well_tested_and_known_to_work_with":
- "are well tested and known to work with %(APP_URL)s.",
+ "are_well_tested_and_known_to_work_with": "are well tested and known to work with %(APP_URL)s.",
"due_to_server_maintenance":
"Due to server maintenance we are running in read only mode. We are sorry for the inconvenience.",
"login_to_vote": "Login to Vote",
@@ -669,18 +617,14 @@
"This password is bound to your account's owner key and can not be used to login to this site.",
"however_you_can_use_it_to": "However, you can use it to ",
"update_your_password": "update your password",
- "to_obtain_a_more_secure_set_of_keys":
- "to obtain a more secure set of keys.",
+ "to_obtain_a_more_secure_set_of_keys": "to obtain a more secure set of keys.",
"this_password_is_bound_to_your_account_active_key":
"This password is bound to your account's active key and can not be used to login to this page.",
"you_may_use_this_active_key_on_other_more":
"You may use this active key on other more secure pages like the Wallet or Market pages.",
- "you_account_has_been_successfully_created":
- "You account has been successfully created!",
- "you_account_has_been_successfully_recovered":
- "You account has been successfully recovered!",
- "password_update_succes":
- "The password for %(accountName)s was successfully updated",
+ "you_account_has_been_successfully_created": "You account has been successfully created!",
+ "you_account_has_been_successfully_recovered": "You account has been successfully recovered!",
+ "password_update_succes": "The password for %(accountName)s was successfully updated",
"password_info":
"This password or private key was entered incorrectly. There is probably a handwriting or data-entry error. Hint: A password or private key generated by Hive will never contain 0 (zero), O (capital o), I (capital i) and l (lower case L) characters.",
"enter_your_username": "Enter your username",
@@ -698,8 +642,7 @@
"login_warning_body":
"You are attempting to use a key with more permissions than required for everyday hive.blog use. Since keys and passwords are more likely to get compromised the more they are used, it is strongly recommended to only use your Posting Key to log in.",
"continue_anyway": "Continue Anyway",
- "login_warning_link_text":
- "Open my Hive Wallet to access and view my posting key",
+ "login_warning_link_text": "Open my Hive Wallet to access and view my posting key",
"join_our": "Join our",
"sign_transfer": "Sign to complete transfer",
"use_keychain": "Use keychain extension",
@@ -709,22 +652,17 @@
"account_name_should_not_be_empty": "Account name should not be empty.",
"account_name_should_be_longer": "Account name should be longer.",
"account_name_should_be_shorter": "Account name should be shorter.",
- "each_account_segment_should_start_with_a_letter":
- "Each account segment should start with a letter.",
+ "each_account_segment_should_start_with_a_letter": "Each account segment should start with a letter.",
"each_account_segment_should_have_only_letters_digits_or_dashes":
"Each account segment should have only letters, digits, or dashes.",
"each_account_segment_should_have_only_one_dash_in_a_row":
"Each account segment should have only one dash in a row.",
"each_account_segment_should_end_with_a_letter_or_digit":
"Each account segment should end with a letter or digit.",
- "each_account_segment_should_be_longer":
- "Each account segment should be longer.",
- "verified_exchange_no_memo":
- "You must include a memo for your exchange transfer.",
- "badactor":
- "Use caution sending to this account. Please double check your spelling for possible phishing.",
- "memo_has_privatekey":
- "Please do not include what appears to be a private key or password.",
+ "each_account_segment_should_be_longer": "Each account segment should be longer.",
+ "verified_exchange_no_memo": "You must include a memo for your exchange transfer.",
+ "badactor": "Use caution sending to this account. Please double check your spelling for possible phishing.",
+ "memo_has_privatekey": "Please do not include what appears to be a private key or password.",
"memo_is_privatekey": "Do not use private keys in memos.",
"memo_is_password": "Do not use passwords in memos."
},
@@ -769,14 +707,12 @@
"remove": "Remove",
"add_api_endpoint": "Add API Endpoint",
"reset_endpoints": "Reset Endpoints",
- "error_bad_url":
- "This appears to be a bad URL, please check it and try again",
+ "error_bad_url": "This appears to be a bad URL, please check it and try again",
"error_bad_cookie": "Unable to get endpoints from cookie",
"error_already_exists": "This endpoint is already in the list",
"error_cant_remove_active":
"You can't remove the current preferred endpoint. Please select a new preferred endpoint first",
- "error_cant_remove_all":
- "You must have at least one endpoint in the list"
+ "error_cant_remove_all": "You must have at least one endpoint in the list"
},
"transfer_jsx": {
"amount_is_in_form": "Amount is in the form 99999.999",
@@ -787,8 +723,7 @@
"this_memo_is_private": "This memo is private",
"this_memo_is_public": "This memo is public",
"convert_to_VESTING_TOKEN": "Convert to %(VESTING_TOKEN)s",
- "balance_subject_to_3_day_withdraw_waiting_period":
- "Balances subject to 3 day withdraw waiting period.",
+ "balance_subject_to_3_day_withdraw_waiting_period": "Balances subject to 3 day withdraw waiting period.",
"move_funds_to_another_account": "Move funds to another Hive account.",
"protect_funds_by_requiring_a_3_day_withdraw_waiting_period":
"Protect funds by requiring a 3 day withdraw waiting period.",
@@ -796,8 +731,7 @@
"Withdraw funds after the required 3 day waiting period.",
"from": "From",
"to": "To",
- "asset_currently_collecting":
- "%(asset)s currently collecting %(interest)s%% APR.",
+ "asset_currently_collecting": "%(asset)s currently collecting %(interest)s%% APR.",
"beware_of_spam_and_phishing_links":
"Beware of spam and phishing links in transfer memos. Do not open links from users you do not trust. Do not provide your private keys to any third party websites.",
"transactions_make_take_a_few_minutes":
@@ -819,22 +753,18 @@
"withdraw_DEBT_TOKENS": "Withdraw %(DEBT_TOKENS)s",
"tokens_worth_about_1_of_LIQUID_TICKER":
"Tokens worth about $1.00 of %(LIQUID_TICKER)s, currently collecting %(hbdInterest)s%% APR.",
- "tradeable_tokens_transferred":
- "Tradeable tokens that may be transferred anywhere at anytime.",
+ "tradeable_tokens_transferred": "Tradeable tokens that may be transferred anywhere at anytime.",
"savings": "SAVINGS",
"estimated_account_value": "Estimated Account Value",
- "next_power_down_is_scheduled_to_happen":
- "The next power down is scheduled to happen",
+ "next_power_down_is_scheduled_to_happen": "The next power down is scheduled to happen",
"transfers_are_temporary_disabled": "Transfers are temporary disabled.",
"history": "HISTORY",
"redeem_rewards": "Redeem Rewards (Transfer to Balance)",
"buy_hive_or_hive_power": "Buy HIVE or HIVE POWER"
},
"checkloginowner_jsx": {
- "your_password_permissions_were_reduced":
- "Your password permissions were reduced",
- "if_you_did_not_make_this_change":
- "If you did not make this change please",
+ "your_password_permissions_were_reduced": "Your password permissions were reduced",
+ "if_you_did_not_make_this_change": "If you did not make this change please",
"ownership_changed_on": "Ownership Changed On ",
"deadline_for_recovery_is": "Deadline for recovery is",
"i_understand_dont_show_again": "I understand, don't show me again"
@@ -862,8 +792,7 @@
"To keep things free, Hive intelligently allocates Resource Credits to each user based on their Hive Power holdings, which can be used to submit a limited number of feeless transactions. When a user runs low on Resource Credits, they will either need to wait for them to recharge, or purchase additional Hive Power. This system prioritizes actions by good community members while limiting spam.",
"out_of_bandwidth_option_title": "To keep interacting on Hive:",
"out_of_bandwidth_option_1": "Buy and hold more Hive Power",
- "out_of_bandwidth_option_2":
- "Wait until your Resource Credits recharge",
+ "out_of_bandwidth_option_2": "Wait until your Resource Credits recharge",
"out_of_bandwidth_option_3": "Wait until the network usage decreases"
},
"sanitizedlink_jsx": {
@@ -881,8 +810,7 @@
"mentions": "Mentions"
},
"list_management_jsx": {
- "busy":
- "currently waiting for a broadcast operation to finish, try again soon",
+ "busy": "currently waiting for a broadcast operation to finish, try again soon",
"button_unblacklist": "Unblacklist",
"button_unmute": "Unmute",
"button_unfollow_blacklist": "Unfollow Blacklist",
@@ -933,8 +861,7 @@
"page where you can set a description of how you choose who you've added to your lists and if there are any actions that account can take to get removed from them. ",
"info5":
"You can see the descriptions of the lists of other accounts by browsing directly to their personal blacklist or mute list page. These links can be found on their profile page below the follower information. ",
- "info6":
- "To get started, we recommend that you follow the blacklists/mute lists of these accounts: hive.blog",
+ "info6": "To get started, we recommend that you follow the blacklists/mute lists of these accounts: hive.blog",
"info7":
"Click the button below to dismiss this dialog. This will automatically subscribe you to the mute list and blacklist of the hive.blog account.",
"first": "First",
diff --git a/src/app/redux/FetchDataSaga.js b/src/app/redux/FetchDataSaga.js
index 83c3f4762a87cfd88cdb8efab4fc98de623493c6..39a1c805bae74ab5d0e3ebfcbeeb3e0fa6201d25 100644
--- a/src/app/redux/FetchDataSaga.js
+++ b/src/app/redux/FetchDataSaga.js
@@ -1,11 +1,4 @@
-import {
- call,
- put,
- select,
- fork,
- takeLatest,
- takeEvery,
-} from 'redux-saga/effects';
+import { call, put, select, fork, takeLatest, takeEvery } from 'redux-saga/effects';
import { api } from '@hiveio/hive-js';
import { loadFollows } from 'app/redux/FollowSaga';
import * as globalActions from './GlobalReducer';
@@ -14,10 +7,7 @@ import * as transactionActions from './TransactionReducer';
import constants from './constants';
import { fromJS, Map, Set } from 'immutable';
import { getStateAsync, callBridge } from 'app/utils/steemApi';
-import {
- fetchCrossPosts,
- augmentContentWithCrossPost,
-} from 'app/utils/CrossPosts';
+import { fetchCrossPosts, augmentContentWithCrossPost } from 'app/utils/CrossPosts';
const REQUEST_DATA = 'fetchDataSaga/REQUEST_DATA';
const FETCH_STATE = 'fetchDataSaga/FETCH_STATE';
@@ -26,8 +16,7 @@ const GET_COMMUNITY = 'fetchDataSaga/GET_COMMUNITY';
const LIST_COMMUNITIES = 'fetchDataSaga/LIST_COMMUNITIES';
const GET_SUBSCRIPTIONS = 'fetchDataSaga/GET_SUBSCRIPTIONS';
const GET_ACCOUNT_NOTIFICATIONS = 'fetchDataSaga/GET_ACCOUNT_NOTIFICATIONS';
-const GET_UNREAD_ACCOUNT_NOTIFICATIONS =
- 'fetchDataSaga/GET_UNREAD_ACCOUNT_NOTIFICATIONS';
+const GET_UNREAD_ACCOUNT_NOTIFICATIONS = 'fetchDataSaga/GET_UNREAD_ACCOUNT_NOTIFICATIONS';
const MARK_NOTIFICATIONS_AS_READ = 'fetchDataSaga/MARK_NOTIFICATIONS_AS_READ';
const GET_REWARDS_DATA = 'fetchDataSaga/GET_REWARDS_DATA';
@@ -41,10 +30,7 @@ export const fetchDataWatches = [
takeLatest(GET_SUBSCRIPTIONS, getSubscriptions),
takeEvery(LIST_COMMUNITIES, listCommunities),
takeEvery(GET_ACCOUNT_NOTIFICATIONS, getAccountNotifications),
- takeEvery(
- GET_UNREAD_ACCOUNT_NOTIFICATIONS,
- getUnreadAccountNotificationsSaga
- ),
+ takeEvery(GET_UNREAD_ACCOUNT_NOTIFICATIONS, getUnreadAccountNotificationsSaga),
takeEvery(GET_REWARDS_DATA, getRewardsDataSaga),
takeEvery(MARK_NOTIFICATIONS_AS_READ, markNotificationsAsReadSaga),
];
@@ -68,21 +54,14 @@ export function* fetchState(location_change_action) {
// `ignore_fetch` case should only trigger on initial page load. No need to call
// fetchState immediately after loading fresh state from the server. Details: #593
- const server_location = yield select(state =>
- state.offchain.get('server_location')
- );
+ const server_location = yield select(state => state.offchain.get('server_location'));
const ignore_fetch = pathname === server_location && is_initial_state;
if (ignore_fetch) {
return;
}
is_initial_state = false;
- if (
- process.env.BROWSER &&
- window &&
- window.optimize &&
- window.optimize.isInitialized
- ) {
+ if (process.env.BROWSER && window && window.optimize && window.optimize.isInitialized) {
window.optimize.refreshAll({ refresh: false });
}
const url = pathname;
@@ -91,9 +70,7 @@ export function* fetchState(location_change_action) {
try {
let username = null;
if (process.env.BROWSER) {
- [username] = yield select(state => [
- state.user.getIn(['current', 'username']),
- ]);
+ [username] = yield select(state => [state.user.getIn(['current', 'username'])]);
}
const state = yield call(getStateAsync, url, username, false);
yield put(globalActions.receiveState(state));
@@ -111,26 +88,18 @@ function* syncSpecialPosts() {
if (!process.env.BROWSER) return null;
// Get special posts from the store.
- const specialPosts = yield select(state =>
- state.offchain.get('special_posts')
- );
+ const specialPosts = yield select(state => state.offchain.get('special_posts'));
// Mark seen featured posts.
const seenFeaturedPosts = specialPosts.get('featured_posts').map(post => {
const id = `${post.get('author')}/${post.get('permlink')}`;
- return post.set(
- 'seen',
- localStorage.getItem(`featured-post-seen:${id}`) === 'true'
- );
+ return post.set('seen', localStorage.getItem(`featured-post-seen:${id}`) === 'true');
});
// Mark seen promoted posts.
const seenPromotedPosts = specialPosts.get('promoted_posts').map(post => {
const id = `${post.get('author')}/${post.get('permlink')}`;
- return post.set(
- 'seen',
- localStorage.getItem(`promoted-post-seen:${id}`) === 'true'
- );
+ return post.set('seen', localStorage.getItem(`promoted-post-seen:${id}`) === 'true');
});
// Look up seen post URLs.
@@ -173,14 +142,13 @@ function* getAccounts(usernames) {
export function* listCommunities(action) {
const { observer, query, sort } = action.payload;
try {
+ yield put(globalActions.receiveCommunities(null));
const communities = yield call(callBridge, 'list_communities', {
observer,
- query,
+ query: query !== '' ? query : null,
sort,
});
- if (communities.length > 0) {
- yield put(globalActions.receiveCommunities(communities));
- }
+ yield put(globalActions.receiveCommunities(communities));
} catch (error) {
console.log('Error requesting communities:', error);
}
@@ -245,17 +213,10 @@ export function* getAccountNotifications(action) {
if (!action.payload) throw 'no account specified';
yield put(globalActions.notificationsLoading(true));
try {
- const notifications = yield call(
- callBridge,
- 'account_notifications',
- action.payload
- );
+ const notifications = yield call(callBridge, 'account_notifications', action.payload);
if (notifications && notifications.error) {
- console.error(
- '~~ Saga getAccountNotifications error ~~>',
- notifications.error
- );
+ console.error('~~ Saga getAccountNotifications error ~~>', notifications.error);
yield put(appActions.steemApiError(notifications.error.message));
} else {
const limit = action.payload.limit ? action.payload.limit : 100;
@@ -285,19 +246,10 @@ export function* getUnreadAccountNotificationsSaga(action) {
if (!action.payload) throw 'no account specified';
yield put(globalActions.notificationsLoading(true));
try {
- const unreadNotifications = yield call(
- callBridge,
- 'unread_notifications',
- action.payload
- );
+ const unreadNotifications = yield call(callBridge, 'unread_notifications', action.payload);
if (unreadNotifications && unreadNotifications.error) {
- console.error(
- '~~ Saga getUnreadAccountNotifications error ~~>',
- unreadNotifications.error
- );
- yield put(
- appActions.steemApiError(unreadNotifications.error.message)
- );
+ console.error('~~ Saga getUnreadAccountNotifications error ~~>', unreadNotifications.error);
+ yield put(appActions.steemApiError(unreadNotifications.error.message));
} else {
yield put(
globalActions.receiveUnreadNotifications({
@@ -330,9 +282,7 @@ export function* markNotificationsAsReadSaga(action) {
successCallback(username, timeNow);
},
errorCallback: () => {
- console.log(
- 'There was an error marking notifications as read!'
- );
+ console.log('There was an error marking notifications as read!');
globalActions.notificationsLoading(false);
},
})
@@ -396,16 +346,8 @@ export function* fetchData(action) {
const contentKey = keys[ki];
let post = content[contentKey];
- if (
- Object.prototype.hasOwnProperty.call(
- post,
- 'cross_post_key'
- )
- ) {
- post = augmentContentWithCrossPost(
- post,
- crossPosts[post.cross_post_key]
- );
+ if (Object.prototype.hasOwnProperty.call(post, 'cross_post_key')) {
+ post = augmentContentWithCrossPost(post, crossPosts[post.cross_post_key]);
}
data.push(post);
@@ -428,14 +370,9 @@ export function* fetchData(action) {
// Still return all data but only count ones matching the filter.
// Rely on UI to actually hide the posts.
- fetched += postFilter
- ? data.filter(postFilter).length
- : data.length;
+ fetched += postFilter ? data.filter(postFilter).length : data.length;
- fetchDone =
- endOfData ||
- fetchLimitReached ||
- fetched >= constants.FETCH_DATA_BATCH_SIZE;
+ fetchDone = endOfData || fetchLimitReached || fetched >= constants.FETCH_DATA_BATCH_SIZE;
yield put(
globalActions.receiveData({
@@ -460,9 +397,7 @@ export function* fetchData(action) {
@arg {string} url
@arg {object} body (for JSON.stringify)
*/
-function* fetchJson({
- payload: { id, url, body, successCallback, skipLoading = false },
-}) {
+function* fetchJson({ payload: { id, url, body, successCallback, skipLoading = false } }) {
try {
const payload = {
method: body ? 'POST' : 'GET',
@@ -472,9 +407,7 @@ function* fetchJson({
},
body: body ? JSON.stringify(body) : undefined,
};
- let result = yield skipLoading
- ? fetch(url, payload)
- : call(fetch, url, payload);
+ let result = yield skipLoading ? fetch(url, payload) : call(fetch, url, payload);
result = yield result.json();
if (successCallback) result = successCallback(result);
yield put(globalActions.fetchJsonResult({ id, result }));
@@ -488,10 +421,7 @@ export function* getRewardsDataSaga(action) {
try {
const rewards = yield call(callBridge, 'get_payout_stats', {});
if (rewards && rewards.error) {
- console.error(
- '~~ Saga getRewardsDataSaga error ~~>',
- rewards.error
- );
+ console.error('~~ Saga getRewardsDataSaga error ~~>', rewards.error);
yield put(appActions.steemApiError(rewards.error.message));
} else {
yield put(globalActions.receiveRewards({ rewards }));
diff --git a/src/app/redux/GlobalReducer.js b/src/app/redux/GlobalReducer.js
index eda56b32d0cc1e1a41bffcfe09a354f30121f7d7..df00797dcc0c16a8b1aac4a2a7ab0b0b522d2ba8 100644
--- a/src/app/redux/GlobalReducer.js
+++ b/src/app/redux/GlobalReducer.js
@@ -61,9 +61,7 @@ const transformAccount = account =>
*/
const mergeAccounts = (state, account) => {
- return state.updateIn(['accounts', account.get('name')], Map(), a =>
- a.mergeDeep(account)
- );
+ return state.updateIn(['accounts', account.get('name')], Map(), a => a.mergeDeep(account));
};
export default function reducer(state = defaultState, action = {}) {
@@ -72,9 +70,7 @@ export default function reducer(state = defaultState, action = {}) {
switch (action.type) {
case SET_COLLAPSED: {
return state.withMutations(map => {
- map.updateIn(['content', payload.post], value =>
- value.merge(Map({ collapsed: payload.collapsed }))
- );
+ map.updateIn(['content', payload.post], value => value.merge(Map({ collapsed: payload.collapsed })));
});
}
@@ -92,15 +88,10 @@ export default function reducer(state = defaultState, action = {}) {
flag_weight: 0,
},
};
- return state.updateIn(['content', key], Map(), c =>
- c.mergeDeep(update)
- );
+ return state.updateIn(['content', key], Map(), c => c.mergeDeep(update));
case RECEIVE_STATE: {
- console.log(
- 'Merging state',
- state.mergeDeep(fromJS(payload)).toJS()
- );
+ console.log('Merging state', state.mergeDeep(fromJS(payload)).toJS());
return state.mergeDeep(fromJS(payload));
}
@@ -109,9 +100,7 @@ export default function reducer(state = defaultState, action = {}) {
return state.updateIn(['notifications', payload.name], Map(), n =>
n.withMutations(nmut =>
nmut
- .update('notifications', List(), a =>
- a.concat(fromJS(payload.notifications))
- )
+ .update('notifications', List(), a => a.concat(fromJS(payload.notifications)))
.set('isLastPage', payload.isLastPage)
)
);
@@ -141,20 +130,22 @@ export default function reducer(state = defaultState, action = {}) {
}
case RECEIVE_POST_HEADER: {
- return state.update('headers', Map(), a =>
- a.mergeDeep(fromJS(payload))
- );
+ return state.update('headers', Map(), a => a.mergeDeep(fromJS(payload)));
}
case RECEIVE_COMMUNITIES: {
- const map = Map(payload.map(c => [c.name, fromJS(c)]));
- const idx = List(payload.map(c => c.name));
- if (map.length <= 0) {
- debugger;
+ let map = null;
+ let idx = null;
+
+ if (payload !== null) {
+ map = Map(payload.map(c => [c.name, fromJS(c)]));
+ idx = List(payload.map(c => c.name));
+ if (map.length <= 0) {
+ debugger;
+ }
}
- return state
- .setIn(['community'], map)
- .setIn(['community_idx'], idx);
+
+ return state.setIn(['community'], map).setIn(['community_idx'], idx);
}
case RECEIVE_COMMUNITY: {
@@ -166,10 +157,7 @@ export default function reducer(state = defaultState, action = {}) {
}
case RECEIVE_SUBSCRIPTIONS: {
- return state.setIn(
- ['subscriptions', payload.username],
- fromJS(payload.subscriptions)
- );
+ return state.setIn(['subscriptions', payload.username], fromJS(payload.subscriptions));
}
case RECEIVE_REWARDS: {
return state.set('rewards', fromJS(payload.rewards));
@@ -177,17 +165,11 @@ export default function reducer(state = defaultState, action = {}) {
// Interleave special posts into the map of posts.
case SYNC_SPECIAL_POSTS: {
- return payload.featuredPosts
- .concat(payload.promotedPosts)
- .reduce((acc, specialPost) => {
- const author = specialPost.get('author');
- const permlink = specialPost.get('permlink');
- return acc.updateIn(
- ['content', `${author}/${permlink}`],
- Map(),
- p => p.mergeDeep(specialPost)
- );
- }, state);
+ return payload.featuredPosts.concat(payload.promotedPosts).reduce((acc, specialPost) => {
+ const author = specialPost.get('author');
+ const permlink = specialPost.get('permlink');
+ return acc.updateIn(['content', `${author}/${permlink}`], Map(), p => p.mergeDeep(specialPost));
+ }, state);
}
case RECEIVE_CONTENT: {
@@ -196,9 +178,7 @@ export default function reducer(state = defaultState, action = {}) {
console.log('received content...', payload.content);
// merge content object into map
- let new_state = state.updateIn(['content', key], Map(), c =>
- c.mergeDeep(content)
- );
+ let new_state = state.updateIn(['content', key], Map(), c => c.mergeDeep(content));
// merge vote info taking pending votes into account
let votes_key = ['content', key, 'active_votes'];
@@ -219,12 +199,7 @@ export default function reducer(state = defaultState, action = {}) {
}
case LINK_REPLY: {
- const {
- author,
- permlink,
- parent_author = '',
- parent_permlink = '',
- } = payload;
+ const { author, permlink, parent_author = '', parent_permlink = '' } = payload;
const parent_key = postKey(parent_author, parent_permlink);
if (!parent_key) return state;
const key = author + '/' + permlink;
@@ -234,15 +209,8 @@ export default function reducer(state = defaultState, action = {}) {
List(),
l => (l.findIndex(i => i === key) === -1 ? l.push(key) : l)
);
- const children = updatedState.getIn(
- ['content', parent_key, 'replies'],
- List()
- ).size;
- updatedState = updatedState.updateIn(
- ['content', parent_key, 'children'],
- 0,
- () => children
- );
+ const children = updatedState.getIn(['content', parent_key, 'replies'], List()).size;
+ updatedState = updatedState.updateIn(['content', parent_key, 'children'], 0, () => children);
return updatedState;
}
@@ -250,16 +218,11 @@ export default function reducer(state = defaultState, action = {}) {
const { author, permlink } = payload;
const key = author + '/' + permlink;
const content = state.getIn(['content', key]);
- const parent_key = postKey(
- content.get('parent_author'),
- content.get('parent_permlink')
- );
+ const parent_key = postKey(content.get('parent_author'), content.get('parent_permlink'));
let updatedState = state.deleteIn(['content', key]);
if (parent_key) {
- updatedState = updatedState.updateIn(
- ['content', parent_key, 'replies'],
- List(),
- r => r.filter(i => i !== key)
+ updatedState = updatedState.updateIn(['content', parent_key, 'replies'], List(), r =>
+ r.filter(i => i !== key)
);
}
return updatedState;
@@ -281,12 +244,9 @@ export default function reducer(state = defaultState, action = {}) {
case FETCHING_DATA: {
const { order, category } = payload;
- const new_state = state.updateIn(
- ['status', category || '', order],
- () => {
- return { fetching: true };
- }
- );
+ const new_state = state.updateIn(['status', category || '', order], () => {
+ return { fetching: true };
+ });
return new_state;
}
@@ -316,15 +276,12 @@ export default function reducer(state = defaultState, action = {}) {
});
// update status
- new_state = new_state.updateIn(
- ['status', category || '', order],
- () => {
- if (endOfData) {
- return { fetching, last_fetch: new Date() };
- }
- return { fetching };
+ new_state = new_state.updateIn(['status', category || '', order], () => {
+ if (endOfData) {
+ return { fetching, last_fetch: new Date() };
}
- );
+ return { fetching };
+ });
return new_state;
}
@@ -335,9 +292,7 @@ export default function reducer(state = defaultState, action = {}) {
}
case REMOVE: {
- const key = Array.isArray(payload.key)
- ? payload.key
- : [payload.key];
+ const key = Array.isArray(payload.key) ? payload.key : [payload.key];
return state.removeIn(key);
}
@@ -357,9 +312,7 @@ export default function reducer(state = defaultState, action = {}) {
case SHOW_DIALOG: {
const { name, params = {} } = payload;
- return state.update('active_dialogs', Map(), d =>
- d.set(name, fromJS({ params }))
- );
+ return state.update('active_dialogs', Map(), d => d.set(name, fromJS({ params })));
}
case HIDE_DIALOG: {