mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-26 06:08:40 +01:00
Merge branch 'cake-tech:dev' into dev
This commit is contained in:
@@ -599,6 +599,14 @@ Future<void> defaultSettingsMigration(
|
||||
type: WalletType.arbitrum,
|
||||
currentNodePreferenceKey: PreferencesKey.currentArbitrumNodeIdKey,
|
||||
oldUri: ["arbitrum.nownodes.io"]);
|
||||
break;
|
||||
case 67:
|
||||
_changeExchangeProviderAvailability(
|
||||
sharedPreferences,
|
||||
providerName: "LetsExchange",
|
||||
enabled: true,
|
||||
);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
+1
-1
@@ -318,7 +318,7 @@ Future<void> initializeAppConfigs({bool loadWallet = true}) async {
|
||||
payjoinSessionSource: payjoinSessionSource,
|
||||
anonpayInvoiceInfo: anonpayInvoiceInfo,
|
||||
havenSeedStore: havenSeedStore,
|
||||
initialMigrationVersion: 66,
|
||||
initialMigrationVersion: 67,
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -352,11 +352,12 @@ class _ScanPageState extends State<ScanPage> {
|
||||
inactiveColor: Colors.white.withAlpha(102)),
|
||||
),
|
||||
),
|
||||
IgnorePointer(
|
||||
child: Positioned(
|
||||
bottom: 120,
|
||||
left: 0,
|
||||
right: 0,
|
||||
Positioned(
|
||||
bottom: 120, left:0,right:0,
|
||||
child: IgnorePointer(
|
||||
|
||||
|
||||
|
||||
child: AnimatedOpacity(
|
||||
duration: Duration(milliseconds: 500),
|
||||
opacity: isScanningURQR ? 1 : 0,
|
||||
|
||||
@@ -30,22 +30,21 @@ class ShareUtil {
|
||||
|
||||
static Rect _sharePosition(BuildContext context) {
|
||||
if (!context.mounted) {
|
||||
return Rect.zero;
|
||||
return const Rect.fromLTWH(0, 0, 1, 1);
|
||||
}
|
||||
|
||||
final screen = Offset.zero & MediaQuery.of(context).size;
|
||||
final fallback = Rect.fromCenter(center: screen.center, width: 1, height: 1);
|
||||
|
||||
final renderObject = context.findRenderObject();
|
||||
if (renderObject is! RenderBox) {
|
||||
return Rect.zero;
|
||||
if (renderObject is! RenderBox || !renderObject.hasSize) {
|
||||
return fallback;
|
||||
}
|
||||
|
||||
final rect = renderObject.localToGlobal(Offset.zero) & renderObject.size;
|
||||
// iOS requires sharePositionOrigin to lie fully within the source view's
|
||||
// bounds; clip to the screen so an offset/oversized page rect doesn't spill
|
||||
// past the edge and trigger a PlatformException on iPad.
|
||||
final screen = Offset.zero & MediaQuery.of(context).size;
|
||||
final clipped = rect.intersect(screen);
|
||||
if (clipped.isEmpty) {
|
||||
return Rect.zero;
|
||||
return fallback;
|
||||
}
|
||||
return clipped;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user