Fix rebase
This commit is contained in:
parent
455ca25efa
commit
f66a8162da
@ -43,7 +43,7 @@ export function getGetServerSideProps (query, variables = null, notFoundFunc, re
|
|||||||
query: ME_SSR
|
query: ME_SSR
|
||||||
})
|
})
|
||||||
|
|
||||||
const price = await getPrice()
|
const price = await getPrice(me.fiatCurrency)
|
||||||
|
|
||||||
// we want to use client-side cache
|
// we want to use client-side cache
|
||||||
if (nodata && query) {
|
if (nodata && query) {
|
||||||
|
@ -87,10 +87,10 @@ ${SETTINGS_FIELDS}
|
|||||||
export const SET_SETTINGS =
|
export const SET_SETTINGS =
|
||||||
gql`
|
gql`
|
||||||
${SETTINGS_FIELDS}
|
${SETTINGS_FIELDS}
|
||||||
mutation setSettings($tipDefault: Int!, $noteItemSats: Boolean!, $noteEarning: Boolean!,
|
mutation setSettings($tipDefault: Int!, $fiatCurrency: String!, $noteItemSats: Boolean!, $noteEarning: Boolean!,
|
||||||
$noteAllDescendants: Boolean!, $noteMentions: Boolean!, $noteDeposits: Boolean!,
|
$noteAllDescendants: Boolean!, $noteMentions: Boolean!, $noteDeposits: Boolean!,
|
||||||
$noteInvites: Boolean!, $noteJobIndicator: Boolean!, $hideInvoiceDesc: Boolean!) {
|
$noteInvites: Boolean!, $noteJobIndicator: Boolean!, $hideInvoiceDesc: Boolean!) {
|
||||||
setSettings(tipDefault: $tipDefault, noteItemSats: $noteItemSats,
|
setSettings(tipDefault: $tipDefault, fiatCurrency: $fiatCurrency, noteItemSats: $noteItemSats,
|
||||||
noteEarning: $noteEarning, noteAllDescendants: $noteAllDescendants,
|
noteEarning: $noteEarning, noteAllDescendants: $noteAllDescendants,
|
||||||
noteMentions: $noteMentions, noteDeposits: $noteDeposits, noteInvites: $noteInvites,
|
noteMentions: $noteMentions, noteDeposits: $noteDeposits, noteInvites: $noteInvites,
|
||||||
noteJobIndicator: $noteJobIndicator, hideInvoiceDesc: $hideInvoiceDesc) {
|
noteJobIndicator: $noteJobIndicator, hideInvoiceDesc: $hideInvoiceDesc) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user