Skip to content

Commit 547820d

Browse files
JasonvdbJasonvdb
committed
Merge branch 'master' into release-1.1.2
2 parents 43e8fc8 + d3cd2a1 commit 547820d

File tree

11 files changed

+30
-33
lines changed

11 files changed

+30
-33
lines changed

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ android {
8383
applicationId "to.bitkit"
8484
minSdkVersion rootProject.ext.minSdkVersion
8585
targetSdkVersion rootProject.ext.targetSdkVersion
86-
versionCode 154
87-
versionName "1.1.2"
86+
versionCode 153
87+
versionName "1.1.1"
8888
testBuildType System.getProperty('testBuildType', 'debug')
8989
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
9090
}

‎ios/bitkit.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -238,14 +238,10 @@
238238
inputFileListPaths = (
239239
"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-input-files.xcfilelist",
240240
);
241-
inputPaths = (
242-
);
243241
name = "[CP] Embed Pods Frameworks";
244242
outputFileListPaths = (
245243
"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks-${CONFIGURATION}-output-files.xcfilelist",
246244
);
247-
outputPaths = (
248-
);
249245
runOnlyForDeploymentPostprocessing = 0;
250246
shellPath = /bin/sh;
251247
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks.sh\"\n";
@@ -281,14 +277,10 @@
281277
inputFileListPaths = (
282278
"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-input-files.xcfilelist",
283279
);
284-
inputPaths = (
285-
);
286280
name = "[CP] Copy Pods Resources";
287281
outputFileListPaths = (
288282
"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-output-files.xcfilelist",
289283
);
290-
outputPaths = (
291-
);
292284
runOnlyForDeploymentPostprocessing = 0;
293285
shellPath = /bin/sh;
294286
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources.sh\"\n";
@@ -315,7 +307,7 @@
315307
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange;
316308
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
317309
CLANG_ENABLE_MODULES = YES;
318-
CURRENT_PROJECT_VERSION = 154;
310+
CURRENT_PROJECT_VERSION = 153;
319311
DEVELOPMENT_TEAM = KYH47R284B;
320312
ENABLE_BITCODE = NO;
321313
INFOPLIST_FILE = bitkit/Info.plist;
@@ -326,7 +318,7 @@
326318
"$(inherited)",
327319
"@executable_path/Frameworks",
328320
);
329-
MARKETING_VERSION = 1.1.2;
321+
MARKETING_VERSION = 1.1.1;
330322
OTHER_LDFLAGS = (
331323
"$(inherited)",
332324
"-ObjC",
@@ -347,7 +339,7 @@
347339
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange;
348340
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
349341
CLANG_ENABLE_MODULES = YES;
350-
CURRENT_PROJECT_VERSION = 154;
342+
CURRENT_PROJECT_VERSION = 153;
351343
DEVELOPMENT_TEAM = KYH47R284B;
352344
ENABLE_BITCODE = NO;
353345
INFOPLIST_FILE = bitkit/Info.plist;
@@ -358,7 +350,7 @@
358350
"$(inherited)",
359351
"@executable_path/Frameworks",
360352
);
361-
MARKETING_VERSION = 1.1.2;
353+
MARKETING_VERSION = 1.1.1;
362354
OTHER_LDFLAGS = (
363355
"$(inherited)",
364356
"-ObjC",

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bitkit",
33
"author": "Synonym",
4-
"version": "1.1.2",
4+
"version": "1.1.1",
55
"scripts": {
66
"start": "react-native start --client-logs",
77
"android": "react-native run-android",

‎src/assets/icons/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ export const unifiedCircleIcon = (color = 'white'): string => `
328328
<svg viewBox="0 0 51 51"><rect width="50" height="50" y=".5" fill="#F40" rx="25"/><path fill="#B95CE8" d="M18.952 49.757 25 25.5l6.048-24.258c13.397 3.34 21.55 16.909 18.21 30.306-3.341 13.397-16.91 21.55-30.306 18.21Z"/><path fill="#fff" d="M34.322 22.248c.422-2.826-1.729-4.344-4.67-5.358l.954-3.827-2.33-.58-.928 3.726a95.447 95.447 0 0 0-1.867-.44l.935-3.75-2.327-.582-.955 3.827a78.014 78.014 0 0 1-1.488-.35l.002-.011-3.212-.802-.62 2.488s1.729.396 1.692.42c.944.236 1.114.86 1.085 1.356l-1.086 4.36c.065.017.149.04.242.078l-.246-.061-1.523 6.108c-.116.286-.409.717-1.068.553.024.034-1.694-.422-1.694-.422l-1.155 2.666 3.03.756c.564.141 1.117.289 1.661.428l-.963 3.872 2.326.58.955-3.83c.636.173 1.253.332 1.857.482l-.951 3.812 2.33.581.963-3.864c3.973.752 6.96.448 8.216-3.145 1.014-2.893-.05-4.562-2.14-5.65 1.522-.351 2.67-1.353 2.975-3.42ZM29 29.713c-.72 2.893-5.59 1.33-7.17.937l1.28-5.129c1.578.394 6.642 1.174 5.89 4.192Zm.72-7.507c-.657 2.632-4.71 1.295-6.026.967l1.16-4.651c1.315.328 5.55.94 4.866 3.684Z"/></svg>`;
329329

330330
export const unitBitcoinIcon = (color = 'white'): string => `
331-
<svg fill="none" viewBox="0 0 32 32"><rect width="32" height="32" fill="${color}" fill-opacity=".1" rx="16"/><path fill="${color}" d="M13.668 10.97V9h.873v1.97h-.873Zm1.99 0V9h.887v1.97h-.888ZM13.668 23v-1.97h.873V23h-.873Zm1.99 0v-1.97h.887V23h-.888ZM11.5 21.602V10.398h4.41c.808 0 1.483.123 2.026.369.543.245.95.584 1.22 1.015.277.431.415.927.415 1.489 0 .436-.089.82-.266 1.15a2.24 2.24 0 0 1-.71.812c-.296.21-.637.358-1.021.444v.113a2.513 2.513 0 0 1 2.078 1.293c.232.396.348.87.348 1.42 0 .592-.145 1.124-.436 1.595-.287.466-.71.834-1.273 1.105-.562.266-1.258.399-2.086.399H11.5Zm2.323-1.933h1.909c.646 0 1.117-.128 1.413-.383.3-.256.45-.594.45-1.015a1.508 1.508 0 0 0-.843-1.384c-.27-.135-.594-.203-.969-.203h-1.96v2.985Zm0-4.579h1.731c.32 0 .604-.057.85-.173.252-.115.45-.278.593-.488.143-.216.214-.472.214-.767 0-.401-.14-.725-.422-.97-.276-.25-.673-.376-1.19-.376h-1.776v2.774Z"/></svg>`;
331+
<svg fill="none" viewBox="0 0 32 32"><rect width="32" height="32" fill="#fff" fill-opacity=".1" rx="16"/><path fill="${color}" d="M13.668 10.97V9h.873v1.97h-.873Zm1.99 0V9h.887v1.97h-.888ZM13.668 23v-1.97h.873V23h-.873Zm1.99 0v-1.97h.887V23h-.888ZM11.5 21.602V10.398h4.41c.808 0 1.483.123 2.026.369.543.245.95.584 1.22 1.015.277.431.415.927.415 1.489 0 .436-.089.82-.266 1.15a2.24 2.24 0 0 1-.71.812c-.296.21-.637.358-1.021.444v.113a2.513 2.513 0 0 1 2.078 1.293c.232.396.348.87.348 1.42 0 .592-.145 1.124-.436 1.595-.287.466-.71.834-1.273 1.105-.562.266-1.258.399-2.086.399H11.5Zm2.323-1.933h1.909c.646 0 1.117-.128 1.413-.383.3-.256.45-.594.45-1.015a1.508 1.508 0 0 0-.843-1.384c-.27-.135-.594-.203-.969-.203h-1.96v2.985Zm0-4.579h1.731c.32 0 .604-.057.85-.173.252-.115.45-.278.593-.488.143-.216.214-.472.214-.767 0-.401-.14-.725-.422-.97-.276-.25-.673-.376-1.19-.376h-1.776v2.774Z"/></svg>`;
332332

333333
export const unitFiatIcon = (color = 'white'): string => `
334334
<svg fill="none" viewBox="0 0 32 32"><rect width="32" height="32" fill="#fff" fill-opacity=".1" rx="16"/><g fill="${color}"><path d="M16 22a6 6 0 1 0 0-12 6 6 0 0 0 0 12z" opacity=".2"/><path fill-rule="evenodd" d="M16 10.5a5.5 5.5 0 1 0 0 11 5.5 5.5 0 0 0 0-11zM9.5 16a6.5 6.5 0 1 1 13 0 6.5 6.5 0 0 1-13 0z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M9.842 14a.5.5 0 0 1 .5-.5h11.316a.5.5 0 0 1 0 1H10.342a.5.5 0 0 1-.5-.5zM9.842 18a.5.5 0 0 1 .5-.5h11.316a.5.5 0 0 1 0 1H10.342a.5.5 0 0 1-.5-.5z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M14.692 12.068c-.42.98-.692 2.37-.692 3.932 0 1.561.272 2.951.692 3.932.21.491.448.857.686 1.092.237.234.446.315.622.315s.386-.081.622-.315c.238-.235.476-.6.686-1.092.42-.98.692-2.37.692-3.932 0-1.561-.272-2.951-.692-3.932-.21-.491-.448-.857-.686-1.092-.236-.234-.446-.315-.622-.315s-.386.081-.622.315c-.238.235-.476.6-.686 1.092zm-.016-1.804c.361-.357.81-.603 1.324-.603s.963.246 1.325.603c.36.356.66.845.902 1.41.485 1.133.773 2.663.773 4.326s-.288 3.193-.773 4.326c-.242.565-.543 1.054-.903 1.41-.361.357-.81.603-1.324.603s-.963-.246-1.325-.603c-.36-.356-.66-.845-.902-1.41C13.288 19.193 13 17.663 13 16s.288-3.193.773-4.326c.242-.565.543-1.054.902-1.41z" clip-rule="evenodd"/></g></svg>`;

‎src/assets/svgs/raw/unitBitcoin.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎src/components/AppStatus.tsx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,16 @@ import { ArrowsClockwiseIcon, PowerIcon, WarningIcon } from '../styles/icons';
1717
import { BodyMSB } from '../styles/text';
1818
import { IThemeColors } from '../styles/themes';
1919

20-
type Props = PressableProps & { showText?: boolean; showReady?: boolean };
20+
type Props = PressableProps & {
21+
showText?: boolean;
22+
showReady?: boolean;
23+
color?: keyof IThemeColors;
24+
};
2125

2226
const AppStatus = ({
2327
showText = false,
2428
showReady = false,
29+
color: overrideColor,
2530
style,
2631
testID,
2732
onPress,
@@ -99,7 +104,7 @@ const AppStatus = ({
99104
return 'red';
100105
};
101106

102-
const color = appStatusColor();
107+
const color = overrideColor || appStatusColor();
103108

104109
if (appStatus === 'ready' && !showReady) {
105110
return null;

‎src/components/widgets/CalculatorWidget.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ const CalculatorWidget = ({
113113
}}
114114
/>
115115
</View>
116-
<CaptionB color="gray1">BTC</CaptionB>
116+
<CaptionB color="gray1">BITCOIN</CaptionB>
117117
</ThemedView>
118118
<ThemedView style={styles.row} color="white06">
119119
<ThemedView style={styles.icon} color="white10">

‎src/components/widgets/FactsWidget.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { ReactElement } from 'react';
2+
import { useTranslation } from 'react-i18next';
23
import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
34

4-
import { useTranslation } from 'react-i18next';
55
import { TFactsWidgetOptions } from '../../store/types/widgets';
66
import { CaptionB, Title } from '../../styles/text';
77
import { getRandomFact } from '../../utils/widgets';

‎src/navigation/root/DrawerContent.tsx‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import { useTranslation } from 'react-i18next';
88
import { StyleSheet, View } from 'react-native';
99

1010
import AppStatus from '../../components/AppStatus';
11-
import GradientView from '../../components/GradientView';
1211
import { useAppSelector } from '../../hooks/redux';
1312
import { shopIntroSeenSelector } from '../../store/reselect/settings';
1413
import colors from '../../styles/colors';
14+
import { View as ThemedView } from '../../styles/components';
1515
import { Pressable } from '../../styles/components';
1616
import {
1717
ActivityIcon,
@@ -55,45 +55,45 @@ const DrawerContent = (props: DrawerContentComponentProps): ReactElement => {
5555
const shopIntroSeen = useAppSelector(shopIntroSeenSelector);
5656

5757
return (
58-
<GradientView style={[styles.drawer]}>
58+
<ThemedView style={[styles.drawer]} color="brand">
5959
<DrawerContentScrollView
6060
contentContainerStyle={styles.drawerContent}
6161
bounces={false}
6262
{...props}>
6363
<DrawerItem
64-
icon={<CoinsIcon color="brand" width={24} height={24} />}
64+
icon={<CoinsIcon color="white" width={24} height={24} />}
6565
label={t('drawer.wallet')}
6666
testID="DrawerWallet"
6767
onPress={() => navigation.navigate('Wallet')}
6868
/>
6969
<DrawerItem
70-
icon={<ActivityIcon color="brand" width={24} height={24} />}
70+
icon={<ActivityIcon color="white" width={24} height={24} />}
7171
label={t('drawer.activity')}
7272
testID="DrawerActivity"
7373
onPress={() => {
7474
navigation.navigate('Wallet', { screen: 'ActivityFiltered' });
7575
}}
7676
/>
7777
<DrawerItem
78-
icon={<UsersIcon color="brand" width={24} height={24} />}
78+
icon={<UsersIcon color="white" width={24} height={24} />}
7979
label={t('drawer.contacts')}
8080
testID="DrawerContacts"
8181
onPress={() => navigation.navigate('Contacts')}
8282
/>
8383
<DrawerItem
84-
icon={<UserSquareIcon color="brand" width={24} height={24} />}
84+
icon={<UserSquareIcon color="white" width={24} height={24} />}
8585
label={t('drawer.profile')}
8686
testID="DrawerProfile"
8787
onPress={() => navigation.navigate('Profile')}
8888
/>
8989
<DrawerItem
90-
icon={<StackIcon color="brand" width={24} height={24} />}
90+
icon={<StackIcon color="white" width={24} height={24} />}
9191
label={t('drawer.widgets')}
9292
testID="DrawerWidgets"
9393
onPress={() => navigation.navigate('WidgetsSuggestions')}
9494
/>
9595
<DrawerItem
96-
icon={<StorefrontIcon color="brand" width={24} height={24} />}
96+
icon={<StorefrontIcon color="white" width={24} height={24} />}
9797
label={t('drawer.shop')}
9898
testID="DrawerShop"
9999
onPress={() => {
@@ -105,7 +105,7 @@ const DrawerContent = (props: DrawerContentComponentProps): ReactElement => {
105105
}}
106106
/>
107107
<DrawerItem
108-
icon={<SettingsIcon color="brand" width={24} height={24} />}
108+
icon={<SettingsIcon color="white" width={24} height={24} />}
109109
label={t('drawer.settings')}
110110
testID="DrawerSettings"
111111
onPress={() => {
@@ -117,13 +117,14 @@ const DrawerContent = (props: DrawerContentComponentProps): ReactElement => {
117117
style={styles.appStatus}
118118
showText={true}
119119
showReady={true}
120+
color="black"
120121
testID="DrawerAppStatus"
121122
onPress={() => {
122123
navigation.navigate('Settings', { screen: 'AppStatus' });
123124
}}
124125
/>
125126
</DrawerContentScrollView>
126-
</GradientView>
127+
</ThemedView>
127128
);
128129
};
129130

‎src/screens/Wallets/UnitButton.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const UnitButton = ({
4040
<View style={styles.container}>
4141
<SwitchIcon color={color} width={16.44} height={13.22} />
4242
<Caption13Up style={styles.text} color={color}>
43-
{unit === EUnit.BTC ? 'BTC' : fiatTicker}
43+
{unit === EUnit.BTC ? 'Bitcoin' : fiatTicker}
4444
</Caption13Up>
4545
</View>
4646
</TouchableHighlight>

0 commit comments

Comments
 (0)