Skip to content

A local-first personal finance app

Mobile budget pull down to sync (#1858)

Joel Jeremy Marquezd8c885bf4e54
diff --git a/packages/desktop-client/src/components/budget/MobileBudget.js b/packages/desktop-client/src/components/budget/MobileBudget.js
index d945c45cf3..c992a255fc 100644
--- a/packages/desktop-client/src/components/budget/MobileBudget.js
+++ b/packages/desktop-client/src/components/budget/MobileBudget.js
@@ -382,6 +382,7 @@ class Budget extends Component {
onReorderGroup={this.onReorderGroup}
onOpenActionSheet={() => {}} //this.onOpenActionSheet}
onBudgetAction={applyBudgetAction}
+ onRefresh={onRefresh}
savePrefs={savePrefs}
/>
)}
diff --git a/packages/desktop-client/src/components/budget/MobileBudgetTable.js b/packages/desktop-client/src/components/budget/MobileBudgetTable.js
index 48d3e0094b..b650989f76 100644
--- a/packages/desktop-client/src/components/budget/MobileBudgetTable.js
+++ b/packages/desktop-client/src/components/budget/MobileBudgetTable.js
@@ -18,6 +18,7 @@ import Label from '../common/Label';
import Menu from '../common/Menu';
import Text from '../common/Text';
import View from '../common/View';
+import PullToRefresh from '../responsive/PullToRefresh';
import { useServerURL } from '../ServerContext';
import CellValue from '../spreadsheet/CellValue';
import NamespaceContext from '../spreadsheet/NamespaceContext';
@@ -1526,6 +1527,7 @@ export function BudgetTable(props) {
onShowBudgetDetails,
// onOpenActionSheet,
onBudgetAction,
+ onRefresh,
savePrefs,
} = props;
@@ -1742,83 +1744,85 @@ export function BudgetTable(props) {
</View>
</View>
<View style={{ overflowY: 'auto' }}>
- {!editMode ? (
- // <ScrollView
- // ref={el => (this.list = el)}
- // keyboardShouldPersistTaps="always"
- // refreshControl={refreshControl}
- // style={{ backgroundColor: colors.n10 }}
- // automaticallyAdjustContentInsets={false}
- // >
- <View>
- <BudgetGroups
- type={type}
- categoryGroups={categoryGroups}
- showBudgetedCol={showBudgetedCol}
- show3Cols={show3Cols}
- showHiddenCategories={showHiddenCategories}
- // gestures={gestures}
- month={month}
- editMode={editMode}
- editingGroupId={editingGroupId}
- onEditGroup={onEditGroup}
- editingCategoryId={editingCategoryId}
- onEditCategory={onEditCategory}
- editingBudgetCategoryId={editingBudgetCategoryId}
- onEditCategoryBudget={onEditCategoryBudget}
- openBudgetActionMenuId={openBudgetActionMenuId}
- onOpenBudgetActionMenu={onOpenBudgetActionMenu}
- onSaveCategory={onSaveCategory}
- onDeleteCategory={onDeleteCategory}
- onAddCategory={onAddCategory}
- onAddGroup={onAddGroup}
- onSaveGroup={onSaveGroup}
- onDeleteGroup={onDeleteGroup}
- onReorderCategory={onReorderCategory}
- onReorderGroup={onReorderGroup}
- onBudgetAction={onBudgetAction}
- />
- </View>
- ) : (
- // </ScrollView>
- // <DragDrop>
- // {({
- // dragging,
- // onGestureEvent,
- // onHandlerStateChange,
- // scrollRef,
- // onScroll
- // }) => (
- <View>
- <BudgetGroups
- type={type}
- categoryGroups={categoryGroups}
- showBudgetedCol={showBudgetedCol}
- show3Cols={show3Cols}
- showHiddenCategories={showHiddenCategories}
- // gestures={gestures}
- editMode={editMode}
- editingGroupId={editingGroupId}
- onEditGroup={onEditGroup}
- editingCategoryId={editingCategoryId}
- onEditCategory={onEditCategory}
- editingBudgetCategoryId={editingBudgetCategoryId}
- onEditCategoryBudget={onEditCategoryBudget}
- onSaveCategory={onSaveCategory}
- onDeleteCategory={onDeleteCategory}
- onAddCategory={onAddCategory}
- onAddGroup={onAddGroup}
- onSaveGroup={onSaveGroup}
- onDeleteGroup={onDeleteGroup}
- onReorderCategory={onReorderCategory}
- onReorderGroup={onReorderGroup}
- onBudgetAction={onBudgetAction}
- />
- </View>
+ <PullToRefresh onRefresh={onRefresh}>
+ {!editMode ? (
+ // <ScrollView
+ // ref={el => (this.list = el)}
+ // keyboardShouldPersistTaps="always"
+ // refreshControl={refreshControl}
+ // style={{ backgroundColor: colors.n10 }}
+ // automaticallyAdjustContentInsets={false}
+ // >
+ <View>
+ <BudgetGroups
+ type={type}
+ categoryGroups={categoryGroups}
+ showBudgetedCol={showBudgetedCol}
+ show3Cols={show3Cols}
+ showHiddenCategories={showHiddenCategories}
+ // gestures={gestures}
+ month={month}
+ editMode={editMode}
+ editingGroupId={editingGroupId}
+ onEditGroup={onEditGroup}
+ editingCategoryId={editingCategoryId}
+ onEditCategory={onEditCategory}
+ editingBudgetCategoryId={editingBudgetCategoryId}
+ onEditCategoryBudget={onEditCategoryBudget}
+ openBudgetActionMenuId={openBudgetActionMenuId}
+ onOpenBudgetActionMenu={onOpenBudgetActionMenu}
+ onSaveCategory={onSaveCategory}
+ onDeleteCategory={onDeleteCategory}
+ onAddCategory={onAddCategory}
+ onAddGroup={onAddGroup}
+ onSaveGroup={onSaveGroup}
+ onDeleteGroup={onDeleteGroup}
+ onReorderCategory={onReorderCategory}
+ onReorderGroup={onReorderGroup}
+ onBudgetAction={onBudgetAction}
+ />
+ </View>
+ ) : (
+ // </ScrollView>
+ // <DragDrop>
+ // {({
+ // dragging,
+ // onGestureEvent,
+ // onHandlerStateChange,
+ // scrollRef,
+ // onScroll
+ // }) => (
+ <View>
+ <BudgetGroups
+ type={type}
+ categoryGroups={categoryGroups}
+ showBudgetedCol={showBudgetedCol}
+ show3Cols={show3Cols}
+ showHiddenCategories={showHiddenCategories}
+ // gestures={gestures}
+ editMode={editMode}
+ editingGroupId={editingGroupId}
+ onEditGroup={onEditGroup}
+ editingCategoryId={editingCategoryId}
+ onEditCategory={onEditCategory}
+ editingBudgetCategoryId={editingBudgetCategoryId}
+ onEditCategoryBudget={onEditCategoryBudget}
+ onSaveCategory={onSaveCategory}
+ onDeleteCategory={onDeleteCategory}
+ onAddCategory={onAddCategory}
+ onAddGroup={onAddGroup}
+ onSaveGroup={onSaveGroup}
+ onDeleteGroup={onDeleteGroup}
+ onReorderCategory={onReorderCategory}
+ onReorderGroup={onReorderGroup}
+ onBudgetAction={onBudgetAction}
+ />
+ </View>
- // <DragDropHighlight />
- // </DragDrop>
- )}
+ // <DragDropHighlight />
+ // </DragDrop>
+ )}
+ </PullToRefresh>
</View>
</View>
</NamespaceContext.Provider>
diff --git a/upcoming-release-notes/1858.md b/upcoming-release-notes/1858.md
new file mode 100644
index 0000000000..e93688883c
--- /dev/null
+++ b/upcoming-release-notes/1858.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [joel-jeremy]
+---
+
+Mobile budget pull down to sync.