Merge pull request #103 from availproject/ghali/fix-proxy-from-multisig

fix UI when a proxy call was made from a multisig account

Author: Leouarz

packages/react-signer/src/Address.tsx

@@ -143,13 +143,13 @@ function filterProxies (allAccounts: string[], tx: Call | SubmittableExtrinsic<'
 }
 
 // This function shouldn't depend on proxyAddress, it can fetch multisig info based on source multisig account.
-async function queryForMultisig (api: ApiPromise, requestAddress: string | null, tx: SubmittableExtrinsic<'promise'>): Promise<MultiState | null> {
+async function queryForMultisig (api: ApiPromise, requestAddress: string | null, isProxyActive: boolean, proxyAddress: string | null, tx: SubmittableExtrinsic<'promise'>): Promise<MultiState | null> {
   const multiModule = api.tx.multisig ? 'multisig' : 'utility';
 
   if (isFunction(api.query[multiModule]?.multisigs)) {
-    const address = requestAddress;
+    const address = (proxyAddress && isProxyActive) ? proxyAddress : requestAddress;
     const { threshold, who } = extractExternal(address);
-    const hash = (address ? api.tx.proxy.proxy(requestAddress || '', null, tx) : tx).method.hash;
+    const hash = (proxyAddress && isProxyActive ? api.tx.proxy.proxy(requestAddress || '', null, tx) : tx).method.hash;
 
     const optMulti = await api.query[multiModule].multisigs<Option<Multisig>>(address, hash);
     const multi = optMulti.unwrapOr(null);
@@ -206,8 +206,9 @@ function Address ({ currentItem, onChange, onEnter, passwordError, requestAddres
     (): [string | null, AddressFlags] => {
       // If certain conditions are met, then proxyAddress would have higher priority over multisig signatories.
       // proxyAddress would be used to sign tx in that scenario.
-      const signAddress = (isProxyActive && proxyInfo && proxyAddress) ||
-        (multiInfo && multiAddress) ||
+      // Avail: Above seems wrong, I let it for further upstream updates, but I switched the order back
+      const signAddress = (multiInfo && multiAddress) ||
+        (isProxyActive && proxyInfo && proxyAddress) ||
         requestAddress;
 
       try {
@@ -242,22 +243,22 @@ function Address ({ currentItem, onChange, onEnter, passwordError, requestAddres
   useEffect((): void => {
     setMultInfo(null);
 
-    currentItem.extrinsic && extractExternal(requestAddress).isMultisig &&
-      queryForMultisig(api, requestAddress, currentItem.extrinsic)
+    currentItem.extrinsic && extractExternal(proxyAddress && isProxyActive ? proxyAddress : requestAddress).isMultisig &&
+      queryForMultisig(api, requestAddress, isProxyActive, proxyAddress, currentItem.extrinsic)
         .then((info): void => {
           if (mountedRef.current) {
             setMultInfo(info);
             setIsMultiCall(info?.isMultiCall || false);
           }
         })
         .catch(console.error);
-  }, [api, currentItem.extrinsic, mountedRef, requestAddress]);
+  }, [api, currentItem.extrinsic, isProxyActive, mountedRef, proxyAddress, requestAddress]);
 
   useEffect((): void => {
     onChange({
       isMultiCall,
       isUnlockCached,
-      multiRoot: multiInfo && (!isProxyActive || !proxyInfo) ? multiInfo.address : null,
+      multiRoot: multiInfo ? multiInfo.address : null,
       proxyRoot: (proxyInfo && isProxyActive) ? proxyInfo.address : null,
       signAddress,
       signPassword
@@ -286,7 +287,7 @@ function Address ({ currentItem, onChange, onEnter, passwordError, requestAddres
           />
         </Modal.Columns>
       )}
-      {multiInfo && (!isProxyActive || !proxyInfo) && (
+      {multiInfo && (
         <Modal.Columns hint={t('The signatory is one of the allowed accounts on the multisig, making a recorded approval for the transaction.')}>
           <InputAddress
             filter={multiInfo.whoFilter}