diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4cdc24826..f2e2e4790 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
           sentry-cli --auth-token ${{secrets.sentry_auth_token}} --url ${{secrets.sentry_url}} releases --org ${{secrets.sentry_org}} new $SENTRY_RELEASE --project ${{secrets.sentry_project}}
           sentry-cli --auth-token ${{secrets.sentry_auth_token}} --url ${{secrets.sentry_url}} releases --org ${{secrets.sentry_org}} set-commits --auto $SENTRY_RELEASE
 
-          flutter build web --web-renderer html --release --dart-define=SENTRY_RELEASE=$SENTRY_RELEASE --source-maps
+          flutter build web --dart-define=SENTRY_RELEASE=$SENTRY_RELEASE --source-maps
 
           sed -i '/index.html/d' build/web/flutter_service_worker.js
 
@@ -69,22 +69,9 @@ jobs:
 
           sentry-cli --auth-token ${{secrets.sentry_auth_token}} --url ${{secrets.sentry_url}} releases --org ${{secrets.sentry_org}} finalize $SENTRY_RELEASE
           sentry-cli --auth-token ${{secrets.sentry_auth_token}} --url ${{secrets.sentry_url}} releases --org ${{secrets.sentry_org}} deploys $SENTRY_RELEASE new -e production          
-      - name: Build WASM App
-        run: |
-          flutter build web --web-renderer canvaskit --release
-
-          git clone https://${{secrets.commit_secret}}@github.com/invoiceninja/invoiceninja.git invoiceninja_wasm
-          cd invoiceninja_wasm
-
-          git checkout v5-develop
-          cp ../build/web/main.dart.js ./public/main.wasm.dart.js
-          git add .
-          git commit -m 'Admin Portal - WASM'
-          git push
-          cd ..      
       - name: Build Profile App
         run: |
-          flutter build web --web-renderer html --profile
+          flutter build web --profile
 
           git clone https://${{secrets.commit_secret}}@github.com/invoiceninja/invoiceninja.git invoiceninja_profile
           cd invoiceninja_profile
@@ -143,7 +130,7 @@ jobs:
           echo ";" >> lib/flutter_version.dart
       - name: Build Hosted App
         run: |
-          flutter build web --web-renderer html --release
+          flutter build web
 
           sed -i '/index.html/d' build/web/flutter_service_worker.js
 
@@ -190,7 +177,7 @@ jobs:
           echo ";" >> lib/flutter_version.dart
       - name: Build Hosted App
         run: |
-          flutter build web --web-renderer html --release
+          flutter build web
 
           sed -i '/index.html/d' build/web/flutter_service_worker.js
 
diff --git a/lib/constants.dart b/lib/constants.dart
index af9f306ce..d116eefa9 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -249,6 +249,8 @@ const String kGatewayTypeBancontact = '12';
 const String kGatewayTypeIDeal = '13';
 const String kGatewayTypeGiropay = '14';
 const String kGatewayTypePrzelewy24 = '15';
+const String kGatewayTypeFPX = '16';
+const String kGatewayTypeEPS = '17';
 
 const kGatewayTypes = {
   kGatewayTypeCreditCard: 'credit_card',
@@ -268,7 +270,6 @@ const kGatewayTypes = {
   kGatewayTypePrzelewy24: 'przelewy24',
   kGatewayTypeFPX: 'fpx',
   kGatewayTypeEPS: 'eps',
-
 };
 
 const String kNotificationChannelEmail = 'email';
diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart
index 2600d535b..87f2df7a3 100644
--- a/lib/utils/i18n.dart
+++ b/lib/utils/i18n.dart
@@ -18,9 +18,9 @@ mixin LocalizationsProvider on LocaleCodeAware {
       'view_statement': 'View Statement',
       'sepa': 'SEPA',
       'ideal': 'iDEAL',
-	  'przelewy24': 'Przelewy24',
-	    'eps' : 'EPS',
-	    'fpx' : 'FPX',
+      'przelewy24': 'Przelewy24',
+      'eps': 'EPS',
+      'fpx': 'FPX',
       'update_all_records': 'Update all records',
       'system': 'System',
       'set_default_company': 'Set Default Company',
@@ -62681,12 +62681,14 @@ mixin LocalizationsProvider on LocaleCodeAware {
 
   String get sepa =>
       _localizedValues[localeCode]['sepa'] ?? _localizedValues['en']['sepa'];
-	  
+
   String get giropay =>
-      _localizedValues[localeCode]['giropay'] ?? _localizedValues['en']['giropay'];
-	  
+      _localizedValues[localeCode]['giropay'] ??
+      _localizedValues['en']['giropay'];
+
   String get przelewy24 =>
-      _localizedValues[localeCode]['przelewy24'] ?? _localizedValues['en']['przelewy24'];
+      _localizedValues[localeCode]['przelewy24'] ??
+      _localizedValues['en']['przelewy24'];
 
   String get eps =>
       _localizedValues[localeCode]['eps'] ?? _localizedValues['en']['eps'];
@@ -62695,7 +62697,8 @@ mixin LocalizationsProvider on LocaleCodeAware {
       _localizedValues[localeCode]['fpx'] ?? _localizedValues['en']['fpx'];
 
   String get bancontact =>
-      _localizedValues[localeCode]['bancontact'] ?? _localizedValues['en']['bancontact'];
+      _localizedValues[localeCode]['bancontact'] ??
+      _localizedValues['en']['bancontact'];
 
   String get viewStatement =>
       _localizedValues[localeCode]['view_statement'] ??