diff --git a/src/bridge/RippleJSBridge.js b/src/bridge/RippleJSBridge.js index a1664336..727c1dca 100644 --- a/src/bridge/RippleJSBridge.js +++ b/src/bridge/RippleJSBridge.js @@ -351,7 +351,12 @@ const RippleJSBridge: WalletBridge = { return unsubscribe }), - synchronize: ({ endpointConfig, freshAddress, blockHeight }) => + synchronize: ({ + endpointConfig, + freshAddress, + blockHeight, + operations: { length: currentOpsLength }, + }) => Observable.create(o => { let finished = false const unsubscribe = () => { @@ -394,7 +399,10 @@ const RippleJSBridge: WalletBridge = { o.next(a => ({ ...a, balance })) const transactions = await api.getTransactions(freshAddress, { - minLedgerVersion: Math.max(blockHeight, minLedgerVersion), + minLedgerVersion: Math.max( + currentOpsLength === 0 ? 0 : blockHeight, // if there is no ops, it might be after a clear and we prefer to pull from the oldest possible history + minLedgerVersion, + ), maxLedgerVersion, }) diff --git a/src/components/AccountPage/AccountHeaderActions.js b/src/components/AccountPage/AccountHeaderActions.js index eb60494b..c510c9cb 100644 --- a/src/components/AccountPage/AccountHeaderActions.js +++ b/src/components/AccountPage/AccountHeaderActions.js @@ -62,7 +62,7 @@ class AccountHeaderActions extends PureComponent { const { account, openModal, t } = this.props return ( - {account.operations.length > 0 && ( + {account.operations.length > 0 || account.balance > 0 ? ( - )} + ) : null} t('app:account.settings.title')}> openModal(MODAL_SETTINGS_ACCOUNT, { account })}> diff --git a/src/components/AccountPage/index.js b/src/components/AccountPage/index.js index e79620e9..19d19b47 100644 --- a/src/components/AccountPage/index.js +++ b/src/components/AccountPage/index.js @@ -82,7 +82,7 @@ class AccountPage extends PureComponent { - {account.operations.length > 0 ? ( + {account.operations.length > 0 || account.balance > 0 ? (