fix horizontal scroll on incoming action (#119)

* fixed horizontal scroll on incoming action * fixed login redirect
Psychedelic · Jul 20, 2021 · 627948f · 627948f
1 parent b34d696
commit 627948f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/source/Background/Keyring.js b/source/Background/Keyring.js
@@ -71,7 +71,7 @@ export const getKeyringHandler = (type, keyring) => ({
     try {
       unlocked = await keyring.unlock(params?.password);
 
-      if (unlocked) {
+      if (unlocked && params?.redirect) {
         extension.storage.local.set({
           router: 'home',
         });
@@ -112,7 +112,8 @@ export const getKeyringHandler = (type, keyring) => ({
       return { error: error.message, height: null };
     }
   },
-  [HANDLER_TYPES.EDIT_PRINCIPAL]: async ({ walletNumber, name, emoji }) => (
-    keyring.editPrincipal(walletNumber, { name, emoji })
-  ),
+  [HANDLER_TYPES.EDIT_PRINCIPAL]:
+    async ({ walletNumber, name, emoji }) => (
+      keyring.editPrincipal(walletNumber, { name, emoji })
+    ),
 }[type]);
diff --git a/source/Popup/Views/Login/index.jsx b/source/Popup/Views/Login/index.jsx
@@ -26,7 +26,7 @@ const Login = ({ redirect }) => {
   const handleLogin = () => {
     sendMessage({
       type: HANDLER_TYPES.UNLOCK,
-      params: { password },
+      params: { password, redirect: true },
     }, (unlocked) => {
       if (unlocked) {
         if (redirect) {

diff --git a/source/Popup/Views/SeedPhrase/Steps/Step2.jsx b/source/Popup/Views/SeedPhrase/Steps/Step2.jsx
@@ -24,7 +24,7 @@ const Step2 = ({ handleChangeStep }) => {
   const handleLogin = () => {
     sendMessage({
       type: HANDLER_TYPES.UNLOCK,
-      params: { password },
+      params: { password, redirect: false },
     }, (unlocked) => (unlocked ? handleChangeStep() : setError(true)));
   };
 

diff --git a/source/ui/IncomingAction/index.jsx b/source/ui/IncomingAction/index.jsx
@@ -9,7 +9,7 @@ const IncomingAction = ({ image, url, action }) => {
   return (
     <div className={classes.infoContainer}>
       <img src={image} className={classes.image} />
-      <Typography variant="h2">{url}</Typography>
+      <Typography variant="h2" className={classes.title}>{url}</Typography>
       <Typography variant="subtitle1">{action}</Typography>
     </div>
   );

diff --git a/source/ui/IncomingAction/styles.js b/source/ui/IncomingAction/styles.js
@@ -16,4 +16,11 @@ export default makeStyles((theme) => ({
     height: 120,
     marginBottom: `${theme.spacing(3)}px`,
   },
+  title: {
+    textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap',
+    overflow: 'hidden',
+    width: 370,
+    textAlign: 'center',
+  },
 }));