From be3aefd524ee84b149d3e94ce619e7ea0fe96c81 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Tue, 9 Jun 2020 13:50:01 +0200
Subject: [PATCH] Re-encode who addresses (align with settings) (#2908)

* Re-encode who addresses (align with settings)

* Don't display password for external signatories
---
 packages/react-signer/src/Modal.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/react-signer/src/Modal.tsx b/packages/react-signer/src/Modal.tsx
index 8fc895afae..990544b3a9 100644
--- a/packages/react-signer/src/Modal.tsx
+++ b/packages/react-signer/src/Modal.tsx
@@ -99,7 +99,7 @@ function extractExternal (accountId?: string | null): AccountFlags {
     isHardware: !!pair.meta.isHardware,
     isMultisig: !!pair.meta.isMultisig,
     threshold: (pair.meta.threshold as number) || 0,
-    who: (pair.meta.who as string[]) || []
+    who: ((pair.meta.who as string[]) || []).map((w) => keyring.encodeAddress(keyring.decodeAddress(w)))
   };
 }
 
@@ -505,6 +505,14 @@ class Signer extends React.PureComponent<Props, State> {
       return null;
     }
 
+    if (isMultisig) {
+      const { isExternal, isHardware } = extractExternal(signatory);
+
+      if (isExternal || isHardware) {
+        return null;
+      }
+    }
+
     return (
       <Unlock
         autoFocus