From fdb49deb54a01343f3f3311f425722fdd985e03a Mon Sep 17 00:00:00 2001
From: wadeking98 <wkingnumber2@gmail.com>
Date: Thu, 26 Oct 2023 09:59:08 -0700
Subject: [PATCH 1/2] fixed how missing credentials are grouped

Signed-off-by: wadeking98 <wkingnumber2@gmail.com>
---
 .../legacy/core/App/screens/ProofRequest.tsx  | 32 ++++++++++---------
 packages/legacy/core/App/utils/helpers.ts     | 13 ++++----
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/packages/legacy/core/App/screens/ProofRequest.tsx b/packages/legacy/core/App/screens/ProofRequest.tsx
index e59f9f775c..830c1d3685 100644
--- a/packages/legacy/core/App/screens/ProofRequest.tsx
+++ b/packages/legacy/core/App/screens/ProofRequest.tsx
@@ -76,6 +76,8 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
   const { start } = useTour()
   const screenIsFocused = useIsFocused()
 
+  const hasSomeCred = useMemo(() => activeCreds.some(cred => cred.credDefId !== undefined), [activeCreds])
+
   const styles = StyleSheet.create({
     pageContainer: {
       flex: 1,
@@ -232,16 +234,16 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
 
           const selectRetrievedCredentials: AnonCredsCredentialsForProofRequest | undefined = retrievedCredentials
             ? {
-                ...retrievedCredentials,
-                attributes: formatCredentials(retrievedCredentials.attributes, credList) as Record<
-                  string,
-                  AnonCredsRequestedAttributeMatch[]
-                >,
-                predicates: formatCredentials(retrievedCredentials.predicates, credList) as Record<
-                  string,
-                  AnonCredsRequestedPredicateMatch[]
-                >,
-              }
+              ...retrievedCredentials,
+              attributes: formatCredentials(retrievedCredentials.attributes, credList) as Record<
+                string,
+                AnonCredsRequestedAttributeMatch[]
+              >,
+              predicates: formatCredentials(retrievedCredentials.predicates, credList) as Record<
+                string,
+                AnonCredsRequestedPredicateMatch[]
+              >,
+            }
             : undefined
           setRetrievedCredentials(selectRetrievedCredentials)
 
@@ -458,7 +460,7 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
                 </View>
               )}
             </View>
-            {!hasAvailableCredentials && (
+            {!hasAvailableCredentials && hasSomeCred && (
               <Text
                 style={{
                   ...TextTheme.title,
@@ -552,8 +554,8 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
                     handleAltCredChange={
                       item.altCredentials && item.altCredentials.length > 1
                         ? () => {
-                            handleAltCredChange(item.credId, item.altCredentials ?? [item.credId])
-                          }
+                          handleAltCredChange(item.credId, item.altCredentials ?? [item.credId])
+                        }
                         : undefined
                     }
                     proof={true}
@@ -582,14 +584,14 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
                 <View style={styles.pageMargin}>
                   {!loading && (
                     <>
-                      <View
+                      {hasSomeCred && (<View
                         style={{
                           width: 'auto',
                           borderWidth: 1,
                           borderColor: ColorPallet.grayscale.lightGrey,
                           marginTop: 20,
                         }}
-                      ></View>
+                      ></View>)}
                       <Text
                         style={{
                           ...TextTheme.title,
diff --git a/packages/legacy/core/App/utils/helpers.ts b/packages/legacy/core/App/utils/helpers.ts
index 597fa72ce3..8174eff90b 100644
--- a/packages/legacy/core/App/utils/helpers.ts
+++ b/packages/legacy/core/App/utils/helpers.ts
@@ -468,10 +468,10 @@ export const processProofAttributes = (
 
     if (credentialList.length <= 0) {
       const missingAttributes = addMissingDisplayAttributes(requestedProofAttributes[key])
-      if (!processedAttributes[key]) {
-        processedAttributes[key] = missingAttributes
+      if (!processedAttributes[missingAttributes.credName]) {
+        processedAttributes[missingAttributes.credName] = missingAttributes
       } else {
-        processedAttributes[key].attributes?.push(...(missingAttributes.attributes ?? []))
+        processedAttributes[missingAttributes.credName].attributes?.push(...(missingAttributes.attributes ?? []))
       }
     }
 
@@ -494,7 +494,6 @@ export const processProofAttributes = (
       } else {
         continue
       }
-
       for (const attributeName of [...(names ?? (name && [name]) ?? [])]) {
         if (!processedAttributes[credential?.credentialId]) {
           // init processedAttributes object
@@ -600,10 +599,10 @@ export const processProofPredicates = (
     const { name, p_type: pType, p_value: pValue, non_revoked } = requestedProofPredicates[key]
     if (credentialList.length <= 0) {
       const missingPredicates = addMissingDisplayPredicates(requestedProofPredicates[key])
-      if (!processedPredicates[key]) {
-        processedPredicates[key] = missingPredicates
+      if (!processedPredicates[missingPredicates.credName]) {
+        processedPredicates[missingPredicates.credName] = missingPredicates
       } else {
-        processedPredicates[key].predicates?.push(...(missingPredicates.predicates ?? []))
+        processedPredicates[missingPredicates.credName].predicates?.push(...(missingPredicates.predicates ?? []))
       }
     }
 

From 07be715c49fecc01b4c66a12d177a1a6115a80bb Mon Sep 17 00:00:00 2001
From: wadeking98 <wkingnumber2@gmail.com>
Date: Thu, 26 Oct 2023 14:16:59 -0700
Subject: [PATCH 2/2] fixed linting

Signed-off-by: wadeking98 <wkingnumber2@gmail.com>
---
 .../legacy/core/App/screens/ProofRequest.tsx  | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/packages/legacy/core/App/screens/ProofRequest.tsx b/packages/legacy/core/App/screens/ProofRequest.tsx
index 830c1d3685..ebba6c121e 100644
--- a/packages/legacy/core/App/screens/ProofRequest.tsx
+++ b/packages/legacy/core/App/screens/ProofRequest.tsx
@@ -76,7 +76,7 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
   const { start } = useTour()
   const screenIsFocused = useIsFocused()
 
-  const hasSomeCred = useMemo(() => activeCreds.some(cred => cred.credDefId !== undefined), [activeCreds])
+  const hasMatchingCredDef = useMemo(() => activeCreds.some((cred) => cred.credDefId !== undefined), [activeCreds])
 
   const styles = StyleSheet.create({
     pageContainer: {
@@ -234,16 +234,16 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
 
           const selectRetrievedCredentials: AnonCredsCredentialsForProofRequest | undefined = retrievedCredentials
             ? {
-              ...retrievedCredentials,
-              attributes: formatCredentials(retrievedCredentials.attributes, credList) as Record<
-                string,
-                AnonCredsRequestedAttributeMatch[]
-              >,
-              predicates: formatCredentials(retrievedCredentials.predicates, credList) as Record<
-                string,
-                AnonCredsRequestedPredicateMatch[]
-              >,
-            }
+                ...retrievedCredentials,
+                attributes: formatCredentials(retrievedCredentials.attributes, credList) as Record<
+                  string,
+                  AnonCredsRequestedAttributeMatch[]
+                >,
+                predicates: formatCredentials(retrievedCredentials.predicates, credList) as Record<
+                  string,
+                  AnonCredsRequestedPredicateMatch[]
+                >,
+              }
             : undefined
           setRetrievedCredentials(selectRetrievedCredentials)
 
@@ -460,7 +460,7 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
                 </View>
               )}
             </View>
-            {!hasAvailableCredentials && hasSomeCred && (
+            {!hasAvailableCredentials && hasMatchingCredDef && (
               <Text
                 style={{
                   ...TextTheme.title,
@@ -554,8 +554,8 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
                     handleAltCredChange={
                       item.altCredentials && item.altCredentials.length > 1
                         ? () => {
-                          handleAltCredChange(item.credId, item.altCredentials ?? [item.credId])
-                        }
+                            handleAltCredChange(item.credId, item.altCredentials ?? [item.credId])
+                          }
                         : undefined
                     }
                     proof={true}
@@ -584,14 +584,16 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, route }) => {
                 <View style={styles.pageMargin}>
                   {!loading && (
                     <>
-                      {hasSomeCred && (<View
-                        style={{
-                          width: 'auto',
-                          borderWidth: 1,
-                          borderColor: ColorPallet.grayscale.lightGrey,
-                          marginTop: 20,
-                        }}
-                      ></View>)}
+                      {hasMatchingCredDef && (
+                        <View
+                          style={{
+                            width: 'auto',
+                            borderWidth: 1,
+                            borderColor: ColorPallet.grayscale.lightGrey,
+                            marginTop: 20,
+                          }}
+                        />
+                      )}
                       <Text
                         style={{
                           ...TextTheme.title,