Merge pull request #584 from esteemapp/bugfix/fav

Bugfix/fav
This commit is contained in:
uğur erdal 2019-02-18 22:29:07 +03:00 committed by GitHub
commit d8dbf281c4
3 changed files with 136 additions and 12 deletions

View File

@ -0,0 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>AppCenter.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>56</integer>
</dict>
<key>AppCenterReactNativeShared.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>57</integer>
</dict>
<key>Base64.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>58</integer>
</dict>
<key>CodePush.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>60</integer>
</dict>
<key>DoubleConversion.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>61</integer>
</dict>
<key>FLAnimatedImage.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>62</integer>
</dict>
<key>Folly.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>63</integer>
</dict>
<key>JWT.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>65</integer>
</dict>
<key>Pods-eSteem-tvOS.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>67</integer>
</dict>
<key>Pods-eSteem-tvOSTests.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>68</integer>
</dict>
<key>Pods-eSteem.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>66</integer>
</dict>
<key>Pods-eSteemTests.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>69</integer>
</dict>
<key>QBImagePickerController-QBImagePicker.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>71</integer>
</dict>
<key>QBImagePickerController.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>70</integer>
</dict>
<key>RNImageCropPicker.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>74</integer>
</dict>
<key>RSKImageCropper.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>75</integer>
</dict>
<key>SDWebImage.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>76</integer>
</dict>
<key>SSZipArchive.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>77</integer>
</dict>
<key>boost-for-react-native.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>59</integer>
</dict>
<key>glog.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>64</integer>
</dict>
<key>react-native-fast-image.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>72</integer>
</dict>
<key>react-native-version-number.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>73</integer>
</dict>
</dict>
</dict>
</plist>

View File

@ -39,25 +39,28 @@ class BookmarksScreen extends Component {
const isFavorites = itemType === 'favorites';
const text = isFavorites ? item.account : `${item.author}/${item.permlink}`;
if(item.author || item.account){
return (
<UserListItem
handleOnLongPress={() => this._handleLongPress(isFavorites ? item.account : item._id)}
handleOnPress={() => (isFavorites
? handleOnFavoritePress(item.account)
: handleOnBookarkPress(item.permlink, item.author))
}
index={index}
isClickable
text={text}
username={item.author}
/>
);
handleOnLongPress={() => this._handleLongPress(isFavorites ? item.account : item._id)}
handleOnPress={() => (isFavorites
? handleOnFavoritePress(item.account)
: handleOnBookarkPress(item.permlink, item.author))
}
index={index}
isClickable
text={text}
username={item.author}
/>
);
}
};
_getTabItem = (data, type) => {
const { isLoading, intl } = this.props;
const isNoItem = (data && data.length === 0) || !data;
const placeHolder = type === 'bookmarks' ? <PostCardPlaceHolder /> : <WalletDetailsPlaceHolder />;
const isFavorites = type === 'favorites';
return (
<View style={styles.container}>
@ -73,7 +76,9 @@ class BookmarksScreen extends Component {
) : (
!isNoItem && (
<FlatList
data={data}
data={
data.map((item) => item._id !== data[item._id] && isFavorites ? item.account !== data[item.account] && item : item)
}
keyExtractor={item => item._id}
removeClippedSubviews={false}
renderItem={({ item, index }) => this._renderItem(item, index, type)}