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(friends): Fix did hash for outgoing/incoming being reversed #1250

Merged
merged 10 commits into from
Oct 9, 2023
Merged

fix(friends): Fix did hash for outgoing/incoming being reversed #1250

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
589eb8b
fix did hash for outgoing/incoming being reversed
Flemmli97 Sep 28, 2023
b787ab1
Merge branch 'dev' into friend_hash_fix
phillsatellite Sep 28, 2023
43d7a35
fix blocked list hash
Flemmli97 Sep 29, 2023
decdd42
Merge branch 'dev' into friend_hash_fix
Flemmli97 Oct 2, 2023
1a409e5
Merge branch 'dev' into friend_hash_fix
dariusc93 Oct 2, 2023
da68b05
Merge branch 'dev' into friend_hash_fix
stavares843 Oct 3, 2023
205c771
set short did for unitialized identity
Flemmli97 Oct 5, 2023
6c82077
Merge branch 'dev' into friend_hash_fix
Flemmli97 Oct 5, 2023
3afe37b
Merge branch 'dev' into friend_hash_fix
dariusc93 Oct 6, 2023
1fa3e1d
Merge branch 'dev' into friend_hash_fix
stavares843 Oct 6, 2023
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
3 changes: 2 additions & 1 deletion ui/src/components/friends/incoming_requests/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ pub fn PendingFriends(cx: Scope) -> Element {
let _status_message = friend.status_message().unwrap_or_default();
let did = friend.did_key();
let did2 = did.clone();
let did_suffix: String = did.to_string().chars().rev().take(6).collect();
let mut did_suffix: String = did.to_string();
did_suffix = did_suffix.char_indices().nth_back(6).map(|(i,_)|did_suffix[i..].to_string()).unwrap_or_default();
Flemmli97 marked this conversation as resolved.
Show resolved Hide resolved
let platform = friend.platform().into();
let friend2 = friend.clone();
let friend3 = friend.clone();
Expand Down
3 changes: 2 additions & 1 deletion ui/src/components/friends/outgoing_requests/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ pub fn OutgoingRequests(cx: Scope) -> Element {
friends_list.into_iter().map(|friend| {
let did = friend.did_key();
let did2 = did.clone();
let did_suffix: String = did.to_string().chars().rev().take(6).collect();
let mut did_suffix: String = did.to_string();
did_suffix = did_suffix.char_indices().nth_back(6).map(|(i,_)|did_suffix[i..].to_string()).unwrap_or_default();
Flemmli97 marked this conversation as resolved.
Show resolved Hide resolved
let platform = friend.platform().into();
let any_button_disabled = remove_in_progress.current().contains(&did);
rsx!(
Expand Down