Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] ServerDropdown flashing bigger server icon #2775

Merged
merged 4 commits into from
Jan 13, 2021
Merged

[FIX] ServerDropdown flashing bigger server icon #2775

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1b8483
[FIX] ServerDropdown flashing bigger server icon
gerzonc Jan 7, 2021
59c00bd
Remove unused logo and update image path where needed
gerzonc Jan 8, 2021
b587da8
Minor tweak
diegolmello Jan 13, 2021
02106a5
Merge branch 'develop' into fix.serverdropdown-flashing-bigger-server…
diegolmello Jan 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/static/images/logoPlaceholder.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/views/RoomsListView/ServerDropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,14 @@ class ServerDropdown extends Component {
? (
<Image
source={{ uri: item.iconURL }}
defaultSource={{ uri: 'logo' }}
defaultSource={require('../../static/images/logoPlaceholder.png')}
style={styles.serverIcon}
onError={() => console.warn('error loading serverIcon')}
/>
)
: (
<Image
source={{ uri: 'logo' }}
source={require('../../static/images/logoPlaceholder.png')}
style={styles.serverIcon}
/>
)
Expand Down