Discard commits to sync fork.

idpass · Jan 29, 2024 · b5de93b · b5de93b
1 parent bb418e7
commit b5de93b
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 7 deletions.
diff --git a/components/DeviceInfoList.tsx b/components/DeviceInfoList.tsx
@@ -23,4 +23,6 @@ interface DeviceInfoProps {
 
 export interface DeviceInfo {
   deviceName: string;
+  name: string;
+  deviceId: string;
 }
diff --git a/machines/request.ts b/machines/request.ts
@@ -652,7 +652,8 @@ export const requestMachine =
               _vcKey: VC_ITEM_STORE_KEY(context.incomingVc),
               type: context.receiveLogType,
               timestamp: Date.now(),
-              deviceName: context.senderInfo.deviceName,
+              deviceName:
+                context.senderInfo.name || context.senderInfo.deviceName,
               vcLabel: context.incomingVc.tag || context.incomingVc.id,
             }),
           { to: (context) => context.serviceRefs.activityLog }

diff --git a/machines/revoke.typegen.ts b/machines/revoke.typegen.ts
@@ -20,9 +20,9 @@ export interface Typegen0 {
   };
   'missingImplementations': {
     actions: never;
-    delays: never;
-    guards: never;
     services: never;
+    guards: never;
+    delays: never;
   };
   'eventsCausingActions': {
     clearOtp:
@@ -39,12 +39,12 @@ export interface Typegen0 {
     setTransactionId: 'DISMISS' | 'REVOKE_VCS' | 'xstate.init';
     setVIDs: 'REVOKE_VCS';
   };
-  'eventsCausingDelays': {};
-  'eventsCausingGuards': {};
   'eventsCausingServices': {
     requestOtp: never;
     requestRevoke: 'INPUT_OTP';
   };
+  'eventsCausingGuards': {};
+  'eventsCausingDelays': {};
   'matchesStates':
     | 'acceptingOtpInput'
     | 'acceptingVIDs'

diff --git a/machines/scan.ts b/machines/scan.ts
@@ -591,7 +591,8 @@ export const scanMachine =
                 ? 'VC_SHARED_WITH_VERIFICATION_CONSENT'
                 : context.shareLogType,
               timestamp: Date.now(),
-              deviceName: context.receiverInfo.deviceName,
+              deviceName:
+                context.receiverInfo.name || context.receiverInfo.deviceName,
               vcLabel: context.selectedVc.tag || context.selectedVc.id,
             }),
           { to: (context) => context.serviceRefs.activityLog }
@@ -603,7 +604,8 @@ export const scanMachine =
               _vcKey: VC_ITEM_STORE_KEY(context.selectedVc),
               type: 'PRESENCE_VERIFICATION_FAILED',
               timestamp: Date.now(),
-              deviceName: context.receiverInfo.deviceName,
+              deviceName:
+                context.receiverInfo.name || context.receiverInfo.deviceName,
               vcLabel: context.selectedVc.tag || context.selectedVc.id,
             }),
           { to: (context) => context.serviceRefs.activityLog }

diff --git a/machines/settings.ts b/machines/settings.ts
@@ -8,6 +8,7 @@ import { StoreEvents } from './store';
 const model = createModel(
   {
     serviceRefs: {} as AppServices,
+    name: '',
     vcLabel: {
       singular: 'ID',
       plural: 'IDs',
@@ -16,6 +17,7 @@ const model = createModel(
   },
   {
     events: {
+      UPDATE_NAME: (name: string) => ({ name }),
       UPDATE_VC_LABEL: (label: string) => ({ label }),
       TOGGLE_BIOMETRIC_UNLOCK: (enable: boolean) => ({ enable }),
       STORE_RESPONSE: (response: unknown) => ({ response }),
@@ -58,6 +60,9 @@ export const settingsMachine = model.createMachine(
           TOGGLE_BIOMETRIC_UNLOCK: {
             actions: ['toggleBiometricUnlock', 'storeContext'],
           },
+          UPDATE_NAME: {
+            actions: ['updateName', 'storeContext'],
+          },
           UPDATE_VC_LABEL: {
             actions: ['updateVcLabel', 'storeContext'],
           },
@@ -87,6 +92,10 @@ export const settingsMachine = model.createMachine(
         };
       }),
 
+      updateName: model.assign({
+        name: (_, event) => event.name,
+      }),
+
       updateVcLabel: model.assign({
         vcLabel: (_, event) => ({
           singular: event.label,
@@ -116,6 +125,10 @@ export function createSettingsMachine(serviceRefs: AppServices) {
 
 type State = StateFrom<typeof settingsMachine>;
 
+export function selectName(state: State) {
+  return state.context.name;
+}
+
 export function selectVcLabel(state: State) {
   return state.context.vcLabel;
 }

diff --git a/machines/settings.typegen.ts b/machines/settings.typegen.ts
@@ -18,8 +18,10 @@ export interface Typegen0 {
     storeContext:
       | 'STORE_RESPONSE'
       | 'TOGGLE_BIOMETRIC_UNLOCK'
+      | 'UPDATE_NAME'
       | 'UPDATE_VC_LABEL';
     toggleBiometricUnlock: 'TOGGLE_BIOMETRIC_UNLOCK';
+    updateName: 'UPDATE_NAME';
     updateVcLabel: 'UPDATE_VC_LABEL';
   };
   'eventsCausingDelays': {};

diff --git a/screens/Profile/ProfileScreen.tsx b/screens/Profile/ProfileScreen.tsx
@@ -46,6 +46,11 @@ export const ProfileScreen: React.FC<MainRouteProps> = (props) => {
           onBackdropPress={controller.hideAlert}
           title={controller.alertMsg}
         />
+        <EditableListItem
+          label={t('name')}
+          value={controller.name}
+          onEdit={controller.UPDATE_NAME}
+        />
         <EditableListItem
           label={t('vcLabel')}
           value={controller.vcLabel.singular}

diff --git a/screens/Profile/ProfileScreenController.ts b/screens/Profile/ProfileScreenController.ts
@@ -9,6 +9,7 @@ import {
 } from '../../machines/auth';
 import {
   selectBiometricUnlockEnabled,
+  selectName,
   selectVcLabel,
   SettingsEvents,
 } from '../../machines/settings';
@@ -93,6 +94,7 @@ export function useProfileScreen({ navigation }: MainRouteProps) {
     alertMsg,
     hideAlert,
     backendInfo: useSelector(appService, selectBackendInfo),
+    name: useSelector(settingsService, selectName),
     vcLabel: useSelector(settingsService, selectVcLabel),
     isBiometricUnlockEnabled: useSelector(
       settingsService,
@@ -101,6 +103,9 @@ export function useProfileScreen({ navigation }: MainRouteProps) {
     canUseBiometrics: useSelector(authService, selectCanUseBiometrics),
     useBiometrics,
 
+    UPDATE_NAME: (name: string) =>
+      settingsService.send(SettingsEvents.UPDATE_NAME(name)),
+
     UPDATE_VC_LABEL: (label: string) =>
       settingsService.send(SettingsEvents.UPDATE_VC_LABEL(label)),