Skip to content

Commit

Permalink
feat(#854): ios changes in backup and restore screen
Browse files Browse the repository at this point in the history
Signed-off-by: Abhishek Paul <abhishek.paul@thoughtworks.com>
  • Loading branch information
Abhishek Paul committed Apr 9, 2024
1 parent d37b1e2 commit 85c3989
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 113 deletions.
5 changes: 3 additions & 2 deletions components/AccountInformation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,21 @@ import {Theme} from './ui/styleUtils';
import {ProfileInfo} from '../shared/CloudBackupAndRestoreUtils';
import {useTranslation} from 'react-i18next';
import testIDProps from '../shared/commonUtil';
import { isAndroid } from '../shared/constants';

export const AccountInformation: React.FC<ProfileInfo> = ({email, picture}) => {
const {t} = useTranslation('AccountSelection');
return (
<Row style={{marginBottom: 21, columnGap: 11}}>
<Column align="center">
{isAndroid() && <Column align="center">
<Image
{...testIDProps('associatedAccountPicture')}
style={{height: 40, width: 40, borderRadius: 45}}
source={{
uri: picture,
}}
/>
</Column>
</Column>}
<Column>
<Row>
<Text
Expand Down
8 changes: 3 additions & 5 deletions ios/Inji.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -472,11 +472,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Inji/Inji.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = V2ABX7953Z;
DEVELOPMENT_TEAM = V2ABX7953Z;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
INFOPLIST_FILE = Inji/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
Expand All @@ -494,7 +493,6 @@
PRODUCT_BUNDLE_IDENTIFIER = io.mosip.inji.wallet.mobileid;
PRODUCT_NAME = Inji;
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.mosip.inji.wallet.mobileid";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
Expand Down
6 changes: 5 additions & 1 deletion ios/Inji/Inji.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
<dict>
<key>aps-environment</key>
<string>development</string>
<key>com.apple.developer.applesignin</key>
<array>
<string>Default</string>
</array>
<key>com.apple.developer.icloud-container-identifiers</key>
<array>
<string>iCloud.io.mosip.inji.wallet.mobileid</string>
Expand All @@ -17,4 +21,4 @@
<string>iCloud.io.mosip.inji.wallet.mobileid</string>
</array>
</dict>
</plist>
</plist>
1 change: 1 addition & 0 deletions machines/backupAndRestore/backupAndRestoreSetup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,7 @@ export const backupAndRestoreSetupMachine = model.createMachine(
return (event.data as SignInResult).status === Cloud.status.SUCCESS;
},
isAuthorised: (_context, event) => {
// console.log((event.data as isSignedInResult).isAuthorisedd)
return (event.data as isSignedInResult).isAuthorisedd || false;
},
},
Expand Down
164 changes: 59 additions & 105 deletions machines/backupAndRestore/backupAndRestoreSetup.typegen.ts
Original file line number Diff line number Diff line change
@@ -1,106 +1,60 @@
// This file was automatically generated. Edits will be overwritten

export interface Typegen0 {
'@@xstate/typegen': true;
internalEvents: {
'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]': {
type: 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
data: unknown;
__tip: 'See the XState TS docs to learn how to strongly type this.';
};
'done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]': {
type: 'done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]';
data: unknown;
__tip: 'See the XState TS docs to learn how to strongly type this.';
};
'done.invoke.signIn:invocation[0]': {
type: 'done.invoke.signIn:invocation[0]';
data: unknown;
__tip: 'See the XState TS docs to learn how to strongly type this.';
};
'error.platform.backupAndRestoreSetup.init.checkInternet:invocation[0]': {
type: 'error.platform.backupAndRestoreSetup.init.checkInternet:invocation[0]';
data: unknown;
};
'xstate.init': {type: 'xstate.init'};
};
invokeSrcNameMap: {
checkInternet: 'done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]';
isUserSignedAlready: 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
signIn: 'done.invoke.signIn:invocation[0]';
};
missingImplementations: {
actions: never;
delays: never;
guards: never;
services: never;
};
eventsCausingActions: {
fetchShowConfirmationInfo: 'done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]';
openSettings: 'OPEN_SETTINGS';
sendBackupAndRestoreSetupCancelEvent: 'DISMISS' | 'GO_BACK';
sendBackupAndRestoreSetupErrorEvent:
| 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]'
| 'done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]'
| 'done.invoke.signIn:invocation[0]'
| 'error.platform.backupAndRestoreSetup.init.checkInternet:invocation[0]';
sendBackupAndRestoreSetupSuccessEvent:
| 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]'
| 'done.invoke.signIn:invocation[0]';
sendDataBackupAndRestoreSetupStartEvent: 'HANDLE_BACKUP_AND_RESTORE';
setAccountSelectionConfirmationShown:
| 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]'
| 'done.invoke.signIn:invocation[0]';
setIsLoading: 'HANDLE_BACKUP_AND_RESTORE' | 'PROCEED' | 'TRY_AGAIN';
setProfileInfo:
| 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]'
| 'done.invoke.signIn:invocation[0]';
setShouldTriggerAutoBackup: 'done.invoke.signIn:invocation[0]';
unsetIsLoading:
| 'DISMISS'
| 'STORE_RESPONSE'
| 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]'
| 'done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]'
| 'error.platform.backupAndRestoreSetup.init.checkInternet:invocation[0]';
unsetShouldTriggerAutoBackup: 'HANDLE_BACKUP_AND_RESTORE';
};
eventsCausingDelays: {};
eventsCausingGuards: {
isAuthorised: 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
isConfirmationAlreadyShown: 'STORE_RESPONSE';
isIOSAndSignInFailed: 'done.invoke.signIn:invocation[0]';
isInternetConnected: 'done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]';
isNetworkError:
| 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]'
| 'done.invoke.signIn:invocation[0]';
isSignInSuccessful: 'done.invoke.signIn:invocation[0]';
isSignedIn: 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
};
eventsCausingServices: {
checkInternet: 'HANDLE_BACKUP_AND_RESTORE' | 'TRY_AGAIN';
isUserSignedAlready: 'PROCEED' | 'STORE_RESPONSE';
signIn: 'done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]';
};
matchesStates:
| 'backupAndRestore'
| 'checkSignIn'
| 'checkSignIn.error'
| 'checkSignIn.idle'
| 'checkSignIn.noInternet'
| 'fetchShowConfirmationInfo'
| 'init'
| 'init.checkInternet'
| 'init.idle'
| 'init.noInternet'
| 'selectCloudAccount'
| 'signIn'
| 'signIn.error'
| 'signIn.idle'
| 'signIn.noInternet'
| {
checkSignIn?: 'error' | 'idle' | 'noInternet';
init?: 'checkInternet' | 'idle' | 'noInternet';
signIn?: 'error' | 'idle' | 'noInternet';
};
tags: never;
}
// This file was automatically generated. Edits will be overwritten

export interface Typegen0 {
'@@xstate/typegen': true;
internalEvents: {
"done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]": { type: "done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]"; data: unknown; __tip: "See the XState TS docs to learn how to strongly type this." };
"done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]": { type: "done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]"; data: unknown; __tip: "See the XState TS docs to learn how to strongly type this." };
"done.invoke.signIn:invocation[0]": { type: "done.invoke.signIn:invocation[0]"; data: unknown; __tip: "See the XState TS docs to learn how to strongly type this." };
"error.platform.backupAndRestoreSetup.init.checkInternet:invocation[0]": { type: "error.platform.backupAndRestoreSetup.init.checkInternet:invocation[0]"; data: unknown };
"xstate.init": { type: "xstate.init" };
};
invokeSrcNameMap: {
"checkInternet": "done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]";
"isUserSignedAlready": "done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]";
"signIn": "done.invoke.signIn:invocation[0]";
};
missingImplementations: {
actions: never;
delays: never;
guards: never;
services: never;
};
eventsCausingActions: {
"fetchShowConfirmationInfo": "done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]";
"openSettings": "OPEN_SETTINGS";
"sendBackupAndRestoreSetupCancelEvent": "DISMISS" | "GO_BACK";
"sendBackupAndRestoreSetupErrorEvent": "done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]" | "done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]" | "done.invoke.signIn:invocation[0]" | "error.platform.backupAndRestoreSetup.init.checkInternet:invocation[0]";
"sendBackupAndRestoreSetupSuccessEvent": "done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]" | "done.invoke.signIn:invocation[0]";
"sendDataBackupAndRestoreSetupStartEvent": "HANDLE_BACKUP_AND_RESTORE";
"setAccountSelectionConfirmationShown": "done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]" | "done.invoke.signIn:invocation[0]";
"setIsLoading": "HANDLE_BACKUP_AND_RESTORE" | "PROCEED" | "TRY_AGAIN";
"setProfileInfo": "done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]" | "done.invoke.signIn:invocation[0]";
"setShouldTriggerAutoBackup": "done.invoke.signIn:invocation[0]";
"unsetIsLoading": "DISMISS" | "STORE_RESPONSE" | "done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]" | "done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]" | "error.platform.backupAndRestoreSetup.init.checkInternet:invocation[0]";
"unsetShouldTriggerAutoBackup": "HANDLE_BACKUP_AND_RESTORE";
};
eventsCausingDelays: {

};
eventsCausingGuards: {
"isAuthorised": "done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]";
"isConfirmationAlreadyShown": "STORE_RESPONSE";
"isIOSAndSignInFailed": "done.invoke.signIn:invocation[0]";
"isInternetConnected": "done.invoke.backupAndRestoreSetup.init.checkInternet:invocation[0]";
"isNetworkError": "done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]" | "done.invoke.signIn:invocation[0]";
"isSignInSuccessful": "done.invoke.signIn:invocation[0]";
"isSignedIn": "done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]";
};
eventsCausingServices: {
"checkInternet": "HANDLE_BACKUP_AND_RESTORE" | "TRY_AGAIN";
"isUserSignedAlready": "PROCEED" | "STORE_RESPONSE";
"signIn": "done.invoke.backupAndRestoreSetup.checkSignIn:invocation[0]";
};
matchesStates: "backupAndRestore" | "checkSignIn" | "checkSignIn.error" | "checkSignIn.idle" | "checkSignIn.noInternet" | "fetchShowConfirmationInfo" | "init" | "init.checkInternet" | "init.idle" | "init.noInternet" | "selectCloudAccount" | "signIn" | "signIn.error" | "signIn.idle" | "signIn.noInternet" | { "checkSignIn"?: "error" | "idle" | "noInternet";
"init"?: "checkInternet" | "idle" | "noInternet";
"signIn"?: "error" | "idle" | "noInternet"; };
tags: never;
}

0 comments on commit 85c3989

Please sign in to comment.