diff --git a/app/graphql/generated.gql b/app/graphql/generated.gql index 111a413d55..b1b093b99a 100644 --- a/app/graphql/generated.gql +++ b/app/graphql/generated.gql @@ -860,6 +860,7 @@ query StatefulNotifications($after: String) { deepLink createdAt acknowledgedAt + addToBulletin __typename } pageInfo { diff --git a/app/graphql/generated.ts b/app/graphql/generated.ts index 382e0cc5e3..3fbbf5ad4a 100644 --- a/app/graphql/generated.ts +++ b/app/graphql/generated.ts @@ -1062,6 +1062,7 @@ export type Mutation = { readonly quizClaim: QuizClaimPayload; readonly statefulNotificationAcknowledge: StatefulNotificationAcknowledgePayload; readonly supportChatMessageAdd: SupportChatMessageAddPayload; + readonly supportChatReset: SuccessPayload; /** @deprecated will be moved to AccountContact */ readonly userContactUpdateAlias: UserContactUpdateAliasPayload; readonly userEmailDelete: UserEmailDeletePayload; @@ -1814,6 +1815,7 @@ export type SettlementViaOnChain = { export type StatefulNotification = { readonly __typename: 'StatefulNotification'; readonly acknowledgedAt?: Maybe; + readonly addToBulletin: Scalars['Boolean']['output']; readonly body: Scalars['String']['output']; readonly createdAt: Scalars['Timestamp']['output']; readonly deepLink?: Maybe; @@ -2621,7 +2623,7 @@ export type StatefulNotificationsQueryVariables = Exact<{ }>; -export type StatefulNotificationsQuery = { readonly __typename: 'Query', readonly me?: { readonly __typename: 'User', readonly statefulNotifications: { readonly __typename: 'StatefulNotificationConnection', readonly nodes: ReadonlyArray<{ readonly __typename: 'StatefulNotification', readonly id: string, readonly title: string, readonly body: string, readonly deepLink?: string | null, readonly createdAt: number, readonly acknowledgedAt?: number | null }>, readonly pageInfo: { readonly __typename: 'PageInfo', readonly endCursor?: string | null, readonly hasNextPage: boolean, readonly hasPreviousPage: boolean, readonly startCursor?: string | null } } } | null }; +export type StatefulNotificationsQuery = { readonly __typename: 'Query', readonly me?: { readonly __typename: 'User', readonly statefulNotifications: { readonly __typename: 'StatefulNotificationConnection', readonly nodes: ReadonlyArray<{ readonly __typename: 'StatefulNotification', readonly id: string, readonly title: string, readonly body: string, readonly deepLink?: string | null, readonly createdAt: number, readonly acknowledgedAt?: number | null, readonly addToBulletin: boolean }>, readonly pageInfo: { readonly __typename: 'PageInfo', readonly endCursor?: string | null, readonly hasNextPage: boolean, readonly hasPreviousPage: boolean, readonly startCursor?: string | null } } } | null }; export type StatefulNotificationAcknowledgeMutationVariables = Exact<{ input: StatefulNotificationAcknowledgeInput; @@ -4821,6 +4823,7 @@ export const StatefulNotificationsDocument = gql` deepLink createdAt acknowledgedAt + addToBulletin } pageInfo { endCursor @@ -8825,6 +8828,7 @@ export type MutationResolvers>; statefulNotificationAcknowledge?: Resolver>; supportChatMessageAdd?: Resolver>; + supportChatReset?: Resolver; userContactUpdateAlias?: Resolver>; userEmailDelete?: Resolver; userEmailRegistrationInitiate?: Resolver>; @@ -9120,6 +9124,7 @@ export interface SignedDisplayMajorAmountScalarConfig extends GraphQLScalarTypeC export type StatefulNotificationResolvers = { acknowledgedAt?: Resolver, ParentType, ContextType>; + addToBulletin?: Resolver; body?: Resolver; createdAt?: Resolver; deepLink?: Resolver, ParentType, ContextType>; diff --git a/app/screens/notification-history-screen/notification-history-screen.tsx b/app/screens/notification-history-screen/notification-history-screen.tsx index 6fa3a62005..803de270b8 100644 --- a/app/screens/notification-history-screen/notification-history-screen.tsx +++ b/app/screens/notification-history-screen/notification-history-screen.tsx @@ -20,6 +20,7 @@ gql` deepLink createdAt acknowledgedAt + addToBulletin } pageInfo { endCursor diff --git a/app/screens/send-bitcoin-screen/send-bitcoin-confirmation-screen.tsx b/app/screens/send-bitcoin-screen/send-bitcoin-confirmation-screen.tsx index 5f66ab3795..cd16ae5f33 100644 --- a/app/screens/send-bitcoin-screen/send-bitcoin-confirmation-screen.tsx +++ b/app/screens/send-bitcoin-screen/send-bitcoin-confirmation-screen.tsx @@ -1,5 +1,6 @@ import React, { useState } from "react" import { ActivityIndicator, TouchableOpacity, View } from "react-native" +import { PanGestureHandler } from "react-native-gesture-handler" import ReactNativeHapticFeedback from "react-native-haptic-feedback" import { gql } from "@apollo/client" @@ -422,13 +423,18 @@ const SendBitcoinConfirmationScreen: React.FC = ({ route }) => { ) : null} - + {/* disable slide gestures in area around the slider button */} + + + + + @@ -442,6 +448,7 @@ const useStyles = makeStyles(({ colors }) => ({ flex: 1, }, fieldContainer: { + paddingHorizontal: 20, marginBottom: 12, }, noteText: { @@ -537,7 +544,7 @@ const useStyles = makeStyles(({ colors }) => ({ alignItems: "center", }, screenStyle: { - padding: 20, + paddingTop: 20, flexGrow: 1, }, iconContainer: { @@ -560,4 +567,7 @@ const useStyles = makeStyles(({ colors }) => ({ justifyContent: "space-between", alignItems: "center", }, + sliderContainer: { + padding: 20, + }, }))