From 12953bb569e8e542e9e158c105994fc108fa9637 Mon Sep 17 00:00:00 2001 From: Michael Yankelev Date: Thu, 11 Nov 2021 15:22:51 +0200 Subject: [PATCH 01/10] update package --- packages/files-ui/package.json | 2 +- packages/gaming-ui/package.json | 2 +- packages/storage-ui/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/files-ui/package.json b/packages/files-ui/package.json index 0de1624f5a..aa63b8d35c 100644 --- a/packages/files-ui/package.json +++ b/packages/files-ui/package.json @@ -6,7 +6,7 @@ "@babel/core": "^7.12.10", "@babel/runtime": "^7.0.0", "@chainsafe/browser-storage-hooks": "^1.0.1", - "@chainsafe/files-api-client": "^1.18.19", + "@chainsafe/files-api-client": "^1.18.20", "@chainsafe/web3-context": "1.1.4", "@lingui/core": "^3.7.2", "@lingui/react": "^3.7.2", diff --git a/packages/gaming-ui/package.json b/packages/gaming-ui/package.json index bc30f7d52c..3098d56e7d 100644 --- a/packages/gaming-ui/package.json +++ b/packages/gaming-ui/package.json @@ -6,7 +6,7 @@ "@babel/core": "^7.12.10", "@babel/runtime": "^7.0.0", "@chainsafe/browser-storage-hooks": "^1.0.1", - "@chainsafe/files-api-client": "^1.18.19", + "@chainsafe/files-api-client": "^1.18.20", "@chainsafe/web3-context": "1.1.4", "@lingui/core": "^3.7.2", "@lingui/react": "^3.7.2", diff --git a/packages/storage-ui/package.json b/packages/storage-ui/package.json index a912064d6b..872888ea68 100644 --- a/packages/storage-ui/package.json +++ b/packages/storage-ui/package.json @@ -6,7 +6,7 @@ "@babel/core": "^7.12.10", "@babel/runtime": "^7.0.0", "@chainsafe/browser-storage-hooks": "^1.0.1", - "@chainsafe/files-api-client": "^1.18.19", + "@chainsafe/files-api-client": "^1.18.20", "@chainsafe/web3-context": "1.1.4", "@lingui/core": "^3.7.2", "@lingui/react": "^3.7.2", diff --git a/yarn.lock b/yarn.lock index e606cb7a0a..a0cb19c4bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1925,10 +1925,10 @@ resolved "https://registry.yarnpkg.com/@chainsafe/browser-storage-hooks/-/browser-storage-hooks-1.0.1.tgz#26d32cde1999914db755a631e2643823c54959f7" integrity sha512-Q4b5gQAZnsRXKeADspd5isqfwwhhXjDk70y++YadufA6EZ3tf340oW0OVszp74KaGEw+CAYFGQR4X7bzpZ3x9Q== -"@chainsafe/files-api-client@^1.18.19": - version "1.18.19" - resolved "https://registry.yarnpkg.com/@chainsafe/files-api-client/-/files-api-client-1.18.19.tgz#2093d508d55b71abb3ec9cfb9c219fa62a4494c4" - integrity sha512-fFIGJg3XcS3hrNq4+UxjOEYYYiOtrYLTKxn0c/jXrlDFxA+Zjsn6G6d5O+KHJVfqoinRIyrRrMPXBHpBlFHpZg== +"@chainsafe/files-api-client@^1.18.20": + version "1.18.20" + resolved "https://registry.yarnpkg.com/@chainsafe/files-api-client/-/files-api-client-1.18.20.tgz#5b184946acfa4026b21c95faa2f0c1c9d9999481" + integrity sha512-OQN4V2bUe0981RsBirjNA2YrkaMzAV/7oWSzBwN27ejhAbM6fRbxDEYTZfLRVuick91/JfM2/TbKc3vHYQRDdg== dependencies: "@redocly/openapi-cli" "^1.0.0-beta.58" "@redocly/openapi-core" "^1.0.0-beta.58" From 3c0d8ca66b47e168fe5bcdfa3b240c7c06135cb4 Mon Sep 17 00:00:00 2001 From: Michael Yankelev Date: Thu, 11 Nov 2021 16:21:09 +0200 Subject: [PATCH 02/10] fix lookup call params --- .../Modules/FileBrowsers/hooks/useLookupUser.tsx | 14 ++++++++------ packages/files-ui/src/Contexts/UserContext.tsx | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx index 918e956183..4219bba271 100644 --- a/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx +++ b/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx @@ -1,4 +1,3 @@ -import { LookupUserRequest } from "@chainsafe/files-api-client" import { t } from "@lingui/macro" import { useCallback, useState } from "react" import { useFilesApi } from "../../../../Contexts/FilesApiContext" @@ -25,9 +24,8 @@ export const useLookupSharedFolderUser = () => { )) if (foundIntersectingUsers.length) { - setUsersError(t`User ${ - centerEllipsis(foundIntersectingUsers[0].label) - } is both a reader and writer`) + setUsersError(t`User ${centerEllipsis(foundIntersectingUsers[0].label) + } is both a reader and writer`) } else { setUsersError("") } @@ -36,7 +34,11 @@ export const useLookupSharedFolderUser = () => { const handleLookupUser = useCallback(async (inputVal: string, permission: SharedFolderUserPermission) => { if (inputVal === "") return [] - const lookupBody: LookupUserRequest = {} + const lookupBody = { + public_address: undefined as string | undefined, + identity_public_key: undefined as string | undefined, + username: undefined as string | undefined + } const ethAddressRegex = new RegExp("^0(x|X)[a-fA-F0-9]{40}$") // Eth Address Starting with 0x and 40 HEX chars const pubKeyRegex = new RegExp("^0(x|X)[a-fA-F0-9]{66}$") // Compressed public key, 66 chars long @@ -49,7 +51,7 @@ export const useLookupSharedFolderUser = () => { } try { - const result = await filesApiClient.lookupUser(lookupBody) + const result = await filesApiClient.lookupUser(...Object.values(lookupBody)) if (!result) return [] const usersList = permission === "read" ? sharedFolderReaders : sharedFolderWriters diff --git a/packages/files-ui/src/Contexts/UserContext.tsx b/packages/files-ui/src/Contexts/UserContext.tsx index 058edf38ce..e20e164053 100644 --- a/packages/files-ui/src/Contexts/UserContext.tsx +++ b/packages/files-ui/src/Contexts/UserContext.tsx @@ -181,7 +181,7 @@ const UserProvider = ({ children }: UserContextProps) => { const lookupOnUsername = async (username: string) => { if (!profile) return false try { - const alreadyExists = await filesApiClient.lookupUser({ username }) + const alreadyExists = await filesApiClient.lookupUser(username) return !!alreadyExists } catch (error) { console.error(error) From 433961e9adbb816e7b582120a353b101829e72dd Mon Sep 17 00:00:00 2001 From: Michael Yankelev Date: Thu, 11 Nov 2021 18:14:55 +0200 Subject: [PATCH 03/10] wire up new lookup and toggle flag --- .../FileBrowsers/hooks/useLookupUser.tsx | 2 +- .../Components/Modules/Settings/Profile.tsx | 21 +++++------ .../files-ui/src/Contexts/UserContext.tsx | 35 +++++++++++++++++-- 3 files changed, 42 insertions(+), 16 deletions(-) diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx index 4219bba271..343ed7e942 100644 --- a/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx +++ b/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx @@ -51,7 +51,7 @@ export const useLookupSharedFolderUser = () => { } try { - const result = await filesApiClient.lookupUser(...Object.values(lookupBody)) + const result = await filesApiClient.lookupUser(lookupBody.username, lookupBody.public_address, lookupBody.identity_public_key) if (!result) return [] const usersList = permission === "read" ? sharedFolderReaders : sharedFolderWriters diff --git a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx index d643f10139..1dfea14748 100644 --- a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx +++ b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx @@ -8,7 +8,8 @@ import { useToasts, RadioInput, TextInput, - CheckIcon + CheckIcon, + CheckboxInput } from "@chainsafe/common-components" import { makeStyles, @@ -93,9 +94,8 @@ const useStyles = makeStyles(({ constants, breakpoints, palette, typography }: C }, button: { width: 200, - margin: `0px ${constants.generalUnit * 0.5}px ${ - constants.generalUnit * 4 - }px` + margin: `0px ${constants.generalUnit * 0.5}px ${constants.generalUnit * 4 + }px` }, icon: { fontSize: "20px", @@ -188,14 +188,14 @@ const profileValidation = yup.object().shape({ const ProfileView = () => { const { themeKey, setTheme } = useThemeSwitcher() const { addToast } = useToasts() - const { profile, updateProfile, addUsername, lookupOnUsername } = useUser() + const { profile, updateProfile, addUsername, lookupOnUsername, toggleLookupConsent } = useUser() const { publicKey } = useThresholdKey() const [updatingProfile, setUpdatingProfile] = useState(false) const [showUsernameForm, setShowUsernameForm] = useState(false) const [username, setUsername] = useState("") const [usernameData, setUsernameData] = useState({ error: "", loading: false }) const formik = useFormik({ - initialValues:{ + initialValues: { firstName: profile?.firstName || "", lastName: profile?.lastName || "" // email: profile?.email || "" @@ -408,12 +408,6 @@ const ProfileView = () => { > Username - - This username is public -
{ }
} +
@@ -640,7 +635,7 @@ const ProfileView = () => { > Language - +
diff --git a/packages/files-ui/src/Contexts/UserContext.tsx b/packages/files-ui/src/Contexts/UserContext.tsx index e20e164053..249d3d82d3 100644 --- a/packages/files-ui/src/Contexts/UserContext.tsx +++ b/packages/files-ui/src/Contexts/UserContext.tsx @@ -19,6 +19,7 @@ export type Profile = { email?: string createdAt?: Date username?: string + lookupConsent: boolean } interface ILocalStore { @@ -39,6 +40,7 @@ interface IUserContext { addUsername: (username: string) => Promise removeUser(): void getProfileTitle(): string + toggleLookupConsent(): Promise } const UserContext = React.createContext(undefined) @@ -72,7 +74,8 @@ const UserProvider = ({ children }: UserContextProps) => { email: profileApiData.email, publicAddress: profileApiData.public_address?.toLowerCase(), createdAt: profileApiData.created_at, - username: profileApiData.username + username: profileApiData.username, + lookupConsent: profileApiData.user_lookup_consent || false } setProfile(profileState) return Promise.resolve() @@ -178,6 +181,33 @@ const UserProvider = ({ children }: UserContextProps) => { } } + const toggleLookupConsent = async () => { + if (!profile) return Promise.reject("Profile not initialized") + try { + await filesApiClient.updateUser({ + first_name: profile.firstName || "", + last_name: profile.lastName || "", + email: profile.email || "", + username: profile.username, + lookup_consent_flag: !profile.lookupConsent + }) + + setProfile({ + ...profile, + lookupConsent: !profile.lookupConsent + + }) + return Promise.resolve() + } catch (error: any) { + console.error(error) + return Promise.reject( + Array.isArray(error.error.details) + ? error.error.details.map((e: Details) => e.message).join(",") + : t`There was an error when setting username.` + ) + } + } + const lookupOnUsername = async (username: string) => { if (!profile) return false try { @@ -217,7 +247,8 @@ const UserProvider = ({ children }: UserContextProps) => { removeUser, addUsername, lookupOnUsername, - getProfileTitle + getProfileTitle, + toggleLookupConsent }} > {children} From 82a7a08f08d0e6c58c8b4a1e5ac48317edefc8b0 Mon Sep 17 00:00:00 2001 From: Michael Yankelev Date: Fri, 12 Nov 2021 14:25:15 +0200 Subject: [PATCH 04/10] update styling --- .../Components/Modules/Settings/Profile.tsx | 158 +++++++++--------- .../files-ui/src/Contexts/UserContext.tsx | 9 +- 2 files changed, 84 insertions(+), 83 deletions(-) diff --git a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx index 1dfea14748..371d1f8164 100644 --- a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx +++ b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx @@ -165,7 +165,7 @@ const useStyles = makeStyles(({ constants, breakpoints, palette, typography }: C }, usernameForm: { display: "flex", - marginBottom: constants.generalUnit * 4, + marginBottom: constants.generalUnit, "& svg": { fill: palette.success.main } @@ -400,85 +400,87 @@ const ProfileView = () => { } - {profile?.username - ?
- - Username - -
- -
-
- :
- - Username - - {showUsernameForm - ?
- - Usernames are public and can't be changed after creation. - - - -
- -
- +
+ {profile?.username + ? <> + + Username + +
+
- :
- - - You haven't set a username yet. - - {" "} - setShowUsernameForm(true)} + + : <> + + Username + + {showUsernameForm + ?
+ - Add a username - - -
- } -
- } - + Usernames are public and can't be changed after creation. + +
+ +
+ +
+ +
+ :
+ + + You haven't set a username yet. + + {" "} + setShowUsernameForm(true)} + > + Add a username + + +
+ } + + } + +
diff --git a/packages/files-ui/src/Contexts/UserContext.tsx b/packages/files-ui/src/Contexts/UserContext.tsx index 249d3d82d3..cf94ee3430 100644 --- a/packages/files-ui/src/Contexts/UserContext.tsx +++ b/packages/files-ui/src/Contexts/UserContext.tsx @@ -159,7 +159,7 @@ const UserProvider = ({ children }: UserContextProps) => { if (!profile) return Promise.reject("Profile not initialized") try { - await filesApiClient.updateUser({ + const result = await filesApiClient.updateUser({ first_name: profile.firstName || "", last_name: profile.lastName || "", email: profile.email || "", @@ -168,7 +168,7 @@ const UserProvider = ({ children }: UserContextProps) => { setProfile({ ...profile, - username + username: result.username }) return Promise.resolve() } catch (error: any) { @@ -184,7 +184,7 @@ const UserProvider = ({ children }: UserContextProps) => { const toggleLookupConsent = async () => { if (!profile) return Promise.reject("Profile not initialized") try { - await filesApiClient.updateUser({ + const result = await filesApiClient.updateUser({ first_name: profile.firstName || "", last_name: profile.lastName || "", email: profile.email || "", @@ -194,8 +194,7 @@ const UserProvider = ({ children }: UserContextProps) => { setProfile({ ...profile, - lookupConsent: !profile.lookupConsent - + lookupConsent: result.user_lookup_consent || false }) return Promise.resolve() } catch (error: any) { From 2d543d9315f98cfd4d66ba175342b98bbd1af0bb Mon Sep 17 00:00:00 2001 From: Michael Yankelev Date: Fri, 12 Nov 2021 14:49:58 +0200 Subject: [PATCH 05/10] add translation --- packages/files-ui/src/Components/Modules/Settings/Profile.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx index 371d1f8164..122d7f2a39 100644 --- a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx +++ b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx @@ -479,7 +479,7 @@ const ProfileView = () => { } } - +
From 4a0660242f9ed84889efdbc793b9c1a6c7791602 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 12 Nov 2021 12:54:15 +0000 Subject: [PATCH 06/10] lingui extract --- packages/files-ui/src/locales/de/messages.po | 6 +++--- packages/files-ui/src/locales/en/messages.po | 6 +++--- packages/files-ui/src/locales/es/messages.po | 6 +++--- packages/files-ui/src/locales/fr/messages.po | 6 +++--- packages/files-ui/src/locales/no/messages.po | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/files-ui/src/locales/de/messages.po b/packages/files-ui/src/locales/de/messages.po index a88544c6db..f01dd067f5 100644 --- a/packages/files-ui/src/locales/de/messages.po +++ b/packages/files-ui/src/locales/de/messages.po @@ -46,6 +46,9 @@ msgstr "" msgid "Adding you to the shared folder..." msgstr "" +msgid "Allow lookup by username or wallet address" +msgstr "" + msgid "An error occurred:" msgstr "Es ist ein Fehler aufgetreten:" @@ -763,9 +766,6 @@ msgstr "" msgid "This username is already taken" msgstr "" -msgid "This username is public" -msgstr "Dieser Benutzername ist öffentlich" - msgid "This website uses cookies" msgstr "" diff --git a/packages/files-ui/src/locales/en/messages.po b/packages/files-ui/src/locales/en/messages.po index fc433d57c3..41d4ec0649 100644 --- a/packages/files-ui/src/locales/en/messages.po +++ b/packages/files-ui/src/locales/en/messages.po @@ -46,6 +46,9 @@ msgstr "Add viewers and editors by username, sharing id or Ethereum address." msgid "Adding you to the shared folder..." msgstr "Adding you to the shared folder..." +msgid "Allow lookup by username or wallet address" +msgstr "Allow lookup by username or wallet address" + msgid "An error occurred:" msgstr "An error occurred:" @@ -766,9 +769,6 @@ msgstr "This link is not valid any more." msgid "This username is already taken" msgstr "This username is already taken" -msgid "This username is public" -msgstr "This username is public" - msgid "This website uses cookies" msgstr "This website uses cookies" diff --git a/packages/files-ui/src/locales/es/messages.po b/packages/files-ui/src/locales/es/messages.po index 54a33706c5..8816e12140 100644 --- a/packages/files-ui/src/locales/es/messages.po +++ b/packages/files-ui/src/locales/es/messages.po @@ -47,6 +47,9 @@ msgstr "" msgid "Adding you to the shared folder..." msgstr "" +msgid "Allow lookup by username or wallet address" +msgstr "" + msgid "An error occurred:" msgstr "" @@ -767,9 +770,6 @@ msgstr "" msgid "This username is already taken" msgstr "" -msgid "This username is public" -msgstr "" - msgid "This website uses cookies" msgstr "" diff --git a/packages/files-ui/src/locales/fr/messages.po b/packages/files-ui/src/locales/fr/messages.po index 973ed48d12..96b41fcf8a 100644 --- a/packages/files-ui/src/locales/fr/messages.po +++ b/packages/files-ui/src/locales/fr/messages.po @@ -47,6 +47,9 @@ msgstr "Ajoutez des personnes pouvant visualiser ou afficher par nom d'utilisate msgid "Adding you to the shared folder..." msgstr "Je vous ajoute au dossier partagé…" +msgid "Allow lookup by username or wallet address" +msgstr "" + msgid "An error occurred:" msgstr "Une erreur s'est produite :" @@ -767,9 +770,6 @@ msgstr "Ce lien n'est plus valide." msgid "This username is already taken" msgstr "Ce nom d’utilisateur est déjà pris" -msgid "This username is public" -msgstr "Ce nom d’utilisateur est public" - msgid "This website uses cookies" msgstr "Ce site web utilise des cookies" diff --git a/packages/files-ui/src/locales/no/messages.po b/packages/files-ui/src/locales/no/messages.po index 4d68279a7f..f773bb430f 100644 --- a/packages/files-ui/src/locales/no/messages.po +++ b/packages/files-ui/src/locales/no/messages.po @@ -46,6 +46,9 @@ msgstr "" msgid "Adding you to the shared folder..." msgstr "" +msgid "Allow lookup by username or wallet address" +msgstr "" + msgid "An error occurred:" msgstr "" @@ -763,9 +766,6 @@ msgstr "" msgid "This username is already taken" msgstr "" -msgid "This username is public" -msgstr "Dette brukernavnet er offentlig" - msgid "This website uses cookies" msgstr "" From 95292bab2252bf253c90c40cd0ba0086f1240544 Mon Sep 17 00:00:00 2001 From: Michael Yankelev Date: Fri, 12 Nov 2021 15:36:53 +0200 Subject: [PATCH 07/10] fix lint --- .../Components/Modules/FileBrowsers/hooks/useLookupUser.tsx | 2 +- .../files-ui/src/Components/Modules/Settings/Profile.tsx | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx index 343ed7e942..ab1f55def9 100644 --- a/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx +++ b/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx @@ -25,7 +25,7 @@ export const useLookupSharedFolderUser = () => { if (foundIntersectingUsers.length) { setUsersError(t`User ${centerEllipsis(foundIntersectingUsers[0].label) - } is both a reader and writer`) + } is both a reader and writer`) } else { setUsersError("") } diff --git a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx index 122d7f2a39..7231f95cfb 100644 --- a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx +++ b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx @@ -95,7 +95,7 @@ const useStyles = makeStyles(({ constants, breakpoints, palette, typography }: C button: { width: 200, margin: `0px ${constants.generalUnit * 0.5}px ${constants.generalUnit * 4 - }px` + }px` }, icon: { fontSize: "20px", @@ -479,7 +479,9 @@ const ProfileView = () => { } } - +
From be9a994693054363b82951e9f7e409e51c8a9034 Mon Sep 17 00:00:00 2001 From: Michael Yankelev Date: Mon, 15 Nov 2021 14:01:50 +0200 Subject: [PATCH 08/10] update label --- packages/files-ui/src/Components/Modules/Settings/Profile.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx index 7231f95cfb..175f724ced 100644 --- a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx +++ b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx @@ -95,7 +95,7 @@ const useStyles = makeStyles(({ constants, breakpoints, palette, typography }: C button: { width: 200, margin: `0px ${constants.generalUnit * 0.5}px ${constants.generalUnit * 4 - }px` + }px` }, icon: { fontSize: "20px", @@ -479,7 +479,7 @@ const ProfileView = () => { } } - From 5b178ca88578a963cf9cedcad941cb97cd9aee2e Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 15 Nov 2021 12:03:36 +0000 Subject: [PATCH 09/10] lingui extract --- packages/files-ui/src/locales/de/messages.po | 2 +- packages/files-ui/src/locales/en/messages.po | 4 ++-- packages/files-ui/src/locales/es/messages.po | 2 +- packages/files-ui/src/locales/fr/messages.po | 2 +- packages/files-ui/src/locales/no/messages.po | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/files-ui/src/locales/de/messages.po b/packages/files-ui/src/locales/de/messages.po index f01dd067f5..fb2e752eb6 100644 --- a/packages/files-ui/src/locales/de/messages.po +++ b/packages/files-ui/src/locales/de/messages.po @@ -46,7 +46,7 @@ msgstr "" msgid "Adding you to the shared folder..." msgstr "" -msgid "Allow lookup by username or wallet address" +msgid "Allow lookup by sharing key, wallet address or username" msgstr "" msgid "An error occurred:" diff --git a/packages/files-ui/src/locales/en/messages.po b/packages/files-ui/src/locales/en/messages.po index 41d4ec0649..aa68d3a494 100644 --- a/packages/files-ui/src/locales/en/messages.po +++ b/packages/files-ui/src/locales/en/messages.po @@ -46,8 +46,8 @@ msgstr "Add viewers and editors by username, sharing id or Ethereum address." msgid "Adding you to the shared folder..." msgstr "Adding you to the shared folder..." -msgid "Allow lookup by username or wallet address" -msgstr "Allow lookup by username or wallet address" +msgid "Allow lookup by sharing key, wallet address or username" +msgstr "Allow lookup by sharing key, wallet address or username" msgid "An error occurred:" msgstr "An error occurred:" diff --git a/packages/files-ui/src/locales/es/messages.po b/packages/files-ui/src/locales/es/messages.po index 8816e12140..fce90f9fe5 100644 --- a/packages/files-ui/src/locales/es/messages.po +++ b/packages/files-ui/src/locales/es/messages.po @@ -47,7 +47,7 @@ msgstr "" msgid "Adding you to the shared folder..." msgstr "" -msgid "Allow lookup by username or wallet address" +msgid "Allow lookup by sharing key, wallet address or username" msgstr "" msgid "An error occurred:" diff --git a/packages/files-ui/src/locales/fr/messages.po b/packages/files-ui/src/locales/fr/messages.po index 96b41fcf8a..92ea300aff 100644 --- a/packages/files-ui/src/locales/fr/messages.po +++ b/packages/files-ui/src/locales/fr/messages.po @@ -47,7 +47,7 @@ msgstr "Ajoutez des personnes pouvant visualiser ou afficher par nom d'utilisate msgid "Adding you to the shared folder..." msgstr "Je vous ajoute au dossier partagé…" -msgid "Allow lookup by username or wallet address" +msgid "Allow lookup by sharing key, wallet address or username" msgstr "" msgid "An error occurred:" diff --git a/packages/files-ui/src/locales/no/messages.po b/packages/files-ui/src/locales/no/messages.po index f773bb430f..683cae7f68 100644 --- a/packages/files-ui/src/locales/no/messages.po +++ b/packages/files-ui/src/locales/no/messages.po @@ -46,7 +46,7 @@ msgstr "" msgid "Adding you to the shared folder..." msgstr "" -msgid "Allow lookup by username or wallet address" +msgid "Allow lookup by sharing key, wallet address or username" msgstr "" msgid "An error occurred:" From 62de2bfd62fb5793d35696a69e0a6e2fe903c13d Mon Sep 17 00:00:00 2001 From: Michael Yankelev Date: Mon, 15 Nov 2021 14:23:07 +0200 Subject: [PATCH 10/10] resolve linting errors --- packages/common-theme/src/Hooks/useLongPress.tsx | 3 +-- packages/files-ui/src/Components/Modules/Settings/Profile.tsx | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/common-theme/src/Hooks/useLongPress.tsx b/packages/common-theme/src/Hooks/useLongPress.tsx index 9ff4495796..a5c305b0e8 100644 --- a/packages/common-theme/src/Hooks/useLongPress.tsx +++ b/packages/common-theme/src/Hooks/useLongPress.tsx @@ -86,8 +86,7 @@ export const useLongPress = ( } } } - - }, [onLongPress, delay] + }, [clear] ) return { diff --git a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx index 175f724ced..c5e7bd57a5 100644 --- a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx +++ b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx @@ -95,7 +95,7 @@ const useStyles = makeStyles(({ constants, breakpoints, palette, typography }: C button: { width: 200, margin: `0px ${constants.generalUnit * 0.5}px ${constants.generalUnit * 4 - }px` + }px` }, icon: { fontSize: "20px",