Skip to content

Commit

Permalink
Merge branch 'master' into feat/swap-token
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/espressocash_app/lib/features/activities/data/transaction_repository.dart
#	packages/espressocash_app/lib/features/activities/services/tx_updater.dart
#	packages/espressocash_app/lib/features/activities/widgets/recent_token_activity.dart
#	packages/espressocash_app/lib/features/currency/models/amount.dart
#	packages/espressocash_app/lib/features/token_details/screens/token_details_screen.dart
#	packages/espressocash_app/lib/l10n/intl_en.arb
  • Loading branch information
Merculiar committed Jan 26, 2025
2 parents 6f81a2b + 1ee1cd7 commit a62f380
Show file tree
Hide file tree
Showing 65 changed files with 2,212 additions and 1,193 deletions.
53 changes: 2 additions & 51 deletions .github/workflows/check_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,57 +195,8 @@ jobs:
melos exec -c 1 ${{ env.SCOPE }} -- make deps_graph_all
melos exec -c 1 ${{ env.SCOPE }} -- make deps_graph_features
- name: Test
run: melos exec -c 1 ${{ env.SCOPE }} --dir-exists="test" -- make flutter_test

- name: Store failure artifacts
if: ${{ failure() }}
uses: actions/upload-artifact@v4
with:
name: golden-test-failure
path: "**/test/golden/**/failures/"

espressocash_landing:
needs: [formatting]
runs-on: ubuntu-latest
permissions:
contents: write
packages: read
env:
SCOPE: --scope="espressocash_landing"

steps:
- uses: actions/checkout@v4

- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: "stable"

- name: Install DCM
uses: CQLabs/setup-dcm@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
version: ${{ env.DCM_VERSION }}

- name: Activate utils
run: make activate_utils

- name: Install dependencies
run: melos bs ${{ env.SCOPE }}

- name: Generate code
run: |
melos exec -c 1 ${{ env.SCOPE }} --depends-on="flutter_localizations" -- flutter gen-l10n
melos exec -c 1 ${{ env.SCOPE }} --depends-on="build_runner" -- make flutter_build
- name: Generate test schemas
run: melos exec -c 1 ${{ env.SCOPE }} --depends-on="drift_dev" -- make flutter_generate_test_schemas

- name: Analyze
run: |
melos exec -c 1 ${{ env.SCOPE }} -- make flutter_analyze
melos exec -c 1 ${{ env.SCOPE }} -- make deps_graph_all
- name: Install SQLite dependencies
run: sudo apt-get update && sudo apt-get install -y sqlite3 libsqlite3-dev

- name: Test
run: melos exec -c 1 ${{ env.SCOPE }} --dir-exists="test" -- make flutter_test
Expand Down
1 change: 1 addition & 0 deletions packages/espressocash_api/lib/src/dto/create_payment.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class CreateDirectPaymentRequestDto with _$CreateDirectPaymentRequestDto {
required String? referenceAccount,
required int amount,
required Cluster cluster,
String? mintAddress,
@Default(false) bool durable,
}) = _CreateDirectPaymentRequestDto;

Expand Down
Loading

0 comments on commit a62f380

Please sign in to comment.