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.

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

Feature/ses 476/remove profile picture #2869

Merged
merged 26 commits into from
Aug 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a9e8862
feat: convered EditProfileDialog to a functional component
yougotwill May 22, 2023
ebeaec2
feat: initial work for set display picture modal done
yougotwill May 22, 2023
88587a2
feat: added button state logic and migrated avatar upload logic from …
yougotwill May 23, 2023
cb7c36e
feat: initial remove profile work done
yougotwill May 23, 2023
84d3d5b
feat: small refactoring
yougotwill May 23, 2023
b59f1bf
feat: desktop now supports avatar being removed via sync configuratio…
yougotwill May 23, 2023
c301eac
feat: added proper typings to icons and added thumbnail icon
yougotwill May 23, 2023
3a0b7d1
feat: added upload image button if user doesn't have an avatar set
yougotwill May 23, 2023
49b4a28
fix: moved all avatar logic from editProfileDialog to DisplayPictureM…
yougotwill May 23, 2023
b2c473c
fix: rename oldAvatarPath to avatarPath for clarity
yougotwill May 23, 2023
977dbea
refactor: rename DisplayPictureModal to EditProfilePictureModal
yougotwill May 23, 2023
b00eb52
fix: pass yarn ready
yougotwill May 23, 2023
178ea03
fix: cleanup
yougotwill May 23, 2023
7cc5cd0
fix: EditProfilePictureModalState should be camel case
yougotwill May 25, 2023
534080d
fix: compressed and flattened thumbail svg path
yougotwill May 25, 2023
69a50cd
fix: sort localised keys generated by updateI18nKeysType
yougotwill May 25, 2023
cb2328b
fix: icon path typing error
yougotwill Jul 10, 2023
41d2760
fix: removed duplicate imports and ordered localised keys
yougotwill Jul 10, 2023
853c9a2
feat: fixed integration tests
yougotwill Jul 18, 2023
0ea6f01
test: fix update profile picture snapshots
Bilb Jul 18, 2023
3c71f2a
Merge pull request #31 from Bilb/feature/ses-476/remove-profile-picture
yougotwill Jul 19, 2023
5d73e4e
fix: updated avatar to correct image
yougotwill Jul 19, 2023
69c8bd7
fix: revert rm to rmdirSync so we don't remove config files before a …
yougotwill Jul 20, 2023
bc081df
Merge branch 'unstable' into feature/ses-476/remove-profile-picture
Bilb Aug 18, 2023
9d4201a
fix: void rather than eslint disable
Bilb Aug 21, 2023
95ac149
fix: call function to upload avatar
Bilb Aug 25, 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 _locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -509,5 +509,6 @@
"reactionPopupThree": "$name$, $name2$ & $name3$",
"reactionPopupMany": "$name$, $name2$, $name3$ &",
"reactionListCountSingular": "And $otherSingular$ has reacted <span>$emoji$</span> to this message",
"reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message"
"reactionListCountPlural": "And $otherPlural$ have reacted <span>$emoji$</span> to this message",
"setDisplayPicture": "Set Display Picture"
}
7 changes: 4 additions & 3 deletions tools/updateI18nKeysType.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from glob import glob
import json
import sys
from collections import OrderedDict

LOCALES_FOLDER = './_locales'

Expand All @@ -16,10 +17,10 @@
stringToWrite = "export type LocalizerKeys =\n | "

with open(EN_FILE,'r') as jsonFile:
data = json.load(jsonFile)
keys = data.keys()
data = json.loads(jsonFile.read(), object_pairs_hook=OrderedDict)
keys = sorted(list(data.keys()))

stringToWrite += json.dumps(list(keys), sort_keys=True).replace(',', '\n |').replace('"', '\'')[1:-1]
stringToWrite += json.dumps(keys, sort_keys=True).replace(',', '\n |').replace('"', '\'')[1:-1]


stringToWrite += ';\n'
Expand Down
Loading