diff --git a/app/mobile/src/session/profile/Profile.jsx b/app/mobile/src/session/profile/Profile.jsx index 3a65938a..1514de47 100644 --- a/app/mobile/src/session/profile/Profile.jsx +++ b/app/mobile/src/session/profile/Profile.jsx @@ -143,7 +143,7 @@ export function Profile() { supportedOrientations={['portrait', 'landscape']} onRequestClose={actions.hideDetails} > - + diff --git a/app/mobile/src/session/profile/useProfile.hook.js b/app/mobile/src/session/profile/useProfile.hook.js index 084e18b4..ebe952bd 100644 --- a/app/mobile/src/session/profile/useProfile.hook.js +++ b/app/mobile/src/session/profile/useProfile.hook.js @@ -37,7 +37,7 @@ export function useProfile() { updateState({ imageWidth: width, imageHeight: width, detailWidth: width + 2 }); } else { - updateState({ imageWidth: height, imageHeight, detailWidth: width + 2 }); + updateState({ imageWidth: height, imageHeight: height, detailWidth: width + 2 }); } }, [dimensions]); diff --git a/app/mobile/src/session/settings/Settings.jsx b/app/mobile/src/session/settings/Settings.jsx index b2a1c9ee..791763f8 100644 --- a/app/mobile/src/session/settings/Settings.jsx +++ b/app/mobile/src/session/settings/Settings.jsx @@ -331,172 +331,174 @@ export function Settings() { supportedOrientations={['portrait', 'landscape']} onRequestClose={actions.hideEditSeal} > - - - - - - + + + + + + + + + { state.strings.sealedTopics } + { !state.sealEnabled && ( + <> + { state.strings.sealUnset } + + + + { state.sealPassword && ( + sealAction(actions.generateKey)}> + { busy && ( + + )} + { !busy && ( + { state.strings.generate } + )} + + )} + { !state.sealPassword && ( + + { state.strings.generate } + + )} + { state.strings.delayMessage } + + )} + { state.sealEnabled && !state.sealUnlocked && !state.sealRemove && ( + <> + { state.strings.sealLocked } + + + + { state.sealPassword && ( + sealAction(actions.unlockKey)}> + { busy && ( + + )} + { !busy && ( + { state.strings.unlock } + )} + + )} + { !state.sealPassword && ( + + { state.strings.unlock } + + )} + + { state.strings.removeSeal } + + + )} + { state.sealEnabled && state.sealUnlocked && !state.sealRemove && !state.sealUpdate && ( + <> + { state.strings.sealUnlocked } + sealAction(actions.disableKey)}> + { busy && ( + + )} + { !busy && ( + { state.strings.disable } + )} + + + { state.strings.changeKey } + + + { state.strings.removeSeal } + + + )} + { state.sealEnabled && state.sealRemove && ( + <> + { state.strings.sealDelete } + + { state.sealDelete === state.strings.deleteKey && ( + sealAction(actions.removeKey)}> + { busy && ( + + )} + { !busy && ( + { state.strings.delete } + )} + + )} + { state.sealDelete !== state.strings.deleteKey && ( + + { state.strings.delete } + + )} + + { state.sealUnlocked && ( + { state.strings.disableSeal } + )} + { !state.sealUnlocked && ( + { state.strings.unlockSeal } + )} + + + )} + { state.sealEnabled && state.sealUnlocked && state.sealUpdate && ( + <> + { state.strings.changePassword } + + + + { state.sealPassword && ( + sealAction(actions.updateKey)}> + { busy && ( + + )} + { !busy && ( + { state.strings.update } + )} + + )} + { !state.sealPassword && ( + + { state.strings.update } + + )} + + { state.sealUnlocked && ( + { state.strings.disableSeal } + )} + { !state.sealUnlocked && ( + { state.strings.unlockSeal } + )} + + + )} - { state.strings.sealedTopics } - { !state.sealEnabled && ( - <> - { state.strings.sealUnset } - - - - { state.sealPassword && ( - sealAction(actions.generateKey)}> - { busy && ( - - )} - { !busy && ( - { state.strings.generate } - )} - - )} - { !state.sealPassword && ( - - { state.strings.generate } - - )} - { state.strings.delayMessage } - - )} - { state.sealEnabled && !state.sealUnlocked && !state.sealRemove && ( - <> - { state.strings.sealLocked } - - - - { state.sealPassword && ( - sealAction(actions.unlockKey)}> - { busy && ( - - )} - { !busy && ( - { state.strings.unlock } - )} - - )} - { !state.sealPassword && ( - - { state.strings.unlock } - - )} - - { state.strings.removeSeal } - - - )} - { state.sealEnabled && state.sealUnlocked && !state.sealRemove && !state.sealUpdate && ( - <> - { state.strings.sealUnlocked } - sealAction(actions.disableKey)}> - { busy && ( - - )} - { !busy && ( - { state.strings.disable } - )} - - - { state.strings.changeKey } - - - { state.strings.removeSeal } - - - )} - { state.sealEnabled && state.sealRemove && ( - <> - { state.strings.sealDelete } - - { state.sealDelete === state.strings.deleteKey && ( - sealAction(actions.removeKey)}> - { busy && ( - - )} - { !busy && ( - { state.strings.delete } - )} - - )} - { state.sealDelete !== state.strings.deleteKey && ( - - { state.strings.delete } - - )} - - { state.sealUnlocked && ( - { state.strings.disableSeal } - )} - { !state.sealUnlocked && ( - { state.strings.unlockSeal } - )} - - - )} - { state.sealEnabled && state.sealUnlocked && state.sealUpdate && ( - <> - { state.strings.changePassword } - - - - { state.sealPassword && ( - sealAction(actions.updateKey)}> - { busy && ( - - )} - { !busy && ( - { state.strings.update } - )} - - )} - { !state.sealPassword && ( - - { state.strings.update } - - )} - - { state.sealUnlocked && ( - { state.strings.disableSeal } - )} - { !state.sealUnlocked && ( - { state.strings.unlockSeal } - )} - - - )} - - + + - - - - - - - - { state.strings.changeLogin } - - - { state.strings.changeMessage } - - - - - - - { state.validated && !state.available && ( - { state.strings.notAvailable } - )} - - - - { state.strings.cancel } - - { (!state.available || !state.password || !state.validated || !state.username) && ( - - { state.strings.update } - - )} - { state.available && state.password && state.validated && state.username && ( - - { state.strings.update } + + + + + + - )} + + { state.strings.changeLogin } + + + { state.strings.changeMessage } + + + + + + + { state.validated && !state.available && ( + { state.strings.notAvailable } + )} + + + + { state.strings.cancel } + + { (!state.available || !state.password || !state.validated || !state.username) && ( + + { state.strings.update } + + )} + { state.available && state.password && state.validated && state.username && ( + + { state.strings.update } + + )} + - - + +