forked from valora-inc/wallet
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
### Resolved conflicts > CONFLICT (rename/rename): __mocks__/react-native-fs.ts renamed to packages/@divvi/mobile/__mocks__/react-native-fs.ts in HEAD and to __mocks__/@divvi/react-native-fs.ts in upstream/main. > CONFLICT (rename/rename): __mocks__/react-native-keychain.ts renamed to packages/@divvi/mobile/__mocks__/react-native-keychain.ts in HEAD and to __mocks__/@divvi/react-native-keychain.ts in upstream/main. > CONFLICT (content): Merge conflict in package.json > CONFLICT (content): Merge conflict in packages/@divvi/mobile/src/analytics/AppAnalytics.test.ts > CONFLICT (content): Merge conflict in packages/@divvi/mobile/src/firebase/remoteConfigValuesDefaults.ts > CONFLICT (file location): src/navigator/DemoModeAuthBlock.test.tsx added in upstream/main inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to packages/@divvi/mobile/src/navigator/DemoModeAuthBlock.test.tsx. > CONFLICT (file location): src/navigator/DemoModeAuthBlock.tsx added in upstream/main inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to packages/@divvi/mobile/src/navigator/DemoModeAuthBlock.tsx. > CONFLICT (rename/delete): src/pincode/pin-blocklist-hibpv7-top-25k-with-keyboard-translations.json renamed to packages/@divvi/mobile/src/pincode/pin-blocklist-hibpv7-top-25k-with-keyboard-translations.json in HEAD, but deleted in upstream/main. > CONFLICT (modify/delete): packages/@divvi/mobile/src/pincode/pin-blocklist-hibpv7-top-25k-with-keyboard-translations.json deleted in upstream/main and modified in HEAD. Version HEAD of packages/@divvi/mobile/src/pincode/pin-blocklist-hibpv7-top-25k-with-keyboard-translations.json left in tree. > CONFLICT (content): Merge conflict in packages/@divvi/mobile/src/tokens/TabWallet.test.tsx > CONFLICT (content): Merge conflict in packages/@divvi/mobile/src/tokens/utils.ts > CONFLICT (content): Merge conflict in packages/@divvi/mobile/src/transactions/feed/TransactionFeed.test.tsx > CONFLICT (content): Merge conflict in packages/@divvi/mobile/src/transactions/feed/TransactionFeedV2.test.tsx > CONFLICT (modify/delete): src/firebase/remoteConfigValuesDefaults.e2e.ts deleted in HEAD and modified in upstream/main. Version upstream/main of src/firebase/remoteConfigValuesDefaults.e2e.ts left in tree. > CONFLICT (content): Merge conflict in yarn.lock --------- Co-authored-by: Kathy Luo <[email protected]> Co-authored-by: valora-bot-crowdin <[email protected]> Co-authored-by: Valora Bot <[email protected]> Co-authored-by: Myroslav Sviderok <[email protected]> Co-authored-by: valora-bot <[email protected]> Co-authored-by: Satish Ravi <[email protected]> Co-authored-by: Anka <[email protected]>
- Loading branch information
1 parent
096599c
commit 01b0d35
Showing
171 changed files
with
1,028 additions
and
1,632 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.