Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cw 522 enable on off ramp activities to show on transaction history screen #1303

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions lib/buy/buy_exception.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import 'package:flutter/foundation.dart';
import 'package:cake_wallet/buy/buy_provider_description.dart';

class BuyException implements Exception {
BuyException({required this.title, required this.content});

Expand Down
5 changes: 5 additions & 0 deletions lib/buy/buy_provider.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:cake_wallet/buy/buy_amount.dart';
import 'package:cake_wallet/buy/order.dart';
import 'package:cake_wallet/entities/provider_types.dart';
import 'package:cw_core/wallet_base.dart';
import 'package:flutter/material.dart';

Expand All @@ -20,6 +21,10 @@ abstract class BuyProvider {

String get darkIcon;

ProviderType get providerType;

String get trackUrl;

@override
String toString() => title;

Expand Down
21 changes: 0 additions & 21 deletions lib/buy/buy_provider_description.dart

This file was deleted.

11 changes: 9 additions & 2 deletions lib/buy/dfx/dfx_buy_provider.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'dart:convert';

import 'package:cake_wallet/buy/buy_provider.dart';
import 'package:cake_wallet/entities/provider_types.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
Expand All @@ -23,7 +24,10 @@ class DFXBuyProvider extends BuyProvider {
static const walletName = 'CakeWallet';

@override
String get title => 'DFX Connect';
ProviderType get providerType => ProviderType.dfx;

@override
String get title => providerType.title;

@override
String get providerDescription => S.current.dfx_option_description;
Expand All @@ -34,6 +38,9 @@ class DFXBuyProvider extends BuyProvider {
@override
String get darkIcon => 'assets/images/dfx_dark.png';

@override
String get trackUrl => 'https://dash.dfx.swiss/track/';

String get assetOut {
switch (wallet.type) {
case WalletType.bitcoin:
Expand Down Expand Up @@ -186,7 +193,7 @@ class DFXBuyProvider extends BuyProvider {

if (await canLaunchUrl(uri)) {
if (DeviceInfo.instance.isMobile) {
Navigator.of(context).pushNamed(Routes.webViewPage, arguments: [title, uri]);
Navigator.of(context).pushNamed(Routes.webViewPage, arguments: [uri, providerType]);
} else {
await launchUrl(uri, mode: LaunchMode.externalApplication);
}
Expand Down
25 changes: 0 additions & 25 deletions lib/buy/get_buy_provider_icon.dart

This file was deleted.

23 changes: 16 additions & 7 deletions lib/buy/moonpay/moonpay_provider.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'dart:convert';
import 'package:cake_wallet/entities/provider_types.dart';
import 'package:cake_wallet/palette.dart';
import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
Expand All @@ -12,7 +13,6 @@ import 'package:flutter/material.dart';
import 'package:http/http.dart';
import 'package:cake_wallet/buy/buy_amount.dart';
import 'package:cake_wallet/buy/buy_provider.dart';
import 'package:cake_wallet/buy/buy_provider_description.dart';
import 'package:cake_wallet/buy/order.dart';
import 'package:cw_core/wallet_base.dart';
import 'package:cw_core/wallet_type.dart';
Expand All @@ -36,18 +36,24 @@ class MoonPaySellProvider extends BuyProvider {
static const _baseProductUrl = 'sell.moonpay.com';

@override
String get providerDescription =>
'MoonPay offers a fast and simple way to buy and sell cryptocurrencies';
ProviderType get providerType => ProviderType.moonpaySell;

@override
String get title => 'MoonPay';
String get title => providerType.title;

@override
String get providerDescription =>
'MoonPay offers a fast and simple way to buy and sell cryptocurrencies';

@override
String get lightIcon => 'assets/images/moonpay_light.png';

@override
String get darkIcon => 'assets/images/moonpay_dark.png';

@override
String get trackUrl => '';

static String themeToMoonPayTheme(ThemeBase theme) {
switch (theme.type) {
case ThemeType.bright:
Expand Down Expand Up @@ -113,7 +119,7 @@ class MoonPaySellProvider extends BuyProvider {

if (await canLaunchUrl(uri)) {
if (DeviceInfo.instance.isMobile) {
Navigator.of(context).pushNamed(Routes.webViewPage, arguments: ['MoonPay', uri]);
Navigator.of(context).pushNamed(Routes.webViewPage, arguments: [uri]);
} else {
await launchUrl(uri, mode: LaunchMode.externalApplication);
}
Expand Down Expand Up @@ -152,7 +158,10 @@ class MoonPayBuyProvider extends BuyProvider {
static const _secretKey = secrets.moonPaySecretKey;

@override
String get title => 'MoonPay';
ProviderType get providerType => ProviderType.moonpaySell;

@override
String get title => providerType.name;

@override
String get providerDescription =>
Expand Down Expand Up @@ -247,7 +256,7 @@ class MoonPayBuyProvider extends BuyProvider {

return Order(
id: id,
provider: BuyProviderDescription.moonPay,
provider: ProviderType.moonpaySell,
transferId: id,
state: state,
createdAt: createdAt,
Expand Down
62 changes: 55 additions & 7 deletions lib/buy/onramper/onramper_buy_provider.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:cake_wallet/.secrets.g.dart' as secrets;
import 'package:cake_wallet/buy/buy_provider.dart';
import 'package:cake_wallet/entities/provider_types.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/store/settings_store.dart';
Expand All @@ -9,18 +10,52 @@ import 'package:cw_core/crypto_currency.dart';
import 'package:cw_core/wallet_base.dart';
import 'package:flutter/material.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:collection/collection.dart';

enum OnRamperPartner {
guardarian,
paybis,
utorg,
alchemypay,
sardine
}

extension Name on OnRamperPartner {
String get name {
switch (this) {
case OnRamperPartner.guardarian:
return 'Guardarian';
case OnRamperPartner.paybis:
return 'Paybis';
case OnRamperPartner.utorg:
return 'Utorg';
case OnRamperPartner.alchemypay:
return 'Alchemy Pay';
case OnRamperPartner.sardine:
return 'Sardine';
}
}
}

class OnRamperBuyProvider extends BuyProvider {
OnRamperBuyProvider(this._settingsStore,
{required WalletBase wallet, bool isTestEnvironment = false})
OnRamperBuyProvider({this.settingsStore,this.partner,
required WalletBase wallet, bool isTestEnvironment = false})
: super(wallet: wallet, isTestEnvironment: isTestEnvironment);

static const _baseUrl = 'buy.onramper.com';

final SettingsStore _settingsStore;
static OnRamperPartner? fromRaw(int? raw) =>
OnRamperPartner.values.firstWhereOrNull((e) => e.index == raw);

final SettingsStore? settingsStore;

OnRamperPartner? partner;

@override
String get title => 'Onramper';
ProviderType get providerType => ProviderType.onramper;

@override
String get title => providerType.title;

@override
String get providerDescription => S.current.onramper_option_description;
Expand All @@ -31,6 +66,17 @@ class OnRamperBuyProvider extends BuyProvider {
@override
String get darkIcon => 'assets/images/onramper_dark.png';

String get trackUrl {
switch (partner) {
case OnRamperPartner.guardarian:
return "https://payments.guardarian.com/checkout?tid=";
case OnRamperPartner.paybis:
return "https://widget.paybis.com/?requestId=";
default:
return '';
}
}

String get _apiKey => secrets.onramperApiKey;

String get _normalizeCryptoCurrency {
Expand Down Expand Up @@ -69,8 +115,10 @@ class OnRamperBuyProvider extends BuyProvider {
containerColor = getColorStr(Theme.of(context).colorScheme.background);
cardColor = getColorStr(Theme.of(context).cardColor);

if (_settingsStore.currentTheme.title == S.current.high_contrast_theme) {
cardColor = getColorStr(Colors.white);
if (settingsStore != null) {
if (settingsStore!.currentTheme.title == S.current.high_contrast_theme) {
cardColor = getColorStr(Colors.white);
}
}

final networkName =
Expand All @@ -96,7 +144,7 @@ class OnRamperBuyProvider extends BuyProvider {
final uri = requestOnramperUrl(context, isBuyAction);
if (DeviceInfo.instance.isMobile) {
Navigator.of(context)
.pushNamed(Routes.webViewPage, arguments: [title, uri]);
.pushNamed(Routes.webViewPage, arguments:[uri, providerType, isBuyAction]);
} else {
await launchUrl(uri);
}
Expand Down