Skip to content

Commit 2d1c812

Browse files
gruve-pgruve-p
committed
Merge remote-tracking branch 'upstream/master'
2 parents 6ef5c8e + a4e224e commit 2d1c812

5 files changed

Lines changed: 22 additions & 48 deletions

File tree

‎android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ android {
8787
minSdkVersion rootProject.ext.minSdkVersion
8888
targetSdkVersion rootProject.ext.targetSdkVersion
8989
versionCode 1
90-
versionName "8.0.0"
90+
versionName "8.0.1"
9191
testBuildType System.getProperty('testBuildType', 'debug')
9292
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
9393
// Keep compatibility across react-native-capture-protection flavor changes.

‎components/QRCode.tsx‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -216,33 +216,18 @@ const QRCode: React.FC<QRCodeProps> = ({
216216
const gradFill = `url(#${GRADIENT_ID})`;
217217

218218
const finderShapes: React.ReactElement[] = [];
219-
const outerR = 2 * cell;
220-
const holeR = 1.25 * cell;
221-
const dotR = 0.9 * cell;
222219
finderOrigins.forEach(([fr, fc], i) => {
223220
const x = (fc + 1) * cell;
224221
const y = (fr + 1) * cell;
225222
finderShapes.push(
226-
<Rect
227-
key={`finder-frame-${i}`}
228-
testID="qr-finder-frame"
229-
x={x}
230-
y={y}
231-
width={7 * cell}
232-
height={7 * cell}
233-
rx={outerR}
234-
ry={outerR}
235-
fill={gradFill}
236-
/>,
223+
<Rect key={`finder-frame-${i}`} testID="qr-finder-frame" x={x} y={y} width={7 * cell} height={7 * cell} fill={gradFill} />,
237224
<Rect
238225
key={`finder-hole-${i}`}
239226
testID="qr-finder-hole"
240227
x={x + cell}
241228
y={y + cell}
242229
width={5 * cell}
243230
height={5 * cell}
244-
rx={holeR}
245-
ry={holeR}
246231
fill={BACKGROUND}
247232
/>,
248233
<Rect
@@ -252,8 +237,6 @@ const QRCode: React.FC<QRCodeProps> = ({
252237
y={y + 2 * cell}
253238
width={3 * cell}
254239
height={3 * cell}
255-
rx={dotR}
256-
ry={dotR}
257240
fill={gradFill}
258241
/>,
259242
);
@@ -277,16 +260,7 @@ const QRCode: React.FC<QRCodeProps> = ({
277260
{finderShapes}
278261
{isLogoRendered && logoCells > 0 && (
279262
<>
280-
<Rect
281-
testID="qr-logo-backdrop"
282-
x={backdropX}
283-
y={backdropY}
284-
width={backdropSize}
285-
height={backdropSize}
286-
rx={cell * 0.5}
287-
ry={cell * 0.5}
288-
fill={LOGO_BACKGROUND}
289-
/>
263+
<Rect testID="qr-logo-backdrop" x={backdropX} y={backdropY} width={backdropSize} height={backdropSize} fill={LOGO_BACKGROUND} />
290264
<SvgImage
291265
testID="qr-logo-image"
292266
href={require('../img/qr-code.png')}

‎ios/BlueWallet.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,7 +1359,7 @@
13591359
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
13601360
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
13611361
CODE_SIGN_STYLE = Manual;
1362-
CURRENT_PROJECT_VERSION = 1703259999;
1362+
CURRENT_PROJECT_VERSION = 1703279999;
13631363
DEAD_CODE_STRIPPING = YES;
13641364
DEVELOPMENT_TEAM = "";
13651365
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CMG3V3T59A;
@@ -1386,7 +1386,7 @@
13861386
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
13871387
"$(inherited)",
13881388
);
1389-
MARKETING_VERSION = 8.0.0;
1389+
MARKETING_VERSION = 8.0.1;
13901390
OTHER_LDFLAGS = (
13911391
"$(inherited)",
13921392
"-ObjC",
@@ -1421,7 +1421,7 @@
14211421
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
14221422
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution";
14231423
CODE_SIGN_STYLE = Manual;
1424-
CURRENT_PROJECT_VERSION = 1703259999;
1424+
CURRENT_PROJECT_VERSION = 1703279999;
14251425
DEAD_CODE_STRIPPING = YES;
14261426
DEVELOPMENT_TEAM = "";
14271427
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CMG3V3T59A;
@@ -1443,7 +1443,7 @@
14431443
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
14441444
"$(inherited)",
14451445
);
1446-
MARKETING_VERSION = 8.0.0;
1446+
MARKETING_VERSION = 8.0.1;
14471447
OTHER_LDFLAGS = (
14481448
"$(inherited)",
14491449
"-ObjC",
@@ -1479,7 +1479,7 @@
14791479
CODE_SIGN_IDENTITY = "Apple Development";
14801480
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
14811481
CODE_SIGN_STYLE = Manual;
1482-
CURRENT_PROJECT_VERSION = 1703259999;
1482+
CURRENT_PROJECT_VERSION = 1703279999;
14831483
DEAD_CODE_STRIPPING = YES;
14841484
DEBUG_INFORMATION_FORMAT = dwarf;
14851485
DEVELOPMENT_TEAM = CMG3V3T59A;
@@ -1491,7 +1491,7 @@
14911491
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
14921492
"$(inherited)",
14931493
);
1494-
MARKETING_VERSION = 8.0.0;
1494+
MARKETING_VERSION = 8.0.1;
14951495
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
14961496
MTL_FAST_MATH = YES;
14971497
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
@@ -1521,7 +1521,7 @@
15211521
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
15221522
CODE_SIGN_STYLE = Manual;
15231523
COPY_PHASE_STRIP = NO;
1524-
CURRENT_PROJECT_VERSION = 1703259999;
1524+
CURRENT_PROJECT_VERSION = 1703279999;
15251525
DEAD_CODE_STRIPPING = YES;
15261526
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
15271527
DEVELOPMENT_TEAM = CMG3V3T59A;
@@ -1533,7 +1533,7 @@
15331533
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
15341534
"$(inherited)",
15351535
);
1536-
MARKETING_VERSION = 8.0.0;
1536+
MARKETING_VERSION = 8.0.1;
15371537
MTL_FAST_MATH = YES;
15381538
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
15391539
PRODUCT_BUNDLE_IDENTIFIER = org.groestlcoin.bluewallet123.Stickers;
@@ -1565,7 +1565,7 @@
15651565
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
15661566
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Distribution";
15671567
CODE_SIGN_STYLE = Manual;
1568-
CURRENT_PROJECT_VERSION = 1703259999;
1568+
CURRENT_PROJECT_VERSION = 1703279999;
15691569
DEAD_CODE_STRIPPING = YES;
15701570
DEBUG_INFORMATION_FORMAT = dwarf;
15711571
DEVELOPMENT_TEAM = "";
@@ -1585,7 +1585,7 @@
15851585
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
15861586
"$(inherited)",
15871587
);
1588-
MARKETING_VERSION = 8.0.0;
1588+
MARKETING_VERSION = 8.0.1;
15891589
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
15901590
MTL_FAST_MATH = YES;
15911591
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
@@ -1626,7 +1626,7 @@
16261626
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
16271627
CODE_SIGN_STYLE = Manual;
16281628
COPY_PHASE_STRIP = NO;
1629-
CURRENT_PROJECT_VERSION = 1703259999;
1629+
CURRENT_PROJECT_VERSION = 1703279999;
16301630
DEAD_CODE_STRIPPING = YES;
16311631
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
16321632
DEVELOPMENT_TEAM = "";
@@ -1646,7 +1646,7 @@
16461646
"$(SDKROOT)/System/iOSSupport/usr/lib/swift",
16471647
"$(inherited)",
16481648
);
1649-
MARKETING_VERSION = 8.0.0;
1649+
MARKETING_VERSION = 8.0.1;
16501650
MTL_FAST_MATH = YES;
16511651
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
16521652
PRODUCT_BUNDLE_IDENTIFIER = org.groestlcoin.bluewallet123.MarketWidget;
@@ -1833,7 +1833,7 @@
18331833
CODE_SIGN_IDENTITY = "Apple Development";
18341834
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
18351835
CODE_SIGN_STYLE = Manual;
1836-
CURRENT_PROJECT_VERSION = 1703259999;
1836+
CURRENT_PROJECT_VERSION = 1703279999;
18371837
DEAD_CODE_STRIPPING = YES;
18381838
DEBUG_INFORMATION_FORMAT = dwarf;
18391839
DEVELOPMENT_TEAM = CMG3V3T59A;
@@ -1854,7 +1854,7 @@
18541854
"$(inherited)",
18551855
);
18561856
MACOSX_DEPLOYMENT_TARGET = 12.4;
1857-
MARKETING_VERSION = 8.0.0;
1857+
MARKETING_VERSION = 8.0.1;
18581858
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
18591859
MTL_FAST_MATH = YES;
18601860
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
@@ -1890,7 +1890,7 @@
18901890
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Distribution";
18911891
CODE_SIGN_STYLE = Manual;
18921892
COPY_PHASE_STRIP = NO;
1893-
CURRENT_PROJECT_VERSION = 1703259999;
1893+
CURRENT_PROJECT_VERSION = 1703279999;
18941894
DEAD_CODE_STRIPPING = YES;
18951895
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
18961896
DEVELOPMENT_TEAM = CMG3V3T59A;
@@ -1911,7 +1911,7 @@
19111911
"$(inherited)",
19121912
);
19131913
MACOSX_DEPLOYMENT_TARGET = 12.4;
1914-
MARKETING_VERSION = 8.0.0;
1914+
MARKETING_VERSION = 8.0.1;
19151915
MTL_FAST_MATH = YES;
19161916
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
19171917
PRODUCT_BUNDLE_IDENTIFIER = org.groestlcoin.bluewallet123.watch;

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bluewallet",
3-
"version": "8.0.0",
3+
"version": "8.0.1",
44
"license": "MIT",
55
"repository": {
66
"type": "git",

0 commit comments

Comments
 (0)