Dev (#186)

Co-authored-by: Poonam Ghewande <[email protected]> Co-authored-by: Ajay Jadhav <[email protected]> Co-authored-by: Sai Ranjit Tummalapalli <[email protected]> Co-authored-by: Amit Padmani <[email protected]>
credebl · Apr 16, 2024 · 792c542 · 792c542
1 parent 0e106e8
commit 792c542
Show file tree

Hide file tree

Showing 44 changed files with 2,611 additions and 607 deletions.
diff --git a/.env.sample b/.env.sample
@@ -4,6 +4,9 @@ MEDIATOR_URL=
 MEDIATOR_USE_PUSH_NOTIFICATIONS=true
 MEDIATOR_LABEL=Mediator
 
+# Client code to use push notifications
+CLIENT_CODE=CLIENT_CODE
+
 # OCA
 OCA_URL=https://raw.githubusercontent.com/credebl/credebl-aries-oca-bundles/release
 

diff --git a/App.tsx b/App.tsx
@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+global.Buffer = require('buffer').Buffer
+
 import { AdeyaAgentProvider } from '@adeya/ssi'
 import * as React from 'react'
 import { useEffect, useMemo } from 'react'

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -81,8 +81,8 @@ android {
         applicationId "id.credebl.adeya"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 8
-        versionName "1.0.5"
+        versionCode 11
+        versionName "1.0.8"
 
         missingDimensionStrategy 'react-native-camera', 'general'
     }

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -60,6 +60,8 @@
                 <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" />
             </intent-filter>
 
         </activity>

diff --git a/app/assets/img/active-explore-icon.svg b/app/assets/img/active-explore-icon.svg
diff --git a/app/assets/img/adeya-logo-secondary.png b/app/assets/img/adeya-logo-secondary.png
diff --git a/app/components/misc/CredentialCard.tsx b/app/components/misc/CredentialCard.tsx
@@ -60,6 +60,7 @@ const CredentialCard: React.FC<CredentialCardProps> = ({
           hasAltCredentials={hasAltCredentials}
           proof
           elevated
+          onPress={onPress}
         />
       )
     }

diff --git a/app/components/misc/SharedProofData.tsx b/app/components/misc/SharedProofData.tsx
@@ -118,10 +118,8 @@ const SharedDataCard: React.FC<{ sharedData: GroupedSharedProofDataItem }> = ({
     return (
       <View key={item.name} style={[styles.attributeContainer]}>
         <Text style={styles.attributeName}>{item.label || item.name}</Text>
-        {!parsedPredicate && <AttributeValue style={styles.attributeValue} field={item as Attribute} shown={true} />}
-        {item instanceof Predicate && (
-          <Text style={styles.attributeValue}>{`${parsedPredicate?.pType} ${parsedPredicate?.pValue}`}</Text>
-        )}
+        {!item?.pType && <AttributeValue style={styles.attributeValue} field={item as Attribute} shown={true} />}
+        {item?.pType && <Text style={styles.attributeValue}>{`${item?.pType} ${item?.pValue}`}</Text>}
       </View>
     )
   }

diff --git a/app/components/modals/CommonRemoveModal.tsx b/app/components/modals/CommonRemoveModal.tsx
@@ -125,10 +125,18 @@ const CommonRemoveModal: React.FC<CommonRemoveModalProps> = ({ usage, visible, d
       ...TextTheme.modalNormal,
       marginTop: 25,
     },
+    buttonsContainer: {
+      paddingTop: 10,
+      paddingBottom: 25,
+    },
   })
 
   const titleForConfirmButton = (): string => {
     switch (usage) {
+      case ModalUsage.ContactRemoveWithCredentialsOffer:
+        return t('ContactDetails.GoToCredentialsOffer')
+      case ModalUsage.ContactRemoveWithProofRequest:
+        return t('ContactDetails.GoToProofRequest')
       case ModalUsage.ContactRemove:
         return t('ContactDetails.RemoveContact')
       case ModalUsage.ContactRemoveWithCredentials:
@@ -142,6 +150,10 @@ const CommonRemoveModal: React.FC<CommonRemoveModalProps> = ({ usage, visible, d
 
   const labelForConfirmButton = (): string => {
     switch (usage) {
+      case ModalUsage.ContactRemoveWithCredentialsOffer:
+        return t('ContactDetails.GoToCredentialsOffer')
+      case ModalUsage.ContactRemoveWithProofRequest:
+        return t('ContactDetails.GoToProofRequest')
       case ModalUsage.ContactRemove:
         return t('ContactDetails.RemoveContact')
       case ModalUsage.ContactRemoveWithCredentials:
@@ -156,6 +168,8 @@ const CommonRemoveModal: React.FC<CommonRemoveModalProps> = ({ usage, visible, d
   const testIdForConfirmButton = (): string => {
     switch (usage) {
       case ModalUsage.ContactRemove:
+      case ModalUsage.ContactRemoveWithCredentialsOffer:
+      case ModalUsage.ContactRemoveWithProofRequest:
       case ModalUsage.CredentialRemove:
         return testIdWithKey('ConfirmRemoveButton')
       case ModalUsage.ContactRemoveWithCredentials:
@@ -171,6 +185,8 @@ const CommonRemoveModal: React.FC<CommonRemoveModalProps> = ({ usage, visible, d
   const testIdForCancelButton = (): string => {
     switch (usage) {
       case ModalUsage.ContactRemove:
+      case ModalUsage.ContactRemoveWithCredentialsOffer:
+      case ModalUsage.ContactRemoveWithProofRequest:
       case ModalUsage.CredentialRemove:
         return testIdWithKey('CancelRemoveButton')
       case ModalUsage.ContactRemoveWithCredentials:
@@ -250,6 +266,28 @@ const CommonRemoveModal: React.FC<CommonRemoveModalProps> = ({ usage, visible, d
             </View>
           </View>
         )
+      case ModalUsage.ContactRemoveWithCredentialsOffer:
+        return (
+          <View style={[{ marginBottom: 25 }]}>
+            <View style={[{ marginBottom: 25 }]}>
+              <Text style={[TextTheme.modalTitle]}>{t('ContactDetails.UnableToRemoveTitle')}</Text>
+            </View>
+            <View>
+              <Text style={[styles.bodyText]}>{t('ContactDetails.UnableToRemoveCaptionLabel')}</Text>
+            </View>
+          </View>
+        )
+      case ModalUsage.ContactRemoveWithProofRequest:
+        return (
+          <View style={[{ marginBottom: 25 }]}>
+            <View style={[{ marginBottom: 25 }]}>
+              <Text style={[TextTheme.modalTitle]}>{t('ContactDetails.UnableToRemoveTitle')}</Text>
+            </View>
+            <View>
+              <Text style={[styles.bodyText]}>{t('ContactDetails.UnableToRemoveCaptionRequestLabel')}</Text>
+            </View>
+          </View>
+        )
       case ModalUsage.CredentialOfferDecline:
         return (
           <View style={[{ marginBottom: 25 }]}>
@@ -317,11 +355,17 @@ const CommonRemoveModal: React.FC<CommonRemoveModalProps> = ({ usage, visible, d
               onPress={onSubmit}
               disabled={disabled}
               buttonType={
-                usage === ModalUsage.ContactRemoveWithCredentials ? ButtonType.ModalPrimary : ButtonType.ModalCritical
+                usage === ModalUsage.ContactRemoveWithCredentials
+                  ? ButtonType.ModalPrimary
+                  : ButtonType.ModalCritical && usage === ModalUsage.ContactRemoveWithCredentialsOffer
+                  ? ButtonType.ModalPrimary
+                  : ButtonType.ModalCritical && usage === ModalUsage.ContactRemoveWithProofRequest
+                  ? ButtonType.ModalPrimary
+                  : ButtonType.ModalCritical
               }
             />
           </View>
-          <View style={[{ paddingTop: 10 }]}>
+          <View style={styles.buttonsContainer}>
             <Button
               title={t('Global.Cancel')}
               accessibilityLabel={t('Global.Cancel')}

diff --git a/app/components/record/RecordField.tsx b/app/components/record/RecordField.tsx
@@ -92,6 +92,22 @@ const RecordField: React.FC<RecordFieldProps> = ({
     },
   })
 
+  const isJSON = (text: string) => {
+    if (typeof text !== 'string') {
+      return false
+    }
+    try {
+      JSON.parse(text)
+      return true
+    } catch (error) {
+      return false
+    }
+  }
+
+  if (isJSON(field?.value)) {
+    return
+  }
+
   return (
     <View style={styles.container}>
       <View style={styles.valueContainer}>

diff --git a/app/localization/en/index.ts b/app/localization/en/index.ts
@@ -271,7 +271,11 @@ const translation = {
     "RemoveCaption": "To add credentials, the issuing organization needs to be a Contact.",
     "UnableToRemoveTitle": "Unable to remove Contact",
     "UnableToRemoveCaption": "Unable to remove because there are credentials issued by this Contact in your wallet. Remove the credentials first then remove this Contact.",
+    "UnableToRemoveCaptionLabel": "Unable to remove because there are credential offer issued by this Contact in your wallet. Remove the credentials offer first then remove this Contact.",
+    "UnableToRemoveCaptionRequestLabel": "Unable to remove because there are proof request issued by this Contact in your wallet. Remove the Proof request first then remove this Contact.",
     "GoToCredentials": "Go to Credentials",
+    "GoToCredentialsOffer": "Go to CredentialsOffer",
+    "GoToProofRequest": "Go to ProofRequest",
     "RemoveContact": "Remove Contact",
     "ContactRemoved": "Contact removed",
     "RemoveContactMessageTop": "By removing this Contact you'll no longer be able to:",

diff --git a/app/navigators/TabStack.tsx b/app/navigators/TabStack.tsx
@@ -91,7 +91,7 @@ const TabStack: React.FC = () => {
             tabBarIconStyle: styles.tabBarIcon,
             tabBarIcon: ({ focused }) => (
               <View style={{ ...TabTheme.tabBarContainerStyle, justifyContent: showLabels ? 'flex-end' : 'center' }}>
-                <Assets.svg.ExploreIcon />
+                {focused ? <Assets.svg.ExploreIconActive /> : <Assets.svg.ExploreIcon />}
                 {showLabels && (
                   <Text
                     style={{

diff --git a/app/onboardingStyles.ts b/app/onboardingStyles.ts
@@ -0,0 +1,73 @@
+import { StyleSheet } from 'react-native'
+import { widthPercentageToDP as wp, heightPercentageToDP as hp } from 'react-native-responsive-screen'
+
+export const styles = StyleSheet.create({
+  container: {
+    height: hp('100%'),
+    width: wp('100%'),
+    paddingTop: hp('3%'),
+    padding: hp('1%'),
+  },
+  headerText: {
+    alignSelf: 'center',
+    marginBottom: hp('2.5%'),
+    justifyContent: 'center',
+    color: '#1F4EAD',
+    paddingBottom: hp('2%'),
+    fontSize: 28,
+  },
+  backgroundImage: {
+    height: 245,
+    width: 343,
+    alignSelf: 'center',
+  },
+
+  Image: {
+    width: 78,
+    height: 78,
+    flexShrink: 0,
+    position: 'absolute',
+    right: 100,
+    top: 70,
+    left: 132,
+    bottom: 0,
+  },
+  qrImage: {
+    width: wp('21%'),
+    height: wp('21%'),
+    flexShrink: 0,
+    position: 'absolute',
+    right: wp('20%'),
+    top: hp('12.5%'),
+    left: wp('37.5%'),
+  },
+  bodyText: {
+    marginTop: hp('2.5%'),
+    display: 'flex',
+    width: wp('80%'),
+    flexDirection: 'column',
+    flexShrink: 0,
+    fontSize: hp('2.5%'),
+    textAlign: 'center',
+    color: '#2289F7',
+  },
+  descriptionText: {
+    alignSelf: 'center',
+    marginHorizontal: wp('1%'),
+  },
+  startedButtonContainer: {
+    marginTop: 'auto',
+    margin: wp('5%'),
+  },
+  guideImages: {
+    alignItems: 'center',
+  },
+  ScrollView: {
+    flex: 1,
+    padding: hp('0.5%'),
+  },
+  endPageContainer: {
+    height: '100%',
+    justifyContent: 'center',
+  },
+})
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,6 +60,7 @@ const CredentialCard: React.FC<CredentialCardProps> = ({ @@
               hasAltCredentials={hasAltCredentials}
               proof
               elevated
+              onPress={onPress}
             />
           )
         }
@@ Expand Down @@