credebl
diff --git a/‎.env.sample‎
Lines changed: 8 additions & 1 deletion b/‎.env.sample‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 0 deletions b/‎.gitignore‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎App.tsx‎
Lines changed: 11 additions & 0 deletions b/‎App.tsx‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎android/app/build.gradle‎
Lines changed: 11 additions & 2 deletions b/‎android/app/build.gradle‎
Lines changed: 11 additions & 2 deletions
diff --git a/‎android/app/src/main/AndroidManifest.xml‎
Lines changed: 1 addition & 3 deletions b/‎android/app/src/main/AndroidManifest.xml‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎android/build.gradle‎
Lines changed: 1 addition & 1 deletion b/‎android/build.gradle‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/components/listItems/NotificationListItem.tsx‎
Lines changed: 30 additions & 4 deletions b/‎app/components/listItems/NotificationListItem.tsx‎
Lines changed: 30 additions & 4 deletions
diff --git a/‎app/components/misc/CredentialCard10.tsx‎
Lines changed: 3 additions & 2 deletions b/‎app/components/misc/CredentialCard10.tsx‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎app/components/misc/CredentialCard11.tsx‎
Lines changed: 6 additions & 4 deletions b/‎app/components/misc/CredentialCard11.tsx‎
Lines changed: 6 additions & 4 deletions
diff --git a/‎app/components/record/W3CCredentialRecord.tsx‎
Lines changed: 74 additions & 32 deletions b/‎app/components/record/W3CCredentialRecord.tsx‎
Lines changed: 74 additions & 32 deletions
@@ -14,4 +14,11 @@ OCA_URL=https://raw.githubusercontent.com/credebl/credebl-aries-oca-bundles/rele
 PUBLIC_ORG=https://example.com
 
 #PROOF_TEMPLATE_URL
-PROOF_TEMPLATE_URL=
+PROOF_TEMPLATE_URL=
+
+# Google Signin
+GOOGLE_WEB_CLIENT_ID=CLIENT_ID
+GOOGLE_IOS_CLIENT_ID=CLIENT_ID
+
+# DATA ENCYPTION KEY
+DATA_ENCRYPTION_KEY=DATA_ENCRYPTION_KEY
@@ -68,3 +68,5 @@ yarn-error.log
 .env
 google-services.json
 
+# VS Code
+.vscode/
@@ -2,9 +2,11 @@
 global.Buffer = require('buffer').Buffer
 
 import { AdeyaAgentProvider } from '@adeya/ssi'
+import { GoogleSignin } from '@react-native-google-signin/google-signin'
 import * as React from 'react'
 import { useEffect, useMemo } from 'react'
 import { StatusBar } from 'react-native'
+import { Config } from 'react-native-config'
 import SplashScreen from 'react-native-splash-screen'
 import Toast from 'react-native-toast-message'
 
@@ -38,6 +40,15 @@ const App = () => {
     // Hide the native splash / loading screen so that our
     // RN version can be displayed
     SplashScreen.hide()
+
+    if (Config.GOOGLE_WEB_CLIENT_ID && Config.GOOGLE_IOS_CLIENT_ID) {
+      GoogleSignin.configure({
+        webClientId: Config.GOOGLE_WEB_CLIENT_ID,
+        iosClientId: Config.GOOGLE_IOS_CLIENT_ID,
+        offlineAccess: true,
+        scopes: ['https://www.googleapis.com/auth/drive.file', 'https://www.googleapis.com/auth/drive.metadata'],
+      })
+    }
   }, [])
 
   return (
 
@@ -81,8 +81,8 @@ android {
         applicationId "id.credebl.adeya"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 12
-        versionName "1.0.9"
+        versionCode 16
+        versionName "1.0.10"
 
         missingDimensionStrategy 'react-native-camera', 'general'
     }
@@ -114,6 +114,15 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
+
+    packagingOptions {
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/x86_64/libjsc.so'
+        pickFirst 'lib/arm64-v8a/libjsc.so'
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+    }
 }
 
 dependencies {
 
@@ -59,9 +59,7 @@
 
                 <data android:scheme="https" />
 
-                <data android:host="agent.credebl.id" />
-                <data android:host="dev-agent.credebl.id" />
-                <data android:host="s3.ap-south-1.amazonaws.com" />
+                <data android:host="link.credebl.id" />
             </intent-filter>
 
         </activity>
 
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         buildToolsVersion = "33.0.0"
-        minSdkVersion = 21
+        minSdkVersion = 24
         compileSdkVersion = 34
         targetSdkVersion = 34
 
 
@@ -7,6 +7,8 @@ import {
   declineProofRequest as declineProof,
   getProofRequestAgentMessage,
 } from '@adeya/ssi'
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { V2RequestPresentationMessage } from '@credo-ts/core'
 import { useNavigation } from '@react-navigation/core'
 import { StackNavigationProp } from '@react-navigation/stack'
 import React, { useState, useEffect } from 'react'
@@ -67,6 +69,7 @@ const NotificationListItem: React.FC<NotificationListItemProps> = ({ notificatio
   const { ColorPallet, TextTheme } = useTheme()
   const { agent } = useAppAgent()
   const [declineModalVisible, setDeclineModalVisible] = useState(false)
+  const [notificationDetails, setNotificationDetails] = useState<V2RequestPresentationMessage | null>(null)
   const [details, setDetails] = useState<DisplayDetails>({
     type: InfoBoxType.Info,
     title: undefined,
@@ -215,13 +218,25 @@ const NotificationListItem: React.FC<NotificationListItemProps> = ({ notificatio
         case NotificationType.ProofRequest: {
           const proofId = (notification as ProofExchangeRecord).id
           getProofRequestAgentMessage(agent, proofId).then(message => {
+            setNotificationDetails(message)
             if (message instanceof V1RequestPresentationMessage && message.indyProofRequest) {
               resolve({
                 type: InfoBoxType.Info,
                 title: t('ProofRequest.NewProofRequest'),
                 body: message.indyProofRequest.name,
                 buttonTitle: undefined,
               })
+            } else if (
+              message instanceof V2RequestPresentationMessage &&
+              message?.formats?.length > 0 &&
+              message?.formats[0].format.includes('dif/presentation-exchange')
+            ) {
+              resolve({
+                type: InfoBoxType.Info,
+                title: t('ProofRequest.NewProofRequest'),
+                body: message?.requestAttachments[0]?.data?.json?.presentation_definition?.name ?? 'Proof Request',
+                buttonTitle: undefined,
+              })
             } else {
               //TODO:(jl) Should we have a default message or stick with an empty string?
               resolve({
@@ -277,10 +292,21 @@ const NotificationListItem: React.FC<NotificationListItemProps> = ({ notificatio
           }
         } else {
           onPress = () => {
-            navigation.getParent()?.navigate(Stacks.NotificationStack, {
-              screen: Screens.ProofRequest,
-              params: { proofId: (notification as ProofExchangeRecord).id },
-            })
+            // Added this check to navigate to different screen if proof request is of presentation exchange format
+            if (
+              notificationDetails?.formats?.length > 0 &&
+              notificationDetails?.formats[0].format.includes('dif/presentation-exchange')
+            ) {
+              navigation.getParent()?.navigate(Stacks.NotificationStack, {
+                screen: Screens.ProofRequestW3C,
+                params: { proofId: (notification as ProofExchangeRecord).id },
+              })
+            } else {
+              navigation.getParent()?.navigate(Stacks.NotificationStack, {
+                screen: Screens.ProofRequest,
+                params: { proofId: (notification as ProofExchangeRecord).id },
+              })
+            }
           }
         }
         onClose = toggleDeclineModalVisible
 
@@ -1,4 +1,4 @@
-import { CredentialExchangeRecord } from '@adeya/ssi'
+import { CredentialExchangeRecord, useConnections } from '@adeya/ssi'
 import { LegacyBrandingOverlay } from '@hyperledger/aries-oca'
 import { CredentialOverlay } from '@hyperledger/aries-oca/build/legacy'
 import React, { useEffect, useState } from 'react'
@@ -75,7 +75,8 @@ const CredentialCard10: React.FC<CredentialCard10Props> = ({ credential, style =
   const { OCABundleResolver } = useConfiguration()
   const [overlay, setOverlay] = useState<CredentialOverlay<LegacyBrandingOverlay>>({})
   const [isRevoked, setIsRevoked] = useState<boolean>(false)
-  const credentialConnectionLabel = getCredentialConnectionLabel(credential)
+  const { records } = useConnections()
+  const credentialConnectionLabel = getCredentialConnectionLabel(records, credential)
 
   const styles = StyleSheet.create({
     container: {
 
@@ -1,4 +1,4 @@
-import { CredentialExchangeRecord } from '@adeya/ssi'
+import { CredentialExchangeRecord, useConnections } from '@adeya/ssi'
 import { BrandingOverlay } from '@hyperledger/aries-oca'
 import { Attribute, CredentialOverlay, Predicate } from '@hyperledger/aries-oca/build/legacy'
 import startCase from 'lodash.startcase'
@@ -91,7 +91,8 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
   const { ColorPallet, TextTheme, ListItems } = useTheme()
   const { OCABundleResolver } = useConfiguration()
   const [isRevoked, setIsRevoked] = useState<boolean>(credential?.revocationNotification !== undefined)
-  const credentialConnectionLabel = getCredentialConnectionLabel(credential, connectionLabel)
+  const { records } = useConnections()
+  const credentialConnectionLabel = getCredentialConnectionLabel(records, credential, connectionLabel)
   const [isProofRevoked, setIsProofRevoked] = useState<boolean>(
     credential?.revocationNotification !== undefined && !!proof,
   )
@@ -136,7 +137,7 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
     },
     primaryBodyContainer: {
       flexGrow: 1,
-      padding,
+      padding: 15,
     },
     imageAttr: {
       height: 150,
@@ -308,6 +309,7 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
               styles.textContainer,
               {
                 lineHeight: 24,
+                width: '85%',
                 fontWeight: 'bold',
               },
             ]}
@@ -379,7 +381,7 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
                   {
                     fontWeight: 'bold',
                     lineHeight: 24,
-                    flex: 1,
+                    width: '85%',
                     flexWrap: 'wrap',
                   },
                 ]}>
 
@@ -1,7 +1,7 @@
+import { W3cCredentialRecord } from '@adeya/ssi'
 import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { FlatList, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
-import Icon from 'react-native-vector-icons/Feather'
+import { ActivityIndicator, FlatList, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
 
 import { useTheme } from '../../contexts/theme'
 import { Field, W3CCredentialAttributeField } from '../../types/record'
@@ -17,13 +17,31 @@ export interface RecordProps {
   fields: Field[]
   hideFieldValues?: boolean
   tables: W3CCredentialAttributeField[]
+  w3cCredential?: Pick<W3cCredentialRecord, 'credential'> & {
+    credential: Pick<Pick<W3cCredentialRecord, 'credential'>, 'credential'> & {
+      prettyVc?: string
+    }
+  }
+  renderCertificate?: () => void
+  isCertificateLoading?: boolean
 }
 
-const W3CCredentialRecord: React.FC<RecordProps> = ({ header, footer, fields, hideFieldValues = false, tables }) => {
+const W3CCredentialRecord: React.FC<RecordProps> = ({
+  header,
+  footer,
+  hideFieldValues = false,
+  tables,
+  w3cCredential,
+  renderCertificate,
+  isCertificateLoading,
+}) => {
   const { t } = useTranslation()
-  const [shown, setShown] = useState<boolean[]>([])
-  const [showAll, setShowAll] = useState<boolean>(false)
-  const { ListItems, TextTheme } = useTheme()
+  const [shown, setShown] = useState<boolean[][]>([])
+  const [showAll, setShowAll] = useState<boolean>(true)
+  const { ListItems, TextTheme, ColorPallet } = useTheme()
+
+  const isPrettyVcAvailable =
+    w3cCredential?.credential?.prettyVc && Object.keys(w3cCredential?.credential?.prettyVc).length > 0
 
   const styles = StyleSheet.create({
     linkContainer: {
@@ -37,31 +55,36 @@ const W3CCredentialRecord: React.FC<RecordProps> = ({ header, footer, fields, hi
       minHeight: TextTheme.normal.fontSize,
       paddingVertical: 2,
     },
+    container: {
+      padding: 16,
+      flexDirection: 'row',
+    },
+    rowContainer: {
+      flexDirection: 'row',
+      justifyContent: isPrettyVcAvailable ? 'space-between' : 'flex-end',
+      backgroundColor: ColorPallet.grayscale.white,
+    },
+    linkText: {
+      fontWeight: 'bold',
+    },
   })
 
   const resetShown = (): void => {
-    setShown(fields.map(() => showAll))
+    setShown(tables.map(table => table.rows.map(() => showAll)))
     setShowAll(!showAll)
   }
 
-  const toggleShownState = (newShowStates: boolean[]): void => {
-    if (newShowStates.filter(shownState => shownState === showAll).length > Math.floor(fields.length / 2)) {
-      setShowAll(!showAll)
-    }
-  }
-
   useEffect(() => {
     resetShown()
-  }, [])
+  }, [tables])
 
   return (
     <FlatList
       data={tables}
       keyExtractor={({ title }, index) => title || index.toString()}
       renderItem={({ item: table, index }) => (
         <View style={{}}>
-          <View style={{ paddingVertical: 10, flexDirection: 'row' }}>
-            {table.depth > 1 && <Icon style={{ color: 'red' }} name="corner-down-right" size={30} />}
+          <View style={styles.container}>
             {table.title && (
               <Text
                 style={[ListItems.recordAttributeLabel, { fontWeight: 'bold', paddingLeft: 10 }]}
@@ -85,11 +108,10 @@ const W3CCredentialRecord: React.FC<RecordProps> = ({ header, footer, fields, hi
                 hideFieldValue={hideFieldValues}
                 onToggleViewPressed={() => {
                   const newShowState = [...shown]
-                  newShowState[index] = !shown[index]
+                  newShowState[index][idx] = !shown[index][idx]
                   setShown(newShowState)
-                  toggleShownState(newShowState)
                 }}
-                shown={hideFieldValues ? !!shown[index] : true}
+                shown={hideFieldValues ? !!(shown?.[index]?.[idx] ?? false) : true}
                 hideBottomBorder={idx === table.rows.length - 1}
               />
             ))}
@@ -100,19 +122,39 @@ const W3CCredentialRecord: React.FC<RecordProps> = ({ header, footer, fields, hi
         header ? (
           <RecordHeader>
             {header()}
-            {hideFieldValues ? (
-              <View style={styles.linkContainer}>
-                <TouchableOpacity
-                  style={styles.link}
-                  activeOpacity={1}
-                  onPress={() => resetShown()}
-                  testID={testIdWithKey('HideAll')}
-                  accessible={true}
-                  accessibilityLabel={showAll ? t('Record.ShowAll') : t('Record.HideAll')}>
-                  <Text style={ListItems.recordLink}>{showAll ? t('Record.ShowAll') : t('Record.HideAll')}</Text>
-                </TouchableOpacity>
-              </View>
-            ) : null}
+            <View style={styles.rowContainer}>
+              {isPrettyVcAvailable && (
+                <View style={styles.linkContainer}>
+                  {isCertificateLoading ? (
+                    <ActivityIndicator size={'small'} />
+                  ) : (
+                    <TouchableOpacity
+                      style={styles.link}
+                      activeOpacity={1}
+                      onPress={renderCertificate}
+                      testID={testIdWithKey('ViewCertificate')}
+                      accessible={true}
+                      accessibilityLabel={t('Record.ViewCertificate')}>
+                      <Text style={[ListItems.recordLink, styles.linkText]}>{t('Record.ViewCertificate')}</Text>
+                    </TouchableOpacity>
+                  )}
+                </View>
+              )}
+
+              {hideFieldValues ? (
+                <View style={styles.linkContainer}>
+                  <TouchableOpacity
+                    style={styles.link}
+                    activeOpacity={1}
+                    onPress={() => resetShown()}
+                    testID={testIdWithKey('HideAll')}
+                    accessible={true}
+                    accessibilityLabel={showAll ? t('Record.ShowAll') : t('Record.HideAll')}>
+                    <Text style={ListItems.recordLink}>{showAll ? t('Record.ShowAll') : t('Record.HideAll')}</Text>
+                  </TouchableOpacity>
+                </View>
+              ) : null}
+            </View>
           </RecordHeader>
         ) : null
       }
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,8 @@ android {`
`81`	`81`	`applicationId "id.credebl.adeya"`
`82`	`82`	`minSdkVersion rootProject.ext.minSdkVersion`
`83`	`83`	`targetSdkVersion rootProject.ext.targetSdkVersion`
`84`		`- versionCode 12`
`85`		`- versionName "1.0.9"`
	`84`	`+ versionCode 16`
	`85`	`+ versionName "1.0.10"`
`86`	`86`
`87`	`87`	`missingDimensionStrategy 'react-native-camera', 'general'`
`88`	`88`	`}`
`@@ -114,6 +114,15 @@ android {`
`114`	`114`	`proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"`
`115`	`115`	`}`
`116`	`116`	`}`
	`117`	`+`
	`118`	`+ packagingOptions {`
	`119`	`+ pickFirst 'lib/x86/libc++_shared.so'`
	`120`	`+ pickFirst 'lib/x86_64/libjsc.so'`
	`121`	`+ pickFirst 'lib/arm64-v8a/libjsc.so'`
	`122`	`+ pickFirst 'lib/arm64-v8a/libc++_shared.so'`
	`123`	`+ pickFirst 'lib/x86_64/libc++_shared.so'`
	`124`	`+ pickFirst 'lib/armeabi-v7a/libc++_shared.so'`
	`125`	`+ }`
`117`	`126`	`}`
`118`	`127`
`119`	`128`	`dependencies {`