Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
/* Begin PBXFileReference section */
1A6B2865F76F213517CFCCD1 /* AppViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AppViewController.swift; sourceTree = "<group>"; };
21A34DAD709C71D553F88951 /* LocalBiometricPlugin.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LocalBiometricPlugin.swift; sourceTree = "<group>"; };
C7D4E92B3F8B1C5D00A2B9E2 /* BarcodeScannerPlugin.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BarcodeScannerPlugin.swift; sourceTree = "<group>"; };
2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = "<group>"; };
50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = "<group>"; };
504EC3041FED79650016851F /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -36,6 +35,7 @@
873F0344C8952CB5585102E0 /* App.entitlements */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = "<group>"; };
958DCC722DB07C7200EA8C5F /* debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = debug.xcconfig; path = ../debug.xcconfig; sourceTree = SOURCE_ROOT; };
BFB20C26958B0AB36D108D0E /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
C7D4E92B3F8B1C5D00A2B9E2 /* BarcodeScannerPlugin.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BarcodeScannerPlugin.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -56,6 +56,7 @@
958DCC722DB07C7200EA8C5F /* debug.xcconfig */,
504EC3061FED79650016851F /* App */,
504EC3051FED79650016851F /* Products */,
7BF04FDF2F1F799A005E306E /* Recovered References */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -86,6 +87,14 @@
path = App;
sourceTree = "<group>";
};
7BF04FDF2F1F799A005E306E /* Recovered References */ = {
isa = PBXGroup;
children = (
BFB20C26958B0AB36D108D0E /* Pods-App.release.xcconfig */,
);
name = "Recovered References";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -313,6 +322,7 @@
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = YQ9XQQJ5ZM;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -337,6 +347,7 @@
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = YQ9XQQJ5ZM;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions public/_locales/ko/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2054,7 +2054,7 @@
"englishSource": "Enable Biometric"
},
"skipBiometricSetup": {
"message": "지금은 건너뛰기",
"message": "지금은 건너뛰세요",
"englishSource": "Skip for now"
},
"biometricAuthRequired": {
Expand Down Expand Up @@ -2150,7 +2150,7 @@
"englishSource": "Tap here to claim it"
},
"tokenHistory": {
"message": "$tokenName$ 내역",
"message": "$tokenName$ 기록",
"englishSource": "$tokenName$ History",
"placeholders": {
"tokenname": {
Expand Down
4 changes: 2 additions & 2 deletions public/_locales/tr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
"englishSource": "Each word separated with a single space"
},
"seedInputNumberOfWords": {
"message": "Benim Seed phrase'ım: $num$ kelimeler",
"message": "Benim Seed phrase'im: $num$ kelimeler",
"englishSource": "My Seed phrase is $num$ words",
"placeholders": {
"num": {
Expand Down Expand Up @@ -2009,7 +2009,7 @@
"englishSource": "This app wants to connect to your wallet"
},
"dappTransactionRequest": {
"message": "Bu uygulama bir işlem istiyor",
"message": "Bu uygulama bir işlem talep ediyor",
"englishSource": "This app is requesting a transaction"
},
"noAccountSelected": {
Expand Down
2 changes: 1 addition & 1 deletion public/_locales/uk/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2146,7 +2146,7 @@
"englishSource": "You have received a note"
},
"noteReceivedTapToClaim": {
"message": "Торкніться тут, щоб отримати його",
"message": "Натисніть тут, щоб отримати його",
"englishSource": "Tap here to claim it"
},
"tokenHistory": {
Expand Down
16 changes: 13 additions & 3 deletions src/app/pages/ForgotPassword/ForgotPassword.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { formatMnemonic } from 'app/defaults';
import { useMidenContext } from 'lib/miden/front';
import { clearClientStorage } from 'lib/miden/reset';
import { useMobileBackHandler } from 'lib/mobile/useMobileBackHandler';
import type { WalletAccount } from 'lib/shared/types';
import { navigate } from 'lib/woozie';
import { ForgotPasswordFlow } from 'screens/onboarding/forgot-password-navigator';
import { ForgotPasswordAction, ForgotPasswordStep, OnboardingType } from 'screens/onboarding/types';
Expand All @@ -18,6 +19,7 @@ const ForgotPassword: FC = () => {
const [password, setPassword] = useState<string | null>(null);
const [importedWithFile, setImportedWithFile] = useState(false);
const [isLoading, setIsLoading] = useState(false);
const [importedWalletAccounts, setImportedWalletAccounts] = useState<WalletAccount[]>([]);

const { registerWallet, importWalletFromClient } = useMidenContext();

Expand All @@ -39,13 +41,21 @@ const ForgotPassword: FC = () => {
} else {
try {
console.log('importing wallet from client');
await importWalletFromClient(password, seedPhraseFormatted);
await importWalletFromClient(password, seedPhraseFormatted, importedWalletAccounts);
} catch (e) {
console.error(e);
}
}
}
}, [password, seedPhrase, importedWithFile, registerWallet, onboardingType, importWalletFromClient]);
}, [
password,
seedPhrase,
importedWithFile,
registerWallet,
onboardingType,
importWalletFromClient,
importedWalletAccounts
]);

const onAction = useCallback(
async (action: ForgotPasswordAction) => {
Expand All @@ -64,8 +74,8 @@ const ForgotPassword: FC = () => {
break;
case 'import-wallet-file-submit':
const seedPhrase = action.payload.split(' ');
console.log({ seedPhrase });
setSeedPhrase(seedPhrase);
setImportedWalletAccounts(action.walletAccounts);
setImportedWithFile(true);
setStep(ForgotPasswordStep.CreatePassword);
break;
Expand Down
Loading