Skip to content

Commit

Permalink
Merge branch 'feature/pwn-8165-striga' into release/2.9.1
Browse files Browse the repository at this point in the history
* feature/pwn-8165-striga: (247 commits)
  feat: increase delay to fix the test
  feat: re-enable KeyAppStateMachineTests
  feat: swiftformat
  feat: format all files
  feat: update lib
  feat: excluded TimedOut and Cannot Find Host error
  refactor: isNetworkConnectionError
  Fix IBAN details informer view
  [PWN-9453] New BankTransferInfo screen with mocked buttons
  feat: ignore KeyAppStateMachineTests since it is unstable
  feat: ignore FeeRelayerSwiftUnitTests
  [PWN-9453] Update Striga OTP naming
  [PWN-9453] Update StrigaOTPSuccess screen
  Remove unnecessary fix
  [PWN-9553] Format IBAN
  [PWN-9552] Reset do not show flag on logout
  [PWN-8854] Update ChoosePhoneCode screens on Onboarding and Striga registration
  [PWN-9451] Update registration form
  [PWN-9540] Fix web3 button and missed color
  feat: remove unused imports
  ...

# Conflicts:
#	project.yml
  • Loading branch information
bigearsenal committed Aug 7, 2023
2 parents 45f4400 + df62dd6 commit 4497aa0
Show file tree
Hide file tree
Showing 1,369 changed files with 28,446 additions and 37,393 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ios-on-duty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,11 @@ jobs:
DISCORD_MESSAGE_API_BEARER_TOKEN: ${{ secrets.DISCORD_MESSAGE_API_BEARER_TOKEN }}
DISCORD_MESSAGE_API_ENDPOINT: ${{ secrets.DISCORD_MESSAGE_API_ENDPOINT }}
DISCORD_QA_CHANNEL_ID: ${{ secrets.DISCORD_QA_CHANNEL_ID }}
DISCORD_IOS_ON_DUTY_ROLE_ID: ${{ secrets.DISCORD_IOS_ON_DUTY_ROLE_ID }}
DISCORD_QA_ON_DUTY_ROLE_ID: ${{ secrets.DISCORD_QA_ON_DUTY_ROLE_ID }}
run: |
next_person_id="${{ steps.calculate_next_person_id.outputs.next_person_id }}"
MESSAGE="Hi! <@$next_person_id>! Duty call! This week is your turn to handle <@&1111282130476093460> role.\n<@&1111281802858995753> cc"
MESSAGE="Hi! <@$next_person_id>! Duty call! This week is your turn to handle <@&$DISCORD_IOS_ON_DUTY_ROLE_ID> role.\n<@&$DISCORD_QA_ON_DUTY_ROLE_ID> cc"
curl -X POST \
-H "Content-Type: application/json" \
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/key-app-kit-unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,15 @@ jobs:
-parallel-testing-worker-count 3 \
-parallel-testing-enabled YES \
-resultBundlePath TestResults \
-only-testing:AnalyticsManagerUnitTests \
-only-testing:BankTransferTests \
-only-testing:CountriesAPIUnitTests \
-only-testing:JSBridgeTests \
-only-testing:KeyAppKitCoreTests \
-only-testing:KeyAppNetworkingTests \
-only-testing:KeyAppStateMachineTests \
-only-testing:BankTransferTests \
-only-testing:OnboardingTests \
-only-testing:WormholeTests \
| xcbeautify
# - uses: sersoft-gmbh/[email protected]
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,3 @@ p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/*
!p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/
p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/*
!p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

# KeyAppKit
# Packages/KeyAppKit/.swiftpm/xcode/xcshareddata/xcschemes
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "SolanaPricesAPIs"
BuildableName = "SolanaPricesAPIs"
BlueprintName = "SolanaPricesAPIs"
BlueprintIdentifier = "FeeRelayerSwift"
BuildableName = "FeeRelayerSwift"
BlueprintName = "FeeRelayerSwift"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -49,9 +49,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "SolanaPricesAPIs"
BuildableName = "SolanaPricesAPIs"
BlueprintName = "SolanaPricesAPIs"
BlueprintIdentifier = "FeeRelayerSwift"
BuildableName = "FeeRelayerSwift"
BlueprintName = "FeeRelayerSwift"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
Expand Down
Loading

0 comments on commit 4497aa0

Please sign in to comment.