Skip to content

Commit

Permalink
feat: EWM-267 (#463)
Browse files Browse the repository at this point in the history 
* Update android sign

* Change appName to SparX Wallet

* Change app id

* pubspec.yaml update description

* money2_fixer

* Add main.dart

* Update deploy workflow

* Update deploy workflow if sections

* utils.dart remove unnecessary import

* Rename ios and android workflows

* Use fastlane provision

* DEPLOY_TARGET: ${{ inputs.deploy_target }}

* mesos deploy target

* echo "DEPLOY_TARGET is set to: $DEPLOY_TARGET"

* Update ios codesign

* Left only iPhone destination

* Add push notifications iOS

* Update ios displayed name

* FLAVOR_APP_NAME fix quotes

* firebase_app_distribution update app values

* EWM-267. Update browser main resources

* Fastlane ipa_path change to SparX Wallet.ipa

* Add log ipa name in store build script

* Remove flag DEPLOY_TARGET

* store-ipa.sh remove log folder

* fastlane rename ipa to SparX: TVM Wallet

* fix analyze result

* After merge

* chore: update sign (#457)

* Update android sign

* Change appName to SparX Wallet

* Change app id

* pubspec.yaml update description

* money2_fixer

* Add main.dart

* Update deploy workflow

* Update deploy workflow if sections

* utils.dart remove unnecessary import

* Rename ios and android workflows

* Use fastlane provision

* DEPLOY_TARGET: ${{ inputs.deploy_target }}

* mesos deploy target

* echo "DEPLOY_TARGET is set to: $DEPLOY_TARGET"

* Update ios codesign

* Left only iPhone destination

* Add push notifications iOS

* Update ios displayed name

* FLAVOR_APP_NAME fix quotes

* firebase_app_distribution update app values

* Fastlane ipa_path change to SparX Wallet.ipa

* Add log ipa name in store build script

* Remove flag DEPLOY_TARGET

* fix analyze result

* After merge

* chore: update android sign (#464)

* Update android sign

* Change appName to SparX Wallet

* Change app id

* pubspec.yaml update description

* money2_fixer

* Add main.dart

* Update deploy workflow

* Update deploy workflow if sections

* utils.dart remove unnecessary import

* Rename ios and android workflows

* Use fastlane provision

* DEPLOY_TARGET: ${{ inputs.deploy_target }}

* mesos deploy target

* echo "DEPLOY_TARGET is set to: $DEPLOY_TARGET"

* Update ios codesign

* Left only iPhone destination

* Add push notifications iOS

* Update ios displayed name

* FLAVOR_APP_NAME fix quotes

* firebase_app_distribution update app values

* Fastlane ipa_path change to SparX Wallet.ipa

* Add log ipa name in store build script

* Remove flag DEPLOY_TARGET

* fix analyze result

* After merge

* After merge

* After merge

* money2_fixer

* Update deploy workflow

* Rename ios and android workflows

* Use fastlane provision

* DEPLOY_TARGET: ${{ inputs.deploy_target }}

* mesos deploy target

* echo "DEPLOY_TARGET is set to: $DEPLOY_TARGET"

* Update ios codesign

* Left only iPhone destination

* Add push notifications iOS

* Update ios displayed name

* FLAVOR_APP_NAME fix quotes

* EWM-267. Update browser main resources

* Remove flag DEPLOY_TARGET

* store-ipa.sh remove log folder

* fastlane rename ipa to SparX: TVM Wallet

* fix analyze result

* After merge

* money2_fixer

* Update deploy workflow

* Rename ios and android workflows

* Use fastlane provision

* DEPLOY_TARGET: ${{ inputs.deploy_target }}

* mesos deploy target

* echo "DEPLOY_TARGET is set to: $DEPLOY_TARGET"

* Update ios codesign

* Left only iPhone destination

* Add push notifications iOS

* Update ios displayed name

* FLAVOR_APP_NAME fix quotes

* EWM-267. Update browser main resources

* Remove flag DEPLOY_TARGET

* store-ipa.sh remove log folder

* fastlane rename ipa to SparX: TVM Wallet

* fix analyze result

* After merge

* money2_fixer

* Update deploy workflow

* Rename ios and android workflows

* DEPLOY_TARGET: ${{ inputs.deploy_target }}

* mesos deploy target

* echo "DEPLOY_TARGET is set to: $DEPLOY_TARGET"

* Update ios codesign

* Remove flag DEPLOY_TARGET

* fix analyze result

* After merge
  • Loading branch information
@knightsforce
knightsforce authored Aug 31, 2024
1 parent 45891af commit 3c188cd
Show file tree
Hide file tree
Showing 11 changed files with 109 additions and 124 deletions.
7 changes: 7 additions & 0 deletions assets/images/logo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 5 additions & 21 deletions assets/translations/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,24 +224,6 @@
"browserBookmarks": "Bookmarks",
"browserPopularResources": "Popular Resources",
"browserSeeAll": "See All",
"browserLink01Title": "Flatqube DEX",
"browserLink01Url": "https://flatqube.io",
"browserLink02Title": "Octus Bridge",
"browserLink02Url": "https://octusbridge.io",
"browserLink03Title": "Tokstock. NFT Marketplace",
"browserLink03Url": "https://tokstock.io",
"browserLink04Title": "Evername. Domain service",
"browserLink04Url": "https://evername.io",
"browserLink05Title": "Qamon. Secure email",
"browserLink05Url": "https://qamon.io",
"browserLink06Title": "Gravix. Decentralized perpetuals exchange",
"browserLink06Url": "https://gravix.io",
"browserCardLink01Title": "Staking",
"browserCardLink01Description": "Introducing stEVER and the new era of liquid staking on EVER DAO",
"browserCardLink01Url": "https://broxus.medium.com/introducing-stever-and-the-new-era-of-liquid-staking-on-ever-dao-a52e77f48a85",
"browserCardLink02Title": "Farming",
"browserCardLink02Description": "Lend your assets and earn up to 200% APR on liquidity farming",
"browserCardLink02Url": "https://docs.flatqube.io/use/farming/new-farming/how-to",
"browserBookmarkSettings": "Settings of the link",
"browserBookmarkShare": "Share",
"browserBookmarkRename": "Rename",
Expand Down Expand Up @@ -280,6 +262,7 @@
"oldWord": "Old",
"feesWord": "Fees",
"feesWithData": "Fees ~{}",
"startExploring": "Start exploring",
"statusWord": "Status",
"leftForConfirmation": "Left for confirmation {} • Signed {} of {}",
"transactionStatusWaitingConfirmation": "Waiting for confirmation",
Expand Down Expand Up @@ -507,6 +490,7 @@
"addCommentHint": "Will be visible for everyone",
"networkFee": "Network fee",
"password": "Password",
"exploreConnectFavoriteSites": "Explore and connect to your favorite sites in\njust a few taps",
"transactionExpired": "Expired",
"transactionCompleted": "Completed",
"received": "Received",
Expand All @@ -522,9 +506,9 @@
"approximatelySign": "~",
"currentBalanceLabel": "Current balance",
"untrastedTokenWarning": "This token is not published in the official assets repository. Add it with caution if you trust the source.",
"phishingExplicitWarning":"Token has the symbol from the trusted list but a different root contract address. Be careful: it may be a phishing attempt.",
"phishingSameSymbolWarning":"You already have a token with the same symbol. Be careful: it may be a phishing attempt.",
"phishingSuggestionWarning":"You have already added a token with the same symbol before, however the new one is in the official assets repository. This may be a new version and you might consider deleting the previous one.",
"phishingExplicitWarning": "Token has the symbol from the trusted list but a different root contract address. Be careful: it may be a phishing attempt.",
"phishingSameSymbolWarning": "You already have a token with the same symbol. Be careful: it may be a phishing attempt.",
"phishingSuggestionWarning": "You have already added a token with the same symbol before, however the new one is in the official assets repository. This may be a new version and you might consider deleting the previous one.",
"expand": "Expand",
"collapse": "Collapse",
"metadata": "Metadata",
Expand Down
20 changes: 2 additions & 18 deletions assets/translations/ko.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,24 +224,6 @@
"browserBookmarks": "Bookmarks",
"browserPopularResources": "Popular Resources",
"browserSeeAll": "See All",
"browserLink01Title": "Flatqube DEX",
"browserLink01Url": "https://flatqube.io",
"browserLink02Title": "Octus Bridge",
"browserLink02Url": "https://octusbridge.io",
"browserLink03Title": "Tokstock. NFT Marketplace",
"browserLink03Url": "https://tokstock.io",
"browserLink04Title": "Evername. Domain service",
"browserLink04Url": "https://evername.io",
"browserLink05Title": "Qamon. Secure email",
"browserLink05Url": "https://qamon.io",
"browserLink06Title": "Gravix. Decentralized perpetuals exchange",
"browserLink06Url": "https://gravix.io",
"browserCardLink01Title": "Staking",
"browserCardLink01Description": "Introducing stEVER and the new era of liquid staking on EVER DAO",
"browserCardLink01Url": "https://broxus.medium.com/introducing-stever-and-the-new-era-of-liquid-staking-on-ever-dao-a52e77f48a85",
"browserCardLink02Title": "Farming",
"browserCardLink02Description": "Lend your assets and earn up to 200% APR on liquidity farming",
"browserCardLink02Url": "https://docs.flatqube.io/use/farming/new-farming/how-to",
"browserBookmarkSettings": "Settings of the link",
"browserBookmarkShare": "Share",
"browserBookmarkRename": "Rename",
Expand Down Expand Up @@ -280,6 +262,7 @@
"oldWord": "Old",
"feesWord": "Fees",
"feesWithData": "Fees ~{}",
"startExploring": "Start exploring",
"statusWord": "Status",
"leftForConfirmation": "Left for confirmation {} • Signed {} of {}",
"transactionStatusWaitingConfirmation": "Waiting for confirmation",
Expand Down Expand Up @@ -507,6 +490,7 @@
"addCommentHint": "Will be visible for everyone",
"networkFee": "Network fee",
"password": "Password",
"exploreConnectFavoriteSites": "Explore and connect to your favorite sites in\njust a few taps",
"transactionExpired": "Expired",
"transactionCompleted": "Completed",
"received": "Received",
Expand Down
4 changes: 2 additions & 2 deletions ios/fastlane/Fastfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ platform :ios do
key_filepath: "fastlane/AuthKey_L4N29B6Z42.p8",
)
upload_to_testflight(
ipa: "../build/ios/ipa/SparX Wallet.ipa",
ipa: "../build/ios/ipa/SparX: TVM Wallet.ipa",
skip_waiting_for_build_processing: true,
api_key: api_key,
changelog: "#{options[:changelog_string]}"
Expand All @@ -38,7 +38,7 @@ platform :ios do
firebase_app_distribution(
app: "1:1017783238389:ios:a8de9ade8f221b782e4fbc",
groups: "qa",
ipa_path: "../build/ios/ipa/SparX Wallet.ipa",
ipa_path: "../build/ios/ipa/SparX: TVM Wallet.ipa",
service_credentials_file: "../fastlane/FirebaseADKey.json",
release_notes_file: "../fastlane/changelog.txt",
)
Expand Down
76 changes: 68 additions & 8 deletions lib/feature/browser/browser_tabs_view/browser_start_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,24 +62,42 @@ class _BrowserStartViewState extends State<BrowserStartView> {
_saveScreenshot();
}

final slivers = searchText.isEmpty
? [
late List<Widget> slivers;

final isAllEmpty = bookmarkItems.isEmpty &&
_predefinedItems.isEmpty &&
_predefinedCards.isEmpty;

if (searchText.isEmpty) {
if (isAllEmpty) {
slivers = [
const SliverFillRemaining(
child: _EmptyBody(),
),
];
} else {
slivers = [
if (bookmarkItems.isNotEmpty)
..._sectionBuilder(
title: LocaleKeys.browserBookmarks.tr(),
items: bookmarkItems,
buttonText: LocaleKeys.browserSeeAll.tr(),
buttonOnPressed: _onSeeAllPressed,
),
if (_predefinedItems.isNotEmpty)
..._sectionBuilder(
title: LocaleKeys.browserPopularResources.tr(),
items: _predefinedItems,
),
..._cardsBuilder(),
]
: _searchResultBuilder(
items: [...bookmarkItems, ..._predefinedItems],
searchText: searchText,
);
if (_predefinedCards.isNotEmpty) ..._cardsBuilder(),
];
}
} else {
slivers = _searchResultBuilder(
items: [...bookmarkItems, ..._predefinedItems],
searchText: searchText,
);
}

return RepaintBoundary(
key: _globalKey,
Expand Down Expand Up @@ -430,3 +448,45 @@ class _KeyboardPadding extends StatelessWidget {
);
}
}

class _EmptyBody extends StatelessWidget {
const _EmptyBody();

@override
Widget build(BuildContext context) {
final theme = context.themeStyleV2;

return Padding(
padding: const EdgeInsets.symmetric(
horizontal: DimensSizeV2.d16,
),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
CommonIconWidget.svg(
svg: Assets.images.logo.path,
size: DimensSizeV2.d160,
),
Padding(
padding: const EdgeInsets.only(
top: DimensSizeV2.d16,
bottom: DimensSizeV2.d8,
),
child: Text(
LocaleKeys.startExploring.tr(),
style: theme.textStyles.headingMedium,
textAlign: TextAlign.center,
),
),
Text(
LocaleKeys.exploreConnectFavoriteSites.tr(),
style: theme.textStyles.paragraphMedium.copyWith(
color: theme.colors.content1,
),
textAlign: TextAlign.center,
),
],
),
);
}
}
65 changes: 17 additions & 48 deletions lib/feature/browser/browser_tabs_view/predefined_items.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,64 +10,33 @@ class BrowserCard {
required this.url,
required this.imagePath,
});

final String title;
final String description;
final Uri url;
final String imagePath;
}

// TODO(knightforce): temporarily hiding
List<BrowserBookmarkItem> predefinedItems() => [
BrowserBookmarkItem(
id: '',
title: LocaleKeys.browserLink01Title.tr(),
url: Uri.parse(LocaleKeys.browserLink01Url.tr()),
sortingOrder: 6,
),
BrowserBookmarkItem(
id: '',
title: LocaleKeys.browserLink02Title.tr(),
url: Uri.parse(LocaleKeys.browserLink02Url.tr()),
sortingOrder: 5,
),
BrowserBookmarkItem(
id: '',
title: LocaleKeys.browserLink03Title.tr(),
url: Uri.parse(LocaleKeys.browserLink03Url.tr()),
sortingOrder: 4,
),
BrowserBookmarkItem(
id: '',
title: LocaleKeys.browserLink04Title.tr(),
url: Uri.parse(LocaleKeys.browserLink04Url.tr()),
sortingOrder: 3,
),
BrowserBookmarkItem(
id: '',
title: LocaleKeys.browserLink05Title.tr(),
url: Uri.parse(LocaleKeys.browserLink05Url.tr()),
sortingOrder: 2,
),
BrowserBookmarkItem(
id: '',
title: LocaleKeys.browserLink06Title.tr(),
url: Uri.parse(LocaleKeys.browserLink06Url.tr()),
sortingOrder: 1,
),
// Example:
// BrowserBookmarkItem(
// id: 'temp',
// title: LocaleKeys.temp.tr(),
// url: Uri.parse(LocaleKeys.tempUrl.tr()),
// sortingOrder: 1,
// ),
]..sort(
(a, b) => (b.sortingOrder - a.sortingOrder).sign.toInt(),
);

// TODO(knightforce): temporarily hiding
List<BrowserCard> predefinedCards() => [
BrowserCard(
title: LocaleKeys.browserCardLink01Title.tr(),
description: LocaleKeys.browserCardLink01Description.tr(),
url: Uri.parse(LocaleKeys.browserCardLink01Url.tr()),
imagePath: Assets.images.browserCard01.path,
),
BrowserCard(
title: LocaleKeys.browserCardLink02Title.tr(),
description: LocaleKeys.browserCardLink02Description.tr(),
url: Uri.parse(LocaleKeys.browserCardLink02Url.tr()),
imagePath: Assets.images.browserCard02.path,
),
// Example:
// BrowserCard(
// title: LocaleKeys.temp.tr(),
// description: LocaleKeys.temp.tr(),
// url: Uri.parse(LocaleKeys.tempUrl.tr()),
// imagePath: Assets.images.temp.path,
// ),
];
Empty file added lib/feature/wallet/cubit/wallet_cubit.freezed.dart
View file
Empty file.
4 changes: 4 additions & 0 deletions lib/generated/assets.gen.dart
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 2 additions & 18 deletions lib/generated/locale_keys.g.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,24 +226,6 @@ abstract class LocaleKeys {
static const browserBookmarks = 'browserBookmarks';
static const browserPopularResources = 'browserPopularResources';
static const browserSeeAll = 'browserSeeAll';
static const browserLink01Title = 'browserLink01Title';
static const browserLink01Url = 'browserLink01Url';
static const browserLink02Title = 'browserLink02Title';
static const browserLink02Url = 'browserLink02Url';
static const browserLink03Title = 'browserLink03Title';
static const browserLink03Url = 'browserLink03Url';
static const browserLink04Title = 'browserLink04Title';
static const browserLink04Url = 'browserLink04Url';
static const browserLink05Title = 'browserLink05Title';
static const browserLink05Url = 'browserLink05Url';
static const browserLink06Title = 'browserLink06Title';
static const browserLink06Url = 'browserLink06Url';
static const browserCardLink01Title = 'browserCardLink01Title';
static const browserCardLink01Description = 'browserCardLink01Description';
static const browserCardLink01Url = 'browserCardLink01Url';
static const browserCardLink02Title = 'browserCardLink02Title';
static const browserCardLink02Description = 'browserCardLink02Description';
static const browserCardLink02Url = 'browserCardLink02Url';
static const browserBookmarkSettings = 'browserBookmarkSettings';
static const browserBookmarkShare = 'browserBookmarkShare';
static const browserBookmarkRename = 'browserBookmarkRename';
Expand Down Expand Up @@ -284,6 +266,7 @@ abstract class LocaleKeys {
static const oldWord = 'oldWord';
static const feesWord = 'feesWord';
static const feesWithData = 'feesWithData';
static const startExploring = 'startExploring';
static const statusWord = 'statusWord';
static const leftForConfirmation = 'leftForConfirmation';
static const transactionStatusWaitingConfirmation =
Expand Down Expand Up @@ -517,6 +500,7 @@ abstract class LocaleKeys {
static const addCommentHint = 'addCommentHint';
static const networkFee = 'networkFee';
static const password = 'password';
static const exploreConnectFavoriteSites = 'exploreConnectFavoriteSites';
static const transactionExpired = 'transactionExpired';
static const transactionCompleted = 'transactionCompleted';
static const received = 'received';
Expand Down
1 change: 1 addition & 0 deletions packages/ui_components_lib/lib/v2/dimens_v2.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class DimensSizeV2 {
static const double d128 = 128;
static const double d132 = 132;
static const double d148 = 148;
static const double d160 = 160;
static const double d190 = 190;
static const double d256 = 256;
}
Expand Down
10 changes: 1 addition & 9 deletions scripts/build-binary/store-ipa.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,4 @@ set -o pipefail

echo "🛒🏗️🍏 Build IPA for STORE"

flutter build ipa --release --export-options-plist ios/export_options_appstore.plist $BUILD_NUMBER_STRING --flavor production --target lib/main_production.dart --dart-define=SENTRY_DSN=$SENTRY_DSN

IPA_PATH=$(find build/ios/ipa -name "*.ipa" | head -n 1)
if [ -f "$IPA_PATH" ]; then
echo "Created IPA file: $IPA_PATH"
else
echo "Error: IPA file not found!"
exit 1
fi
flutter build ipa --release --export-options-plist ios/export_options_appstore.plist $BUILD_NUMBER_STRING --flavor production --target lib/main_production.dart --dart-define=SENTRY_DSN=$SENTRY_DSN

0 comments on commit 3c188cd

Please sign in to comment.