Skip to content

Commit df0c3eb

Browse files
committed
fix: depreciated field targetConfirmations
1 parent 48c1332 commit df0c3eb

File tree

7 files changed

+1957
-180
lines changed

7 files changed

+1957
-180
lines changed

app/graphql/generated.gql

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -929,66 +929,34 @@ query myUserId {
929929
}
930930
}
931931

932-
query myWelcomeProfile {
933-
me {
934-
id
935-
defaultAccount {
936-
... on ConsumerAccount {
937-
id
938-
welcomeProfile {
939-
innerCircleAllTimeCount
940-
__typename
941-
}
942-
__typename
943-
}
944-
__typename
945-
}
946-
__typename
947-
}
948-
}
949-
950932
query network {
951933
globals {
952934
network
953935
__typename
954936
}
955937
}
956938

957-
query onChainTxFee($walletId: WalletId!, $address: OnChainAddress!, $amount: SatAmount!, $targetConfirmations: TargetConfirmations) {
958-
onChainTxFee(
959-
walletId: $walletId
960-
address: $address
961-
amount: $amount
962-
targetConfirmations: $targetConfirmations
963-
) {
939+
query onChainTxFee($walletId: WalletId!, $address: OnChainAddress!, $amount: SatAmount!) {
940+
onChainTxFee(walletId: $walletId, address: $address, amount: $amount) {
964941
amount
965-
targetConfirmations
966942
__typename
967943
}
968944
}
969945

970-
query onChainUsdTxFee($walletId: WalletId!, $address: OnChainAddress!, $amount: CentAmount!, $targetConfirmations: TargetConfirmations) {
971-
onChainUsdTxFee(
972-
walletId: $walletId
973-
address: $address
974-
amount: $amount
975-
targetConfirmations: $targetConfirmations
976-
) {
946+
query onChainUsdTxFee($walletId: WalletId!, $address: OnChainAddress!, $amount: CentAmount!) {
947+
onChainUsdTxFee(walletId: $walletId, address: $address, amount: $amount) {
977948
amount
978-
targetConfirmations
979949
__typename
980950
}
981951
}
982952

983-
query onChainUsdTxFeeAsBtcDenominated($walletId: WalletId!, $address: OnChainAddress!, $amount: SatAmount!, $targetConfirmations: TargetConfirmations) {
953+
query onChainUsdTxFeeAsBtcDenominated($walletId: WalletId!, $address: OnChainAddress!, $amount: SatAmount!) {
984954
onChainUsdTxFeeAsBtcDenominated(
985955
walletId: $walletId
986956
address: $address
987957
amount: $amount
988-
targetConfirmations: $targetConfirmations
989958
) {
990959
amount
991-
targetConfirmations
992960
__typename
993961
}
994962
}

app/graphql/generated.ts

Lines changed: 36 additions & 103 deletions
Large diffs are not rendered by default.

app/screens/earns-map-screen/use-quiz-server.tsx

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,6 @@ gql`
2727
}
2828
`
2929

30-
// TODO placeholder for testing codegen
31-
gql`
32-
query myWelcomeProfile {
33-
me {
34-
id
35-
defaultAccount {
36-
... on ConsumerAccount {
37-
id
38-
welcomeProfile {
39-
innerCircleAllTimeCount
40-
}
41-
}
42-
}
43-
}
44-
}
45-
`
46-
4730
export const useQuizServer = (
4831
{ fetchPolicy }: { fetchPolicy: WatchQueryFetchPolicy } = {
4932
fetchPolicy: "cache-first",

app/screens/send-bitcoin-screen/use-fee.ts

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,50 +69,33 @@ gql`
6969
$walletId: WalletId!
7070
$address: OnChainAddress!
7171
$amount: SatAmount!
72-
$targetConfirmations: TargetConfirmations
7372
) {
74-
onChainTxFee(
75-
walletId: $walletId
76-
address: $address
77-
amount: $amount
78-
targetConfirmations: $targetConfirmations
79-
) {
73+
onChainTxFee(walletId: $walletId, address: $address, amount: $amount) {
8074
amount
81-
targetConfirmations
8275
}
8376
}
8477
8578
query onChainUsdTxFee(
8679
$walletId: WalletId!
8780
$address: OnChainAddress!
8881
$amount: CentAmount!
89-
$targetConfirmations: TargetConfirmations
9082
) {
91-
onChainUsdTxFee(
92-
walletId: $walletId
93-
address: $address
94-
amount: $amount
95-
targetConfirmations: $targetConfirmations
96-
) {
83+
onChainUsdTxFee(walletId: $walletId, address: $address, amount: $amount) {
9784
amount
98-
targetConfirmations
9985
}
10086
}
10187
10288
query onChainUsdTxFeeAsBtcDenominated(
10389
$walletId: WalletId!
10490
$address: OnChainAddress!
10591
$amount: SatAmount!
106-
$targetConfirmations: TargetConfirmations
10792
) {
10893
onChainUsdTxFeeAsBtcDenominated(
10994
walletId: $walletId
11095
address: $address
11196
amount: $amount
112-
targetConfirmations: $targetConfirmations
11397
) {
11498
amount
115-
targetConfirmations
11699
}
117100
}
118101
`

codegen.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
overwrite: true
22
# schema: "https://raw.githubusercontent.com/GaloyMoney/galoy/main/src/graphql/main/schema.graphql"
3-
# schema: "../galoy/src/graphql/main/schema.graphql"
4-
schema: "../blink-circles/dev/apollo-federation/supergraph.graphql"
3+
schema: "http://localhost:4002/grapqhl" # TODO use when supergraph is updated to include circles "https://mainnet.galoy.io/graphql"
54
documents:
65
- "app/**/*.ts"
76
- "app/**/*.tsx"
@@ -25,7 +24,6 @@ generates:
2524
strictScalars: true
2625
nonOptionalTypename: true
2726
federation: true
28-
skipDocumentsValidation: true # TODO ERROR Fragment cannot be spread here as objects of type "Account" can never be of type "ConsumerAccount".
2927
scalars:
3028
AccountApiKeyLabel: "string"
3129
AuthToken: "string"

0 commit comments

Comments
 (0)